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 01/55] 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 02/55] 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 03/55] 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 04/55] 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 05/55] 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 06/55] 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 07/55] 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 08/55] 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 09/55] 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 10/55] 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 11/55] 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 12/55] 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 13/55] 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 14/55] 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 15/55] 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 16/55] 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 17/55] 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 18/55] 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 19/55] 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 20/55] 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 21/55] 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 341632376768b10664b78f367c2d948861181e02 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 26 Jan 2022 23:56:10 -0600
Subject: [PATCH 22/55] 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 23/55] 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 62ff6f7e8ad86e31e77f00e7f4ac0523b0b71ce5 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Fri, 28 Jan 2022 23:48:44 -0600
Subject: [PATCH 24/55] 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 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 25/55] 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 26/55] 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 27/55] 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 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 28/55] 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 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 29/55] 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 30/55] 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 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 31/55] 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 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 32/55] 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 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 33/55] 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 34/55] 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 35/55] 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 36/55] 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 37/55] 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 38/55] 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 39/55] 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 40/55] 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 41/55] 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 42/55] 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 43/55] 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 44/55] 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 45/55] 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 46/55] 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 47/55] 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 48/55] 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 49/55] 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 50/55] 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 51/55] 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 52/55] 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 53/55] 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 54/55] 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 55/55] 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>