Output message only in production mode

Both comicvine.py and douban.py return None instead of [] when an HTTP
error occurs during a metadata search. The consumer in search_metadata.py
iterates the result directly, which raises TypeError: 'NoneType' object
is not iterable and crashes the server on single-threaded deployments.

Fixes #3606

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ assignees: ''
 
 After 6 years of more or less intensive programming on Calibre-Web, I need a break. 
 The last few months, maintaining Calibre-Web has felt more like work than a hobby. I felt pressured and teased by people to solve "their" problems and merge PRs for "their" Calibre-Web. 
-I have turned off all notifications from Github/Discord and will now concentrate undisturbed on the development of “my” Calibre-Web over the next few weeks/months.  
+I have turned off all notifications from GitHub/Discord and will now concentrate undisturbed on the development of “my” Calibre-Web over the next few weeks/months.  
 I will look into the issues and maybe also the PRs from time to time, but don't expect a quick response from me.
 
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,7 +11,7 @@ assignees: ''
 
 After 6 years of more or less intensive programming on Calibre-Web, I need a break. 
 The last few months, maintaining Calibre-Web has felt more like work than a hobby. I felt pressured and teased by people to solve "their" problems and merge PRs for "their" Calibre-Web. 
-I have turned off all notifications from Github/Discord and will now concentrate undisturbed on the development of “my” Calibre-Web over the next few weeks/months.  
+I have turned off all notifications from GitHub/Discord and will now concentrate undisturbed on the development of “my” Calibre-Web over the next few weeks/months.  
 I will look into the issues and maybe also the PRs from time to time, but don't expect a quick response from me.
 
 Please have a look at our [Contributing Guidelines](https://github.com/janeczku/calibre-web/blob/master/CONTRIBUTING.md)

CONTRIBUTING.md

@@ -20,7 +20,7 @@ Some of the user languages in Calibre-Web having missing translations. We are ha
 
 ### **Documentation**
 
-The Calibre-Web documentation is hosted in the Github [Wiki](https://github.com/janeczku/calibre-web/wiki). The Wiki is open to everybody, if you find a problem, feel free to correct it. If information is missing, you are welcome to add it. The content will be reviewed time by time. Please try to be consistent with the form with the other Wiki pages (e.g. the project name is Calibre-Web with 2 capital letters and a dash in between).
+The Calibre-Web documentation is hosted in the GitHub [Wiki](https://github.com/janeczku/calibre-web/wiki). The Wiki is open to everybody, if you find a problem, feel free to correct it. If information is missing, you are welcome to add it. The content will be reviewed time by time. Please try to be consistent with the form with the other Wiki pages (e.g. the project name is Calibre-Web with 2 capital letters and a dash in between).
 
 ### **Reporting a bug**
 
@@ -28,12 +28,12 @@ Do not open up a GitHub issue if the bug is a **security vulnerability** in Cali
 
 Ensure the **bug was not already reported** by searching on GitHub under [Issues](https://github.com/janeczku/calibre-web/issues). Please also check if a solution for your problem can be found in the [wiki](https://github.com/janeczku/calibre-web/wiki).
 
-If you're unable to find an **open issue** addressing the problem, open a [new one](https://github.com/janeczku/calibre-web/issues/new/choose). Be sure to include a **title** and **clear description**, as much relevant information as possible, the **issue form** helps you providing the right information. Deleting the form and just pasting the stack trace doesn't speed up fixing the problem. If your issue could be resolved, consider closing the issue.
+If you're unable to find an **open issue** addressing the problem, open a [new one](https://github.com/janeczku/calibre-web/issues/new/choose). Be sure to include a **title** and **clear description**, as much relevant information as possible, the **issue form** helps you provide the right information. Deleting the form and just pasting the stack trace doesn't speed up fixing the problem. If your issue could be resolved, consider closing the issue.
 
 ### **Feature Request**
 
 If there is a feature missing in Calibre-Web and you can't find a feature request in the [Issues](https://github.com/janeczku/calibre-web/issues) section, you could create a [feature request](https://github.com/janeczku/calibre-web/issues/new?assignees=&labels=&template=feature_request.md&title=).
-We will not extend Calibre-Web with any more login abilities or add further files storages, or file syncing ability. Furthermore Calibre-Web is made for home usage for company in-house usage, so requests regarding any sorts of social interaction capability, payment routines, search engine or web site analytics integration will not be implemented.
+We will not extend Calibre-Web with any more login abilities or add further files storages, or file syncing ability. Calibre-Web is made for home usage for company in-house usage, so requests regarding any sorts of social interaction capability, payment routines, search engine or website analytics integration will not be implemented.
 
 ### **Contributing code to Calibre-Web**
 
@@ -42,5 +42,5 @@ Open a new GitHub pull request with the patch. Ensure the PR description clearly
 In case your code enhances features of Calibre-Web: Create your pull request for the development branch if your enhancement consists of more than some lines of code in a local section of Calibre-Webs code. This makes it easier to test it and check all implication before it's made public.
 
 Please check if your code runs with python 3, python 2 is no longer supported. If possible and the feature is related to operating system functions, try to check it on Windows and Linux.
-Calibre-Web is automatically tested on Linux in combination with python 3.8. The code for testing is in a [separate repo](https://github.com/OzzieIsaacs/calibre-web-test) on Github. It uses unit tests and performs real system tests with selenium; it would be great if you could consider also writing some tests.
+Calibre-Web is automatically tested on Linux in combination with python 3.8. The code for testing is in a [separate repo](https://github.com/OzzieIsaacs/calibre-web-test) on GitHub. It uses unit tests and performs real system tests with selenium; it would be great if you could consider also writing some tests.
 A static code analysis is done by Codacy, but it's partly broken and doesn't run automatically. You could check your code with ESLint before contributing, a configuration file can be found in the projects root folder.

README.md

@@ -115,7 +115,6 @@ Calibre-Web is a web app that offers a clean and intuitive interface for browsin
 
 - **Python Version**: Ensure you have Python 3.7 or newer.
 - **Imagemagick**: Required for cover extraction from EPUBs. Windows users may also need to install [Ghostscript](https://ghostscript.com/releases/gsdnld.html) for PDF cover extraction.
-- **Windows Users**: Install [libmagic](https://gnuwin32.sourceforge.net/downlinks/file.php) for 32bit python or [libmagic for 64bit python](https://github.com/nscaife/file-windows/releases/tag/20170108), depending on your Python version. Make sure these files are included in your path.
 - **Optional Tools**:
    - **Calibre desktop program**: Recommended for on-the-fly conversion and metadata editing. Set the path to Calibre’s converter tool on the setup page.
    - **Kepubify tool**: Needed for Kobo device support. Download the tool and place the binary in `/opt/kepubify` on Linux or `C:\Program Files\kepubify` on Windows.
@@ -144,6 +143,7 @@ in your Docker run/compose file. Omit this variable for a lightweight image.
 - **Common Issues**: 
    - If you experience issues starting the application, check the log files located in the `logs` directory for error messages.
    - If eBooks fail to load, verify that the `Location of Calibre database` is correctly set and that the database file is accessible.
+   - You need to enable uploads under `Basic settings` for this option to appear
 
 - **Configuration Errors**: Ensure that your Calibre database is compatible and properly formatted. Refer to the Calibre documentation for guidance on maintaining the database.
 

SECURITY.md

@@ -10,44 +10,44 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 
 ## History
 
-| Fixed in      | Description                                                                                                                    |CVE number |
+| Fixed in      | Description                                                                                                                      | CVE number     |
-|---------------|--------------------------------------------------------------------------------------------------------------------------------|---------|
+|---------------|----------------------------------------------------------------------------------------------------------------------------------|----------------|
-| 3rd July 2018 | Guest access acts as a backdoor                                                                                                ||
+| 3rd July 2018 | Guest access acts as a backdoor                                                                                                  |                |
-| V 0.6.7       | Hardcoded secret key for sessions                                                                                              |CVE-2020-12627 |
+| V 0.6.7       | Hardcoded secret key for sessions                                                                                                | CVE-2020-12627 |
-| V 0.6.13      | Calibre-Web Metadata cross site scripting                                                                                      |CVE-2021-25964|
+| V 0.6.13      | Calibre-Web Metadata cross site scripting                                                                                        | CVE-2021-25964 |
-| V 0.6.13      | Name of Shelves are only visible to users who can access the corresponding shelf Thanks to @ibarrionuevo                       ||
+| V 0.6.13      | Name of Shelves are only visible to users who can access the corresponding shelf Thanks to @ibarrionuevo                         |                |
-| V 0.6.13      | JavaScript could get executed in the description field. Thanks to @ranjit-git  and Hagai Wechsler (WhiteSource)                ||
+| V 0.6.13      | JavaScript could get executed in the description field. Thanks to @ranjit-git  and Hagai Wechsler (WhiteSource)                  |                |
-| V 0.6.13      | JavaScript could get executed in a custom column of type "comment" field                                                       ||
+| V 0.6.13      | JavaScript could get executed in a custom column of type "comment" field                                                         |                |
-| V 0.6.13      | JavaScript could get executed after converting a book to another format with a title containing javascript code                ||
+| V 0.6.13      | JavaScript could get executed after converting a book to another format with a title containing javascript code                  |                |
-| V 0.6.13      | JavaScript could get executed after converting a book to another format with a username containing javascript code             ||
+| V 0.6.13      | JavaScript could get executed after converting a book to another format with a username containing javascript code               |                |
-| V 0.6.13      | JavaScript could get executed in the description series, categories or publishers title                                        ||
+| V 0.6.13      | JavaScript could get executed in the description series, categories or publishers title                                          |                |
-| V 0.6.13      | JavaScript could get executed  in the shelf title                                                                              ||
+| V 0.6.13      | JavaScript could get executed  in the shelf title                                                                                |                |
-| V 0.6.13      | Login with the old session cookie after logout. Thanks to @ibarrionuevo                                                        ||
+| V 0.6.13      | Login with the old session cookie after logout. Thanks to @ibarrionuevo                                                          |                |
-| V 0.6.14      | CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)                                                          |CVE-2021-25965|
+| V 0.6.14      | CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)                                                            | CVE-2021-25965 |
-| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                                    |CVE-2021-4164|
+| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                                      | CVE-2021-4164  |
-| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                                           |CVE-2021-4170|
+| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                                             | CVE-2021-4170  |
-| V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                                       ||
+| V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                                         |                |
-| V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo                   ||
+| V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo                     |                |
-| V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                                ||
+| V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                                  |                |
-| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                               |CVE-2022-0352|
+| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                                 | CVE-2022-0352  |
-| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                                           |CVE-2022-0339|
+| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                                             | CVE-2022-0339  |
-| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon                         |CVE-2022-0273|
+| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon                           | CVE-2022-0273  |
-| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                                        |CVE-2022-0405|
+| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                                          | CVE-2022-0405  |
-| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                                        |CVE-2022-0767|
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                                          | CVE-2022-0767  |
-| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH                         |CVE-2022-0766|
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH                           | CVE-2022-0766  |
-| V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                               |CVE-2022-30765|
+| V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                                 | CVE-2022-30765 |
-| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                                     |CVE-2022-0939|
+| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                                       | CVE-2022-0939  |
-| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley      |CVE-2022-0990|
+| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley        | CVE-2022-0990  |
-| V 0.6.20      | Credentials for emails are now stored encrypted                                                                                ||
+| V 0.6.20      | Credentials for emails are now stored encrypted                                                                                  |                |
-| V 0.6.20      | Login is rate limited                                                                                                          ||
+| V 0.6.20      | Login is rate limited                                                                                                            |                |
-| V 0.6.20      | Passwordstrength can be forced                                                                                                 ||
+| V 0.6.20      | Passwordstrength can be forced                                                                                                   |                |
-| V 0.6.21      | SMTP server credentials are no longer returned to client                                                                       ||
+| V 0.6.21      | SMTP server credentials are no longer returned to client                                                                         |                |
-| V 0.6.21      | Cross-site scripting (XSS) stored in href bypasses filter using data wrapper no longer possible                                ||
+| V 0.6.21      | Cross-site scripting (XSS) stored in href bypasses filter using data wrapper no longer possible                                  |                |
-| V 0.6.21      | Cross-site scripting (XSS) is no longer possible via pathchooser                                                               ||
+| V 0.6.21      | Cross-site scripting (XSS) is no longer possible via pathchooser                                                                 |                |
-| V 0.6.21      | Error Handling at non existent rating, language, and user downloaded books was fixed                                           ||
+| V 0.6.21      | Error Handling at non existent rating, language, and user downloaded books was fixed                                             |                |
-| V 0.6.22      | Upload mimetype is checked to prevent malicious file content in the books library                                              ||
+| V 0.6.22      | Upload mimetype is checked to prevent malicious file content in the books library                                                |                |
-| V 0.6.22      | Cross-site scripting (XSS) stored in comments section is prevented better (switching from lxml to bleach for sanitizing strings) ||
+| V 0.6.22      | Cross-site scripting (XSS) stored in comments section is prevented better (switching from lxml to bleach for sanitizing strings) |                |
-| V 0.6.23      | Cookies are no longer stored for opds basic authentication and proxy authentication                                            ||
+| V 0.6.23      | Cookies are no longer stored for opds basic authentication and proxy authentication                                              |                |
 
 
 

cps.py

@@ -42,9 +42,26 @@ def hide_console_windows():
 
 
 if __name__ == '__main__':
-    if os.name == "nt":
+    # Only hide the console window on Windows when there is no interactive
+    # console attached. This preserves the ability to use Ctrl+C from a
+    # terminal (stdin is a tty) to stop the server.
+    if os.name == "nt" and not sys.stdin.isatty():
         hide_console_windows()
-    main()
+
+    try:
+        main()
+    except KeyboardInterrupt:
+        # Allow stopping the server with Ctrl+C from an interactive console, after reboot of calibre-web
+        # (initally the SIGINT signal CTRL+C is catched in server.py via the signal callback).
+        try:
+            # Try to perform a graceful stop if web_server is available.
+            # Import here to avoid import-time side-effects when not needed.
+            from cps import web_server
+            web_server.stop()
+        except Exception:
+            pass
+        print('\nCalibre-Web: received interrupt, shutting down')
+        sys.exit(0)
 
 
 

cps/__init__.py

@@ -26,6 +26,7 @@ import os
 import mimetypes
 
 from flask import Flask
+from flask.sessions import SecureCookieSessionInterface
 from .MyLoginManager import MyLoginManager
 from flask_principal import Principal
 
@@ -55,17 +56,17 @@ mimetypes.init()
 mimetypes.add_type('application/xhtml+xml', '.xhtml')
 mimetypes.add_type('application/epub+zip', '.epub')
 mimetypes.add_type('application/epub+zip', '.kepub')
-mimetypes.add_type('text/xml', '.fb2')
+mimetypes.add_type('application/fb2+zip', '.fb2')
-mimetypes.add_type('application/octet-stream', '.mobi')
+mimetypes.add_type('application/x-mobipocket-ebook', '.mobi')
 mimetypes.add_type('application/octet-stream', '.prc')
-mimetypes.add_type('application/vnd.amazon.ebook', '.azw')
+mimetypes.add_type('application/x-mobipocket-ebook', '.azw')
-mimetypes.add_type('application/x-mobi8-ebook', '.azw3')
+mimetypes.add_type('application/x-mobipocket-ebook', '.azw3')
-mimetypes.add_type('application/x-rar', '.cbr')
+mimetypes.add_type('application/x-cbr', '.cbr')
-mimetypes.add_type('application/zip', '.cbz')
+mimetypes.add_type('application/x-cbz', '.cbz')
 mimetypes.add_type('application/x-tar', '.cbt')
 mimetypes.add_type('application/x-7z-compressed', '.cb7')
-mimetypes.add_type('image/vnd.djv', '.djv')
+mimetypes.add_type('image/vnd.djvu', '.djv')
-mimetypes.add_type('image/vnd.djv', '.djvu')
+mimetypes.add_type('image/vnd.djvu', '.djvu')
 mimetypes.add_type('application/mpeg', '.mpeg')
 mimetypes.add_type('audio/mpeg', '.mp3')
 mimetypes.add_type('audio/x-m4a', '.m4a')
@@ -77,7 +78,8 @@ mimetypes.add_type('audio/ogg', '.ogg')
 mimetypes.add_type('application/ogg', '.oga')
 mimetypes.add_type('text/css', '.css')
 mimetypes.add_type('application/x-ms-reader', '.lit')
-mimetypes.add_type('text/javascript; charset=UTF-8', '.js')
+mimetypes.add_type('text/javascript', '.js')
+mimetypes.add_type('text/rtf', '.rtf')
 
 log = logger.create()
 
@@ -102,19 +104,26 @@ if wtf_present:
 else:
     csrf = None
 
-calibre_db = db.CalibreDB()
+calibre_db = db.CalibreDB(app)
 
 web_server = WebServer()
 
 updater_thread = Updater()
 
 if limiter_present:
-    limiter = Limiter(key_func=True, headers_enabled=True, auto_check=False, swallow_errors=False)
+    limiter = Limiter(key_func=True, headers_enabled=True, in_memory_fallback_enabled=True, default_limits=[],
+                      swallow_errors=True)
 else:
     limiter = None
 
+class ScriptNameSessionInterface(SecureCookieSessionInterface):
+    def get_cookie_path(self, app):
+        # Called once per response, after request context exists
+        return app.wsgi_app.script_name.rstrip("/") or "/"
+
 
 def create_app():
+    app.session_interface = ScriptNameSessionInterface()
     if csrf:
         csrf.init_app(app)
 
@@ -146,9 +155,7 @@ def create_app():
     lm.anonymous_user = ub.Anonymous
     lm.session_protection = 'strong' if config.config_session == 1 else "basic"
 
-    db.CalibreDB.update_config(config)
+    db.CalibreDB.update_config(config, config.config_calibre_dir, cli_param.settings_path)
-    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 afterward

cps/about.py

@@ -23,7 +23,7 @@
 import sys
 import platform
 import sqlite3
-import importlib
+from importlib.metadata import metadata
 from collections import OrderedDict
 
 import flask
@@ -41,7 +41,7 @@ req = dep_check.load_dependencies(False)
 opt = dep_check.load_dependencies(True)
 for i in (req + opt):
     modules[i[1]] = i[0]
-modules['Jinja2'] = importlib.metadata.version("jinja2")
+modules['Jinja2'] = metadata("jinja2")["Version"]
 if sys.version_info < (3, 12):
     modules['pySqlite'] = sqlite3.version
 modules['SQLite'] = sqlite3.sqlite_version

cps/admin.py

@@ -32,14 +32,15 @@ from datetime import time as datetime_time
 from functools import wraps
 from urllib.parse import urlparse
 
-from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
+from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, \
+    send_from_directory, g, jsonify
 from markupsafe import Markup
 from .cw_login import current_user
 from flask_babel import gettext as _
 from flask_babel import get_locale, format_time, format_datetime, format_timedelta
 from sqlalchemy import and_
 from sqlalchemy.orm.attributes import flag_modified
-from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
+from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError, ArgumentError
 from sqlalchemy.sql.expression import func, or_, text
 
 from . import constants, logger, helper, services, cli_param
@@ -118,7 +119,7 @@ def before_request():
     g.allow_upload = config.config_uploading
     g.current_theme = config.config_theme
     g.config_authors_max = config.config_authors_max
-    if '/static/' not in request.path and not config.db_configured and \
+    if ('/static/' not in request.path and not config.db_configured and
         request.endpoint not in ('admin.ajax_db_config',
                                  'admin.simulatedbchange',
                                  'admin.db_configuration',
@@ -126,7 +127,7 @@ def before_request():
                                  'web.login_post',
                                  'web.logout',
                                  'admin.load_dialogtexts',
-                                 'admin.ajax_pathchooser'):
+                                 'admin.ajax_pathchooser')):
         return redirect(url_for('admin.db_configuration'))
 
 
@@ -144,7 +145,6 @@ def shutdown():
     show_text = {}
     if task in (0, 1):  # valid commandos received
         # close all database connections
-        calibre_db.dispose()
         ub.dispose()
 
         if task == 0:
@@ -189,8 +189,8 @@ def reconnect():
 
 
 @admi.route("/ajax/updateThumbnails", methods=['POST'])
-@admin_required
 @user_login_required
+@admin_required
 def update_thumbnails():
     content = config.get_scheduled_task_settings()
     if content['schedule_generate_book_covers']:
@@ -349,8 +349,9 @@ def list_users():
         if sort not in ub.User.__table__.columns.keys():
             sort = "id"
     order = request.args.get("order", "").lower()
-
     if sort != "state" and order:
+        if not order in ["asc", "desc"]:
+            order = "asc"
         order = text(sort + " " + order)
     elif not state:
         order = ub.User.id.asc()
@@ -379,29 +380,25 @@ def list_users():
             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)
+    return make_response(json.dumps(table_entries, cls=db.AlchemyEncoder))
-    response = make_response(js_list)
-    response.headers["Content-Type"] = "application/json; charset=utf-8"
-    return response
 
 
 @admi.route("/ajax/deleteuser", methods=['POST'])
 @user_login_required
 @admin_required
 def delete_user():
-    user_ids = request.form.to_dict(flat=False)
+    user_ids = request.get_json().get("userid")
-    users = None
     message = ""
-    if "userid[]" in user_ids:
+    try:
-        users = ub.session.query(ub.User).filter(ub.User.id.in_(user_ids['userid[]'])).all()
+        users = ub.session.query(ub.User).filter(ub.User.id.in_(user_ids)).all()
-    elif "userid" in user_ids:
+    except (ArgumentError):
-        users = ub.session.query(ub.User).filter(ub.User.id == user_ids['userid'][0]).all()
+        users = None
     count = 0
     errors = list()
     success = list()
     if not users:
         log.error("User not found")
-        return Response(json.dumps({'type': "danger", 'message': _("User not found")}), mimetype='application/json')
+        return make_response(jsonify(type="danger", message=_("User not found")))
     for user in users:
         try:
             message = _delete_user(user)
@@ -411,13 +408,13 @@ def delete_user():
             errors.append({'type': "danger", 'message': str(ex)})
 
     if count == 1:
-        log.info("User {} deleted".format(user_ids))
+        log.info("User {} deleted".format(user_ids[0]))
         success = [{'type': "success", 'message': message}]
     elif count > 1:
-        log.info("Users {} deleted".format(user_ids))
+        log.info("Users {} deleted".format(", ".join([str(user_id) for user_id in user_ids])))
         success = [{'type': "success", 'message': _("{} users deleted successfully").format(count)}]
     success.extend(errors)
-    return Response(json.dumps(success), mimetype='application/json')
+    return make_response(jsonify(success))
 
 
 @admi.route("/ajax/getlocale")
@@ -429,7 +426,7 @@ def table_get_locale():
     current_locale = get_locale()
     for loc in locale:
         ret.append({'value': str(loc), 'text': loc.get_language_name(current_locale)})
-    return json.dumps(ret)
+    return json.dumps(sorted(ret, key=lambda x: x['text']))
 
 
 @admi.route("/ajax/getdefaultlanguage")
@@ -441,7 +438,7 @@ def table_get_default_lang():
     ret.append({'value': 'all', 'text': _('Show All')})
     for lang in languages:
         ret.append({'value': lang.lang_code, 'text': lang.name})
-    return json.dumps(ret)
+    return json.dumps(sorted(ret, key=lambda x: x['text']))
 
 
 @admi.route("/ajax/editlistusers/<param>", methods=['POST'])
@@ -499,10 +496,10 @@ def edit_list_user(param):
                                 if not ub.session.query(ub.User). \
                                     filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
                                            ub.User.id != user.id).count():
-                                    return Response(
+                                    return make_response(
-                                        json.dumps([{'type': "danger",
+                                        jsonify([{'type': "danger",
                                                      'message': _("No admin user remaining, can't remove admin role",
-                                                                  nick=user.name)}]), mimetype='application/json')
+                                                                  nick=user.name)}]))
                             user.role &= ~value
                         else:
                             raise Exception(_("Value has to be true or false"))
@@ -621,6 +618,8 @@ def load_dialogtexts(element_id):
         texts["main"] = _('Do you really want to delete this domain?')
     elif element_id == "btndeluser":
         texts["main"] = _('Do you really want to delete this user?')
+    elif element_id == "btndelbook":
+        texts["main"] = _('Do you really want to delete this book?')
     elif element_id == "delete_shelf":
         texts["main"] = _('Are you sure you want to delete this shelf?')
     elif element_id == "select_locale":
@@ -629,6 +628,10 @@ def load_dialogtexts(element_id):
         texts["main"] = _('Are you sure you want to change visible book languages for selected user(s)?')
     elif element_id == "role":
         texts["main"] = _('Are you sure you want to change the selected role for the selected user(s)?')
+    elif element_id == "archive_books":
+        texts["main"] = _('Are you sure you want to change the archive status for the selected book(s)?')
+    elif element_id == "read_books":
+        texts["main"] = _('Are you sure you want to change the read status for the selected book(s)?')
     elif element_id == "restrictions":
         texts["main"] = _('Are you sure you want to change the selected restrictions for the selected user(s)?')
     elif element_id == "sidebar_view":
@@ -948,7 +951,7 @@ def do_full_kobo_sync(userid):
     count = ub.session.query(ub.KoboSyncedBooks).filter(userid == ub.KoboSyncedBooks.user_id).delete()
     message = _("{} sync entries deleted").format(count)
     ub.session_commit(message)
-    return Response(json.dumps([{"type": "success", "message": message}]), mimetype='application/json')
+    return make_response(jsonify(type="success", message=message))
 
 
 def check_valid_read_column(column):
@@ -1265,7 +1268,7 @@ def _configuration_ldap_helper(to_save):
 @admin_required
 def simulatedbchange():
     db_change, db_valid = _db_simulate_change()
-    return Response(json.dumps({"change": db_change, "valid": db_valid}), mimetype='application/json')
+    return make_response(jsonify(change=db_change, valid=db_valid))
 
 
 @admi.route("/admin/user/new", methods=["GET", "POST"])
@@ -1737,14 +1740,12 @@ def _db_configuration_update_helper():
             return _db_configuration_result(_("Books path not valid"), gdrive_error)
         else:
             _config_string(to_save, "config_calibre_split_dir")
-
+    if (db_change or not db_valid or not config.db_configured
-    if db_change or not db_valid or not config.db_configured \
+           or config.config_calibre_dir != to_save["config_calibre_dir"]):
-      or config.config_calibre_dir != to_save["config_calibre_dir"]:
         if not os.path.exists(metadata_db) or not to_save['config_calibre_dir']:
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'), gdrive_error)
         else:
             calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path)
-        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")
@@ -1767,10 +1768,11 @@ def _db_configuration_update_helper():
             config.config_allowed_column_value = ""
             config.config_read_column = 0
         _config_string(to_save, "config_calibre_dir")
-        calibre_db.update_config(config)
+        calibre_db.update_config(config, config.config_calibre_dir, ub.app_DB_path)
+        config.store_calibre_uuid(calibre_db, db.Library_Id)
         if not os.access(os.path.join(config.config_calibre_dir, "metadata.db"), os.W_OK):
             flash(_("DB is not Writeable"), category="warning")
-    calibre_db.update_config(config)
+    calibre_db.update_config(config, config.config_calibre_dir, ub.app_DB_path)
     config.save()
     return _db_configuration_result(None, gdrive_error)
 
@@ -1837,6 +1839,9 @@ def _configuration_update_helper():
             services.goodreads_support.connect(config.config_goodreads_api_key,
                                                config.config_use_goodreads)
 
+        # Google Books API configuration
+        reboot_required |=_config_string(to_save, "config_googlebooks_api_key")
+        
         _config_int(to_save, "config_updatechannel")
 
         # Reverse proxy login configuration
@@ -1898,7 +1903,7 @@ def _configuration_result(error_flash=None, reboot=False):
         resp['result'] = [{'type': "success", 'message': _("Calibre-Web configuration updated")}]
     resp['reboot'] = reboot
     resp['config_upload'] = config.config_upload_formats
-    return Response(json.dumps(resp), mimetype='application/json')
+    return make_response(jsonify(resp))
 
 
 def _db_configuration_result(error_flash=None, gdrive_error=None):

cps/audio.py

@@ -16,8 +16,6 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import os
-
 import mutagen
 import base64
 from . import cover, logger
@@ -51,13 +49,12 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na
             if not pubdate:
                 pubdate = str(audio_file.tags.get('TDOR').text[0]) if "TDOR" in audio_file.tags else None
         if cover_data and not no_cover_processing:
-            tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg')
             cover_info = cover_data[0]
             for dat in cover_data:
                 if dat.type == mutagen.id3.PictureType.COVER_FRONT:
                     cover_info = dat
                     break
-            cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:])
+            tmp_cover_name = cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:])
     elif original_file_extension in [".ogg", ".flac", ".opus", ".ogv"]:
         title = audio_file.tags.get('TITLE')[0] if "TITLE" in audio_file else None
         author = audio_file.tags.get('ARTIST')[0] if "ARTIST" in audio_file else None
@@ -70,17 +67,15 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na
         cover_data = audio_file.tags.get('METADATA_BLOCK_PICTURE')
         if not no_cover_processing:
             if cover_data:
-                tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg')
                 cover_info = mutagen.flac.Picture(base64.b64decode(cover_data[0]))
-                cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:])
+                tmp_cover_name = cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:])
             if hasattr(audio_file, "pictures"):
                 cover_info = audio_file.pictures[0]
                 for dat in audio_file.pictures:
                     if dat.type == mutagen.id3.PictureType.COVER_FRONT:
                         cover_info = dat
                         break
-                tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg')
+                tmp_cover_name = cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:])
-                cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:])
     elif original_file_extension in [".aac"]:
         title = audio_file.tags.get('Title').value if "Title" in audio_file else None
         author = audio_file.tags.get('Artist').value if "Artist" in audio_file else None
@@ -92,7 +87,7 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na
         pubdate = audio_file.tags.get('Year').value if "Year" in audio_file else None
         cover_data = audio_file.tags['Cover Art (Front)']
         if cover_data and not no_cover_processing:
-            tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg')
+            tmp_cover_name = tmp_file_path + '.jpg'
             with open(tmp_cover_name, "wb") as cover_file:
                 cover_file.write(cover_data.value.split(b"\x00",1)[1])
     elif original_file_extension in [".asf"]:
@@ -106,7 +101,7 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na
         pubdate = audio_file.tags.get('Year')[0].value if "Year" in audio_file else None
         cover_data = audio_file.tags.get('WM/Picture', None)
         if cover_data and not no_cover_processing:
-            tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg')
+            tmp_cover_name = tmp_file_path + '.jpg'
             with open(tmp_cover_name, "wb") as cover_file:
                 cover_file.write(cover_data[0].value)
     elif original_file_extension in [".mp4", ".m4a", ".m4b"]:
@@ -120,7 +115,6 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na
         pubdate = audio_file.tags.get('©day')[0] if "©day" in audio_file.tags else None
         cover_data = audio_file.tags.get('covr', None)
         if cover_data and not no_cover_processing:
-            tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg')
             cover_type = None
             for c in cover_data:
                 if c.imageformat == mutagen.mp4.AtomDataType.JPEG:
@@ -132,7 +126,7 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na
                     cover_bin = c
                     break
             if cover_type:
-                cover.cover_processing(tmp_file_path, cover_bin, cover_type)
+                tmp_cover_name = cover.cover_processing(tmp_file_path, cover_bin, cover_type)
             else:
                 logger.error("Unknown covertype in file {} ".format(original_file_name))
 

cps/basic.py

@@ -0,0 +1,89 @@
+#  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,
+#                            falgh1, grunjol, csitko, ytils, xybydy, trasba, vrabe,
+#                            ruben-herold, marblepebble, JackED42, SiphonSquirrel,
+#                            apetresc, nanu-c, mutschler, carderne
+#
+#  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 flask import Blueprint
+from flask_babel import gettext as _
+from flask_babel import get_locale
+from flask import request, redirect, url_for
+
+from . import logger, isoLanguages
+from . import db, config
+from . import calibre_db
+from .usermanagement import login_required_if_no_ano
+from .render_template import render_title_template
+from .web import get_sort_function
+
+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
+
+basic = Blueprint('basic', __name__)
+
+log = logger.create()
+
+
+@basic.route("/basic", methods=["GET"])
+@login_required_if_no_ano
+def index():
+    term = request.args.get("query", "")  # default to showing all books
+    limit = 15
+    page = int(request.args.get("page") or 1)
+    off = (page - 1) * limit
+    order = get_sort_function("stored", "search")
+    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,
+                                                                      off,
+                                                                      order,
+                                                                      limit,
+                                                                      *join)
+    return render_title_template('basic_index.html',
+                                 searchterm=term,
+                                 pagination=pagination,
+                                 query=term,
+                                 adv_searchterm=term,
+                                 entries=entries,
+                                 result_count=result_count,
+                                 title=_("Search"),
+                                 page="search",
+                                 order=order[1])
+
+
+@basic.route("/basic_book/<int:book_id>")
+@login_required_if_no_ano
+def show_book(book_id):
+    entries = calibre_db.get_book_read_archived(book_id, config.config_read_column, allow_show_archived=True)
+    if entries:
+        entry = entries[0]
+        for lang_index in range(0, len(entry.languages)):
+            entry.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
+                lang_index].lang_code)
+        entry.ordered_authors = calibre_db.order_authors([entry])
+
+        return render_title_template('basic_detail.html',
+                                     entry=entry,
+                                     is_xhr=request.headers.get('X-Requested-With') == 'XMLHttpRequest',
+                                     title=entry.title,
+                                     page="book")
+    else:
+        log.debug("Selected book is unavailable. File does not exist or is not accessible")
+        return redirect(url_for("basic.index"))

cps/clean_html.py

@@ -35,8 +35,13 @@ def clean_string(unsafe_text, book_id=0):
     try:
         if bleach:
             allowed_tags = list(ALLOWED_TAGS)
-            allowed_tags.extend(["p", "span", "div", "pre", "br", "h1", "h2", "h3", "h4", "h5", "h6"])
+            allowed_tags.extend(["p", "span", "div", "pre", "br", "h1", "h2", "h3", "h4", "h5", "h6", "img"])
-            safe_text = clean_html(unsafe_text, tags=set(allowed_tags))
+            allowed_attributes = {
+                "*": ["class", "style"],
+                "a": ["href", "title", "rel"],
+                "img": ["src", "alt", "title", "width", "height"],
+            }
+            safe_text = clean_html(unsafe_text, tags=set(allowed_tags), attributes=allowed_attributes)
         else:
             safe_text = clean_html(unsafe_text)
     except ParserError as e:

cps/comic.py

@@ -65,7 +65,7 @@ def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_exec
     cover_data = extension = None
     if original_file_extension.upper() == '.CBZ':
         cf = zipfile.ZipFile(tmp_file_name)
-        for name in cf.namelist():
+        for name in sorted(cf.namelist()):
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
@@ -74,7 +74,7 @@ def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_exec
                     break
     elif original_file_extension.upper() == '.CBT':
         cf = tarfile.TarFile(tmp_file_name)
-        for name in cf.getnames():
+        for name in sorted(cf.getnames()):
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
@@ -85,18 +85,18 @@ def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_exec
         try:
             rarfile.UNRAR_TOOL = rar_executable
             cf = rarfile.RarFile(tmp_file_name)
-            for name in cf.namelist():
+            for name in sorted(cf.namelist()):
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
                     if extension in cover.COVER_EXTENSIONS:
-                        cover_data = cf.read([name])
+                        cover_data = cf.read(name)
                         break
         except Exception as ex:
             log.error('Rarfile failed with error: {}'.format(ex))
     elif original_file_extension.upper() == '.CB7' and use_7zip:
         cf = py7zr.SevenZipFile(tmp_file_name)
-        for name in cf.getnames():
+        for name in sorted(cf.getnames()):
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
@@ -109,13 +109,13 @@ def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_exec
     return cover_data, extension
 
 
-def _extract_cover(tmp_file_name, original_file_extension, rar_executable):
+def _extract_cover(tmp_file_path, original_file_extension, rar_executable):
     cover_data = extension = None
     if use_comic_meta:
         try:
-            archive = ComicArchive(tmp_file_name, rar_exe_path=rar_executable)
+            archive = ComicArchive(tmp_file_path, rar_exe_path=rar_executable)
         except TypeError:
-            archive = ComicArchive(tmp_file_name)
+            archive = ComicArchive(tmp_file_path)
         name_list = archive.getPageNameList if hasattr(archive, "getPageNameList") else archive.get_page_name_list
         for index, name in enumerate(name_list()):
             ext = os.path.splitext(name)
@@ -126,8 +126,8 @@ def _extract_cover(tmp_file_name, original_file_extension, rar_executable):
                     cover_data = get_page(index)
                     break
     else:
-        cover_data, extension = _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_executable)
+        cover_data, extension = _extract_cover_from_archive(original_file_extension, tmp_file_path, rar_executable)
-    return cover.cover_processing(tmp_file_name, cover_data, extension)
+    return cover.cover_processing(tmp_file_path, cover_data, extension)
 
 
 def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rar_executable, no_cover_processing):

cps/config_sql.py

@@ -84,8 +84,8 @@ class _Settings(_Base):
     config_authors_max = Column(Integer, default=0)
     config_read_column = Column(Integer, default=0)
     config_title_regex = Column(String,
-                                default=r'^(A|The|An|Der|Die|Das|Den|Ein|Eine'
+                                default=r"^(A|The|An|Der|Die|Das|Den|Ein|Eine"
-                                        r'|Einen|Dem|Des|Einem|Eines|Le|La|Les|L\'|Un|Une)\s+')
+                                        r"|Einen|Dem|Des|Einem|Eines|Le|La|Les|L'|Un|Une)(\s+|(?<='))")
     config_theme = Column(Integer, default=0)
 
     config_log_level = Column(SmallInteger, default=logger.DEFAULT_LOG_LEVEL)
@@ -117,6 +117,7 @@ class _Settings(_Base):
 
     config_use_goodreads = Column(Boolean, default=False)
     config_goodreads_api_key = Column(String)
+    config_googlebooks_api_key = Column(String, default='')
     config_register_email = Column(Boolean, default=False)
     config_login_type = Column(Integer, default=0)
 
@@ -325,7 +326,9 @@ class ConfigSQL(object):
     def to_dict(self):
         storage = {}
         for k, v in self.__dict__.items():
-            if k[0] != '_' and not k.endswith("_e") and not k == "cli":
+            if k[0] != '_' and not k.endswith("_e") and not k == "cli" \
+                    and 'api' not in k.lower() and 'token' not in k.lower() \
+                    and 'secret' not in k.lower():
                 storage[k] = v
         return storage
 
@@ -402,14 +405,16 @@ class ConfigSQL(object):
         self.save()
 
     def get_book_path(self):
-        return self.config_calibre_split_dir if self.config_calibre_split_dir else self.config_calibre_dir
+        return self.config_calibre_split_dir if self.config_calibre_split else self.config_calibre_dir
 
     def store_calibre_uuid(self, calibre_db, Library_table):
+        from . import app
         try:
-            calibre_uuid = calibre_db.session.query(Library_table).one_or_none()
+            with app.app_context():
-            if self.config_calibre_uuid != calibre_uuid.uuid:
+                calibre_uuid = calibre_db.session.query(Library_table).one_or_none()
-                self.config_calibre_uuid = calibre_uuid.uuid
+                if self.config_calibre_uuid != calibre_uuid.uuid:
-                self.save()
+                    self.config_calibre_uuid = calibre_uuid.uuid
+                    self.save()
         except AttributeError:
             pass
 
@@ -483,6 +488,8 @@ def autodetect_calibre_binaries():
                         "C:\\program files(x86)\\calibre\\",
                         "C:\\program files(x86)\\calibre2\\",
                         "C:\\program files\\calibre2\\"]
+    elif sys.platform.startswith("freebsd"):
+        calibre_path = ["/usr/local/bin/"]
     else:
         calibre_path = ["/opt/calibre/"]
     for element in calibre_path:
@@ -513,6 +520,8 @@ def autodetect_unrar_binary():
     if sys.platform == "win32":
         calibre_path = ["C:\\program files\\WinRar\\unRAR.exe",
                         "C:\\program files(x86)\\WinRar\\unRAR.exe"]
+    elif sys.platform.startswith("freebsd"):
+        calibre_path = ["/usr/local/bin/unrar"]
     else:
         calibre_path = ["/usr/bin/unrar"]
     for element in calibre_path:
@@ -525,6 +534,8 @@ def autodetect_kepubify_binary():
     if sys.platform == "win32":
         calibre_path = ["C:\\program files\\kepubify\\kepubify-windows-64Bit.exe",
                         "C:\\program files(x86)\\kepubify\\kepubify-windows-64Bit.exe"]
+    elif sys.platform.startswith("freebsd"):
+        calibre_path = ["/usr/local/bin/kepubify"]
     else:
         calibre_path = ["/opt/kepubify/kepubify-linux-64bit", "/opt/kepubify/kepubify-linux-32bit"]
     for element in calibre_path:
@@ -574,6 +585,7 @@ def get_encryption_key(key_path):
         try:
             with open(key_file, "wb") as f:
                 f.write(key)
+            os.chmod(key_file, 0o600)
         except PermissionError as e:
             error = e
     return key, error

cps/constants.py

@@ -37,9 +37,12 @@ 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 - use CACHE_DIR environment variable, otherwise use the default directory: cps/cache
+# Cache dir - use CACHE_DIRECTORY environment variable, otherwise CACHE_DIR (for backwards compatibility),
+# 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_DIRECTORY = os.environ.get(
+    'CACHE_DIRECTORY', os.environ.get('CACHE_DIR', DEFAULT_CACHE_DIR)
+)
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"), ".calibre-web")
@@ -172,7 +175,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d
                                   'series_id, languages, publisher, pubdate, identifiers')
 
 # python build process likes to have x.y.zbw -> b for beta and w a counting number
-STABLE_VERSION =  '0.6.24'
+STABLE_VERSION =  '0.6.27b'
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'

cps/cover.py

@@ -29,13 +29,14 @@ NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
 COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
 
 
-def cover_processing(tmp_file_name, img, extension):
+def cover_processing(tmp_file_path, img, extension):
-    tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
+    # tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
+    tmp_cover_name = tmp_file_path + '.jpg'
     if extension in NO_JPEG_EXTENSIONS:
         if use_IM:
             with Image(blob=img) as imgc:
                 imgc.format = 'jpeg'
-                imgc.transform_colorspace('rgb')
+                imgc.transform_colorspace('srgb')
                 imgc.save(filename=tmp_cover_name)
                 return tmp_cover_name
         else:

cps/cw_babel.py

@@ -34,7 +34,7 @@ def get_user_locale_language(user_language):
 
 
 def get_available_locale():
-    return [Locale('en')] + babel.list_translations()
+    return sorted(babel.list_translations(), key=lambda x: x.display_name.lower())
 
 
 def get_available_translations():

cps/cw_login/login_manager.py

@@ -7,7 +7,6 @@ from flask import abort
 from flask import current_app
 from flask import flash
 from flask import g
-from flask import has_app_context
 from flask import redirect
 from flask import request
 from flask import session
@@ -469,7 +468,7 @@ class LoginManager:
         config = current_app.config
         cookie_name = config.get("REMEMBER_COOKIE_NAME", COOKIE_NAME)
         domain = config.get("REMEMBER_COOKIE_DOMAIN")
-        path = config.get("REMEMBER_COOKIE_PATH", "/")
+        path = config.get("REMEMBER_COOKIE_PATH", current_app.wsgi_app.script_name)
 
         secure = config.get("REMEMBER_COOKIE_SECURE", COOKIE_SECURE)
         httponly = config.get("REMEMBER_COOKIE_HTTPONLY", COOKIE_HTTPONLY)
@@ -520,36 +519,5 @@ class LoginManager:
         config = current_app.config
         cookie_name = config.get("REMEMBER_COOKIE_NAME", COOKIE_NAME)
         domain = config.get("REMEMBER_COOKIE_DOMAIN")
-        path = config.get("REMEMBER_COOKIE_PATH", "/")
+        path = config.get("REMEMBER_COOKIE_PATH", current_app.wsgi_app.script_name)
         response.delete_cookie(cookie_name, domain=domain, path=path)
-
-    @property
-    def _login_disabled(self):
-        """Legacy property, use app.config['LOGIN_DISABLED'] instead."""
-        import warnings
-
-        warnings.warn(
-            "'_login_disabled' is deprecated and will be removed in"
-            " Flask-Login 0.7. Use 'LOGIN_DISABLED' in 'app.config'"
-            " instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        if has_app_context():
-            return current_app.config.get("LOGIN_DISABLED", False)
-        return False
-
-    @_login_disabled.setter
-    def _login_disabled(self, newvalue):
-        """Legacy property setter, use app.config['LOGIN_DISABLED'] instead."""
-        import warnings
-
-        warnings.warn(
-            "'_login_disabled' is deprecated and will be removed in"
-            " Flask-Login 0.7. Use 'LOGIN_DISABLED' in 'app.config'"
-            " instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        current_app.config["LOGIN_DISABLED"] = newvalue

cps/db.py

@@ -23,14 +23,14 @@ import json
 from datetime import datetime, timezone
 from urllib.parse import quote
 import unidecode
-from weakref import WeakSet
+# from weakref import WeakSet
 from uuid import uuid4
 
 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
-from sqlalchemy.orm import relationship, sessionmaker, scoped_session
+from sqlalchemy.orm import relationship, sessionmaker, scoped_session, selectinload
 from sqlalchemy.orm.collections import InstrumentedList
 from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.exc import OperationalError
@@ -45,7 +45,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from .cw_login import current_user
 from flask_babel import gettext as _
 from flask_babel import get_locale
-from flask import flash
+from flask import flash, g, Flask
 
 from . import logger, ub, isoLanguages
 from .pagination import Pagination
@@ -102,6 +102,16 @@ class Identifiers(Base):
     type = Column(String(collation='NOCASE'), nullable=False, default="isbn")
     val = Column(String(collation='NOCASE'), nullable=False)
     book = Column(Integer, ForeignKey('books.id'), nullable=False)
+    amazon = {
+        "jp": "co.jp",
+        "uk": "co.uk",
+        "us": "com",
+        "au": "com.au",
+        "be": "com.be",
+        "br": "com.br",
+        "tr": "com.tr",
+        "mx": "com.mx",
+    }
 
     def __init__(self, val, id_type, book):
         super().__init__()
@@ -114,7 +124,11 @@ class Identifiers(Base):
         if format_type == 'amazon':
             return "Amazon"
         elif format_type.startswith("amazon_"):
-            return "Amazon.{0}".format(format_type[7:].lower().replace("uk","co.uk"))
+            label_amazon = "Amazon.{0}"
+            country_code = format_type[7:].lower()
+            if country_code not in self.amazon:
+                return label_amazon.format(country_code)
+            return label_amazon.format(self.amazon[country_code])
         elif format_type == "isbn":
             return "ISBN"
         elif format_type == "doi":
@@ -137,6 +151,12 @@ class Identifiers(Base):
             return "ISSN"
         elif format_type == "isfdb":
             return "ISFDB"
+        elif format_type == "storygraph":
+            return "StoryGraph"
+        elif format_type == "ebooks":
+            return "eBooks.com"
+        elif format_type == "smashwords":
+            return "Smashwords"
         if format_type == "lubimyczytac":
             return "Lubimyczytac"
         if format_type == "databazeknih":
@@ -149,7 +169,11 @@ class Identifiers(Base):
         if format_type == "amazon" or format_type == "asin":
             return "https://amazon.com/dp/{0}".format(self.val)
         elif format_type.startswith('amazon_'):
-            return "https://amazon.{0}/dp/{1}".format(format_type[7:].lower().replace("uk","co.uk"), self.val)
+            link_amazon = "https://amazon.{0}/dp/{1}"
+            country_code = format_type[7:].lower()
+            if country_code not in self.amazon:
+                return link_amazon.format(country_code, self.val)
+            return link_amazon.format(self.amazon[country_code], self.val)
         elif format_type == "isbn":
             return "https://www.worldcat.org/isbn/{0}".format(self.val)
         elif format_type == "doi":
@@ -173,9 +197,15 @@ class Identifiers(Base):
         elif format_type == "issn":
             return "https://portal.issn.org/resource/ISSN/{0}".format(self.val)
         elif format_type == "isfdb":
-            return "http://www.isfdb.org/cgi-bin/pl.cgi?{0}".format(self.val)
+            return "https://www.isfdb.org/cgi-bin/pl.cgi?{0}".format(self.val)
         elif format_type == "databazeknih":
             return "https://www.databazeknih.cz/knihy/{0}".format(self.val)
+        elif format_type == "storygraph":
+            return "https://app.thestorygraph.com/books/{0}".format(self.val)
+        elif format_type == "ebooks":
+            return "https://www.ebooks.com/en-us/book/{0}".format(self.val)
+        elif format_type == "smashwords":
+            return "https://www.smashwords.com/books/view/{0}".format(self.val)
         elif self.val.lower().startswith("javascript:"):
             return quote(self.val)
         elif self.val.lower().startswith("data:"):
@@ -386,8 +416,8 @@ class Books(Base):
     path = Column(String, default="", nullable=False)
     has_cover = Column(Integer, default=0)
     uuid = Column(String)
-    isbn = Column(String(collation='NOCASE'), default="")
+    # isbn = Column(String(collation='NOCASE'), default="")
-    flags = Column(Integer, nullable=False, default=1)
+    # flags = Column(Integer, nullable=False, default=1)
 
     authors = relationship(Authors, secondary=books_authors_link, backref='books')
     tags = relationship(Tags, secondary=books_tags_link, backref='books', order_by="Tags.name")
@@ -419,7 +449,14 @@ class Books(Base):
 
     @property
     def atom_timestamp(self):
-        return self.timestamp.strftime('%Y-%m-%dT%H:%M:%S+00:00') or ''
+        # OPDS atom:updated is defined as "the most recent instant in time
+        # when the entry was modified". Books.timestamp is the date added and
+        # never changes after import, so metadata and cover edits were
+        # invisible to OPDS sync clients. Use last_modified, which Calibre
+        # updates on every metadata or cover change; fall back to timestamp
+        # only if last_modified happens to be missing.
+        t = self.last_modified or self.timestamp
+        return t.strftime('%Y-%m-%dT%H:%M:%S+00:00') if t else ''
 
 
 class CustomColumns(Base):
@@ -510,34 +547,25 @@ class AlchemyEncoder(json.JSONEncoder):
 
 
 class CalibreDB:
-    _init = False
-    engine = None
     config = None
-    session_factory = None
+    config_calibre_dir = None
-    # This is a WeakSet so that references here don't keep other CalibreDB
+    app_db_path = None
-    # instances alive once they reach the end of their respective scopes
-    instances = WeakSet()
 
-    def __init__(self, expire_on_commit=True, init=False):
+    def __init__(self, _app: Flask=None):  # , expire_on_commit=True, init=False):
         """ Initialize a new CalibreDB session
         """
-        self.session = None
+        self.Session = None
-        if init:
+        #if init:
-            self.init_db(expire_on_commit)
+        #    self.init_db(expire_on_commit)
+        if _app is not None and not _app._got_first_request:
+            self.init_app(_app)
 
-    def init_db(self, expire_on_commit=True):
+    def init_app(self, _app):
-        if self._init:
+        _app.teardown_appcontext(self.teardown)
-            self.init_session(expire_on_commit)
-
-        self.instances.add(self)
-
-    def init_session(self, expire_on_commit=True):
-        self.session = self.session_factory()
-        self.session.expire_on_commit = expire_on_commit
-        self.create_functions(self.config)
 
     @classmethod
     def setup_db_cc_classes(cls, cc):
+        global cc_classes
         cc_ids = []
         books_custom_column_links = {}
         for row in cc:
@@ -605,8 +633,6 @@ class CalibreDB:
                                      secondary=books_custom_column_links[cc_id[0]],
                                      backref='books'))
 
-        return cc_classes
-
     @classmethod
     def check_valid_db(cls, config_calibre_dir, app_db_path, config_calibre_uuid):
         if not config_calibre_dir:
@@ -621,12 +647,11 @@ class CalibreDB:
                                          connect_args={'check_same_thread': False},
                                          poolclass=StaticPool)
             with check_engine.begin() as connection:
-                connection.execute(text("attach database '{}' as calibre;".format(dbpath)))
+                connection.execute(text("attach database '{}' as calibre;".format(dbpath.replace("'", "''"))))
-                connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
+                connection.execute(text("attach database '{}' as app_settings;".format(app_db_path.replace("'", "''"))))
                 local_session = scoped_session(sessionmaker())
                 local_session.configure(bind=connection)
                 database_uuid = local_session().query(Library_Id).one_or_none()
-                # local_session.dispose()
 
             check_engine.connect()
             db_change = config_calibre_uuid != database_uuid.uuid
@@ -634,13 +659,30 @@ class CalibreDB:
             return False, False
         return True, db_change
 
+    def teardown(self, exception):
+        ctx = g.get("lib_sql")
+        if ctx:
+            ctx.close()
+
+    @property
+    def session(self):
+        # connect or get active connection
+        if not g.get("lib_sql"):
+            g.lib_sql = self.connect()
+        return g.lib_sql
+
     @classmethod
-    def update_config(cls, config):
+    def update_config(cls, config, config_calibre_dir, app_db_path):
         cls.config = config
+        cls.config_calibre_dir = config_calibre_dir
+        cls.app_db_path = app_db_path
+
+
+    def connect(self):
+        return self.setup_db(self.config_calibre_dir, self.app_db_path)
 
     @classmethod
     def setup_db(cls, config_calibre_dir, app_db_path):
-        cls.dispose()
 
         if not config_calibre_dir:
             cls.config.invalidate()
@@ -652,16 +694,17 @@ class CalibreDB:
             return None
 
         try:
-            cls.engine = create_engine('sqlite://',
+            engine = create_engine('sqlite://',
                                        echo=False,
                                        isolation_level="SERIALIZABLE",
                                        connect_args={'check_same_thread': False},
                                        poolclass=StaticPool)
-            with cls.engine.begin() as connection:
+            with engine.begin() as connection:
-                connection.execute(text("attach database '{}' as calibre;".format(dbpath)))
+                connection.execute(text('PRAGMA cache_size = 10000;'))
-                connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
+                connection.execute(text("attach database '{}' as calibre;".format(dbpath.replace("'", "''"))))
+                connection.execute(text("attach database '{}' as app_settings;".format(app_db_path.replace("'", "''"))))
 
-            conn = cls.engine.connect()
+            conn = engine.connect()
             # conn.text_factory = lambda b: b.decode(errors = 'ignore') possible fix for #1302
         except Exception as ex:
             cls.config.invalidate(ex)
@@ -677,13 +720,10 @@ class CalibreDB:
                 log.error_or_exception(e)
                 return None
 
-        cls.session_factory = scoped_session(sessionmaker(autocommit=False,
+        return scoped_session(sessionmaker(autocommit=False,
-                                                          autoflush=True,
+                                           autoflush=False,
-                                                          bind=cls.engine, future=True))
+                                           bind=engine, future=True))
-        for inst in cls.instances:
-            inst.init_session()
 
-        cls._init = True
 
     def get_book(self, book_id):
         return self.session.query(Books).filter(Books.id == book_id).first()
@@ -713,7 +753,8 @@ class CalibreDB:
                 .filter(self.common_filters(allow_show_archived)).first())
 
     def get_book_by_uuid(self, book_uuid):
-        return self.session.query(Books).filter(Books.uuid == book_uuid).first()
+        return self.session.query(Books).filter(Books.uuid == book_uuid). \
+            filter(self.common_filters()).first()
 
     def get_book_format(self, book_id, file_format):
         return self.session.query(Data).filter(Data.book == book_id).filter(Data.format == file_format).first()
@@ -868,28 +909,36 @@ class CalibreDB:
         for entry in entries:
             if combined:
                 sort_authors = entry.Books.author_sort.split('&')
-                ids = [a.id for a in entry.Books.authors]
+                authors_list = entry.Books.authors
-
             else:
                 sort_authors = entry.author_sort.split('&')
-                ids = [a.id for a in entry.authors]
+                authors_list = entry.authors
-            authors_ordered = list()
+
-            # error = False
+            # Create dictionary for O(1) lookup instead of nested loops
+            authors_by_sort = {}
+            authors_by_id = {}
+            for author in authors_list:
+                authors_by_sort[author.sort] = author
+                authors_by_id[author.id] = author
+
+            authors_ordered = []
+            ids_remaining = set(authors_by_id.keys())
+
+            # Order authors based on sort field using dictionary lookup
             for auth in sort_authors:
                 auth = strip_whitespaces(auth)
-                results = self.session.query(Authors).filter(Authors.sort == auth).all()
+                if auth in authors_by_sort:
-                # ToDo: How to handle not found author name
+                    author = authors_by_sort[auth]
-                if not len(results):
+                    authors_ordered.append(author)
-                    log.error("Author {} not found to display name in right order".format(auth))
+                    ids_remaining.discard(author.id)
-                    # error = True
+                else:
-                    break
+                    # This can happen if author_sort has stale data or formatting issues
-                for r in results:
+                    book_id = entry.id if isinstance(entry, Books) else (entry.Books.id if combined else entry.id)
-                    if r.id in ids:
+                    log.warning("Author '{}' of book {} not found in author list, skipping in sort order".format(auth, book_id))
-                        authors_ordered.append(r)
+
-                        ids.remove(r.id)
+            # Add any remaining authors not in sort order
-            for author_id in ids:
+            for author_id in ids_remaining:
-                result = self.session.query(Authors).filter(Authors.id == author_id).first()
+                authors_ordered.append(authors_by_id[author_id])
-                authors_ordered.append(result)
 
             if list_return:
                 if combined:
@@ -903,16 +952,13 @@ class CalibreDB:
     def get_typeahead(self, database, query, replace=('', ''), tag_filter=true()):
         query = query or ''
         self.create_functions()
-        # self.session.connection().connection.connection.create_function("lower", 1, lcase)
         entries = self.session.query(database).filter(tag_filter). \
             filter(func.lower(database.name).ilike("%" + query + "%")).all()
-        # json_dumps = json.dumps([dict(name=escape(r.name.replace(*replace))) for r in entries])
         json_dumps = json.dumps([dict(name=r.name.replace(*replace)) for r in entries])
         return json_dumps
 
     def check_exists_book(self, authr, title):
         self.create_functions()
-        # self.session.connection().connection.connection.create_function("lower", 1, lcase)
         q = list()
         author_terms = re.split(r'\s*&\s*', authr)
         for author_term in author_terms:
@@ -922,36 +968,93 @@ class CalibreDB:
             .filter(and_(Books.authors.any(and_(*q)), func.lower(Books.title).ilike("%" + title + "%"))).first()
 
     def search_query(self, term, config, *join):
-        strip_whitespaces(term).lower()
+        term = strip_whitespaces(term).lower()
         self.create_functions()
-        # self.session.connection().connection.connection.create_function("lower", 1, lcase)
-        q = list()
-        author_terms = re.split("[, ]+", term)
-        for author_term in author_terms:
-            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + author_term + "%")))
-        query = self.generate_linked_query(config.config_read_column, Books)
-        if len(join) == 6:
-            query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
-        if len(join) == 3:
-            query = query.outerjoin(join[0], join[1]).outerjoin(join[2])
-        elif len(join) == 2:
-            query = query.outerjoin(join[0], join[1])
-        elif len(join) == 1:
-            query = query.outerjoin(join[0])
 
+        # Try FTS5 search first for better performance
+        fts_ids = None
+        # Check if FTS5 table exists before attempting search
+        if not hasattr(self, '_fts_available'):
+            try:
+                result = self.session.execute(
+                    text("SELECT name FROM sqlite_master WHERE type='table' AND name='books_fts'")
+                ).fetchone()
+                self._fts_available = result is not None
+            except Exception:
+                self._fts_available = False
+
+        if self._fts_available:
+            try:
+                # Escape FTS5 special characters to prevent query errors
+                term_fts = term.replace('"', '""')
+                # Wrap in quotes for phrase matching and better accuracy
+                fts_results = self.session.execute(
+                    text("SELECT DISTINCT rowid FROM books_fts WHERE books_fts MATCH :term"),
+                    {"term": f'"{term_fts}"'}
+                ).fetchall()
+                if fts_results:
+                    fts_ids = [r[0] for r in fts_results]
+            except Exception as ex:
+                # FTS5 query failed, fall back to traditional search
+                log.debug("FTS5 search failed for term '{}', using fallback: {}".format(term, ex))
+
+        # Build base query with optimized joins
+        base_query = self.generate_linked_query(config.config_read_column, Books)
+        base_query = base_query.filter(self.common_filters(True))
+
+        # Apply eager loading for authors to avoid N+1 queries
+        base_query = base_query.options(selectinload(Books.authors))
+
+        if len(join) == 6:
+            base_query = base_query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
+        if len(join) == 3:
+            base_query = base_query.outerjoin(join[0], join[1]).outerjoin(join[2])
+        elif len(join) == 2:
+            base_query = base_query.outerjoin(join[0], join[1])
+        elif len(join) == 1:
+            base_query = base_query.outerjoin(join[0])
+
+        # If FTS5 found results, use those IDs
+        if fts_ids:
+            return base_query.filter(Books.id.in_(fts_ids))
+
+        # Fallback to traditional search with optimized subqueries
+        author_terms = re.split("[, ]+", term)
+
+        # Use subquery for authors to avoid expensive .any() with OR
+        author_subquery = self.session.query(books_authors_link.c.book).join(
+            Authors, books_authors_link.c.author == Authors.id
+        )
+        author_filters = []
+        for author_term in author_terms:
+            author_filters.append(func.lower(Authors.name).ilike("%" + author_term + "%"))
+        if author_filters:
+            author_subquery = author_subquery.filter(and_(*author_filters))
+
+        # Build optimized filter expressions
         cc = self.get_cc_columns(config, filter_config_custom_read=True)
-        filter_expression = [Books.tags.any(func.lower(Tags.name).ilike("%" + term + "%")),
+        filter_expression = [
-                             Books.series.any(func.lower(Series.name).ilike("%" + term + "%")),
+            Books.id.in_(self.session.query(books_tags_link.c.book).join(
-                             Books.authors.any(and_(*q)),
+                Tags, books_tags_link.c.tag == Tags.id
-                             Books.publishers.any(func.lower(Publishers.name).ilike("%" + term + "%")),
+            ).filter(func.lower(Tags.name).ilike("%" + term + "%"))),
-                             func.lower(Books.title).ilike("%" + term + "%")]
+            Books.id.in_(self.session.query(books_series_link.c.book).join(
+                Series, books_series_link.c.series == Series.id
+            ).filter(func.lower(Series.name).ilike("%" + term + "%"))),
+            Books.id.in_(author_subquery),
+            Books.id.in_(self.session.query(books_publishers_link.c.book).join(
+                Publishers, books_publishers_link.c.publisher == Publishers.id
+            ).filter(func.lower(Publishers.name).ilike("%" + term + "%"))),
+            func.lower(Books.title).ilike("%" + term + "%")
+        ]
+
         for c in cc:
             if c.datatype not in ["datetime", "rating", "bool", "int", "float"]:
                 filter_expression.append(
                     getattr(Books,
                             'custom_column_' + str(c.id)).any(
                         func.lower(cc_classes[c.id].value).ilike("%" + term + "%")))
-        return query.filter(self.common_filters(True)).filter(or_(*filter_expression))
+
+        return base_query.filter(or_(*filter_expression))
 
     def get_cc_columns(self, config, filter_config_custom_read=False):
         tmp_cc = self.session.query(CustomColumns).filter(CustomColumns.datatype.notin_(cc_exceptions)).all()
@@ -973,18 +1076,32 @@ class CalibreDB:
     def get_search_results(self, term, config, offset=None, order=None, limit=None, *join):
         order = order[0] if order else [Books.sort]
         pagination = None
-        result = self.search_query(term, config, *join).order_by(*order).all()
+
-        result_count = len(result)
         if offset is not None and limit is not None:
             offset = int(offset)
-            limit_all = offset + int(limit)
+            limit_int = int(limit)
-            pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
+
+            # Use LIMIT+1 pattern to estimate total count without expensive count()
+            query = self.search_query(term, config, *join).order_by(*order)
+            result = query.limit(offset + limit_int + 1).all()
+
+            # Check if there are more results
+            has_more = len(result) > (offset + limit_int)
+            if has_more:
+                result_count = offset + limit_int + 1  # Estimate: at least this many
+            else:
+                result_count = len(result)
+
+            # Extract the page of results
+            result = result[offset:offset + limit_int]
+            pagination = Pagination((offset / limit_int + 1), limit_int, result_count)
         else:
-            offset = 0
+            # No pagination, fetch all results
-            limit_all = result_count
+            result = self.search_query(term, config, *join).order_by(*order).all()
+            result_count = len(result)
 
         ub.store_combo_ids(result)
-        entries = self.order_authors(result[offset:limit_all], list_return=True, combined=True)
+        entries = self.order_authors(result, list_return=True, combined=True)
 
         return entries, result_count, pagination
 
@@ -1009,7 +1126,7 @@ class CalibreDB:
                                  .filter(self.common_filters())
                                  .count())
                 if no_lang_count:
-                    tags.append([Category(_("None"), "none"), no_lang_count])
+                    tags.append([Category(_("None"), "None", "none"), no_lang_count])
             return sorted(tags, key=lambda x: x[0].name.lower(), reverse=reverse_order)
         else:
             if not languages:
@@ -1047,43 +1164,11 @@ class CalibreDB:
         except sqliteOperationalError:
             pass
 
-    @classmethod
-    def dispose(cls):
-        # global session
-
-        for inst in cls.instances:
-            old_session = inst.session
-            inst.session = None
-            if old_session:
-                try:
-                    old_session.close()
-                except Exception:
-                    pass
-                if old_session.bind:
-                    try:
-                        old_session.bind.dispose()
-                    except Exception:
-                        pass
-
-        for attr in list(Books.__dict__.keys()):
-            if attr.startswith("custom_column_"):
-                setattr(Books, attr, None)
-
-        for db_class in cc_classes.values():
-            Base.metadata.remove(db_class.__table__)
-        cc_classes.clear()
-
-        for table in reversed(Base.metadata.sorted_tables):
-            name = table.key
-            if name.startswith("custom_column_") or name.startswith("books_custom_column_"):
-                if table is not None:
-                    Base.metadata.remove(table)
-
     def reconnect_db(self, config, app_db_path):
-        self.dispose()
+        # self.dispose()
-        self.engine.dispose()
+        # self.engine.dispose()
         self.setup_db(config.config_calibre_dir, app_db_path)
-        self.update_config(config)
+        self.update_config(config, config.config_calibre_dir, app_db_path)
 
 
 def lcase(s):
@@ -1095,14 +1180,25 @@ def lcase(s):
         return s.lower()
 
 
+def title_sort(title, config):
+    # calibre sort stuff
+    title_pat = re.compile(config.config_title_regex, re.IGNORECASE)
+    match = title_pat.search(title)
+    if match:
+        prep = match.group(1)
+        title = title[len(prep):] + ', ' + prep
+    return strip_whitespaces(title)
+
 class Category:
     name = None
+    sort = None
     id = None
     count = None
     rating = None
 
     def __init__(self, name, cat_id, rating=None):
         self.name = name
+        self.sort = name
         self.id = cat_id
         self.rating = rating
         self.count = 1

cps/debug_info.py

@@ -23,11 +23,10 @@ import zipfile
 import json
 from io import BytesIO
 from flask_babel.speaklater import LazyString
-
+from importlib.metadata import metadata
 import os
 
 from flask import send_file
-import importlib
 
 from . import logger, config
 from .about import collect_stats
@@ -50,7 +49,7 @@ def assemble_logfiles(file_name):
         with open(f, 'rb') as fd:
             shutil.copyfileobj(fd, wfd)
     wfd.seek(0)
-    version = importlib.metadata.version("flask")
+    version = metadata("flask")["Version"]
     if int(version.split('.')[0]) < 2:
         return send_file(wfd,
                          as_attachment=True,
@@ -74,7 +73,7 @@ def send_debug():
         for fp in file_list:
             zf.write(fp, os.path.basename(fp))
     memory_zip.seek(0)
-    version = importlib.metadata.version("flask")
+    version = metadata("flask")["Version"]
     if int(version.split('.')[0]) < 2:
         return send_file(memory_zip,
                          as_attachment=True,

cps/dep_check.py

@@ -43,23 +43,23 @@ def load_dependencies(optional=False):
                                        r'(?:(python_version)\s?([<=>]+)\s?\'([\d\.]+)\'|'
                                        r'(sys_platform)\s?([\!=]+)\s?\'([\w]+)\'))?', line.strip())
                         try:
+                            if res.group(7) and res.group(8):
+                                val = res.group(8).split(".")
+                                if not eval(str(sys.version_info[0]) + "." + "{:02d}".format(sys.version_info[1]) +
+                                            res.group(7) + val[0] + "." + "{:02d}".format(int(val[1]))):
+                                    continue
+                            elif res.group(10) and res.group(11):
+                                # only installed if platform is eqal, don't check if platform is not equal
+                                if res.group(10) == "==":
+                                    if sys.platform != res.group(11):
+                                        continue
+                                # installed if platform is not eqal, don't check if platform is equal
+                                elif res.group(10) == "!=":
+                                    if sys.platform == res.group(11):
+                                        continue
                             if getattr(sys, 'frozen', False):
                                 dep_version = exe_deps[res.group(1).lower().replace('_', '-')]
                             else:
-                                if res.group(7) and res.group(8):
-                                    val = res.group(8).split(".")
-                                    if not eval(str(sys.version_info[0]) + "." + "{:02d}".format(sys.version_info[1]) +
-                                                res.group(7) + val[0] + "." + "{:02d}".format(int(val[1]))):
-                                        continue
-                                elif res.group(10) and res.group(11):
-                                    # only installed if platform is eqal, don't check if platform is not equal
-                                    if res.group(10) == "==":
-                                        if sys.platform != res.group(11):
-                                            continue
-                                    # installed if platform is not eqal, don't check if platform is equal
-                                    elif res.group(10) == "!=":
-                                        if sys.platform == res.group(11):
-                                            continue
                                 if importlib:
                                     dep_version = version(res.group(1))
                                 else:

cps/editbooks.py

@@ -28,11 +28,11 @@ from shutil import copyfile
 from markupsafe import escape, Markup  # dependency of flask
 from functools import wraps
 
-from flask import Blueprint, request, flash, redirect, url_for, abort, Response
+from flask import Blueprint, request, flash, redirect, url_for, abort, jsonify, make_response, Response
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
 from flask_babel import get_locale
-from .cw_login import current_user, login_required
+from .cw_login import current_user
 from sqlalchemy.exc import OperationalError, IntegrityError, InterfaceError
 from sqlalchemy.orm.exc import StaleDataError
 from sqlalchemy.sql.expression import func
@@ -73,17 +73,18 @@ def edit_required(f):
     return inner
 
 
-@editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
+@editbook.route("/ajax/deletebook", methods=["POST"])
 @user_login_required
-def delete_book_from_details(book_id):
+def delete_books_ajax():
-    return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
+    book_ids = request.get_json().get("bookid")
+    return check_delete_book(book_ids, "", True)
 
 
 @editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
 @editbook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
 @user_login_required
-def delete_book_ajax(book_id, book_format):
+def delete_book(book_id, book_format):
-    return delete_book_from_table(book_id, book_format, False, request.form.to_dict().get('location', ""))
+    return check_delete_book(book_id, book_format, False, request.form.to_dict().get('location', ""))
 
 
 @editbook.route("/admin/book/<int:book_id>", methods=['GET'])
@@ -158,7 +159,7 @@ def upload():
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
                         resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
-                        return Response(json.dumps(resp), mimetype='application/json')
+                        return make_response(jsonify(resp))
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
                         return Response(json.dumps(resp), mimetype='application/json')
@@ -167,7 +168,7 @@ def upload():
                 log.error_or_exception("Database error: {}".format(e))
                 flash(_("Oops! Database Error: %(error)s.", error=e.orig if hasattr(e, "orig") else e),
                       category="error")
-        return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+        return make_response(jsonify(location=url_for("web.index")))
     abort(404)
 
 
@@ -206,118 +207,247 @@ def table_get_custom_enum(c_id):
     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)
+    return make_response(jsonify(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()
+    vals = request.get_json()
-    book = calibre_db.get_book(vals['pk'])
+    multi = vals.get('multi', False) == "True"
-    sort_param = ""
+    ret_value = edit_book_param(param, vals, multi)
-    ret = ""
+    if isinstance(ret_value, dict):
-    try:
+        return jsonify(ret_value)
-        if param == 'series_index':
+    else:
-            edit_book_series_index(vals['value'], book)
+        return ret_value
-            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
+
-        elif param == 'tags':
+@editbook.route("/ajax/editselectedbooks", methods=['POST'])
-            edit_book_tags(vals['value'], book)
+@login_required_if_no_ano
-            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
+@edit_required
-                           mimetype='application/json')
+def edit_selected_books():
-        elif param == 'series':
+    d = request.get_json()
-            edit_book_series(vals['value'], book)
+    selections = d.get('selections')
-            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
+    title = d.get('title')
-                           mimetype='application/json')
+    title_sort = d.get('title_sort')
-        elif param == 'publishers':
+    author_sort = d.get('author_sort')
-            edit_book_publisher(vals['value'], book)
+    authors = d.get('authors')
-            ret = Response(json.dumps({'success': True,
+    categories = d.get('categories')
-                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+    series = d.get('series')
-                           mimetype='application/json')
+    languages = d.get('languages')
-        elif param == 'languages':
+    publishers = d.get('publishers')
-            invalid = list()
+    comments = d.get('comments')
-            edit_book_languages(vals['value'], book, invalid=invalid)
+
-            if invalid:
+    if not (
-                ret = Response(json.dumps({'success': False,
+      title or title_sort or authors or categories or series or languages or publishers or comments) or not selections:
-                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
+        return _("Parameter not found"), 400
-                               mimetype='application/json')
+    vals = {
-            else:
+        "pk": selections,
-                lang_names = list()
+        "value": None,
-                for lang in book.languages:
+        "checkA": d.get('checkA'),
-                    lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
+        "checkT": d.get('checkT'),
-                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+    }
-                               mimetype='application/json')
+    res = list()
-        elif param == 'author_sort':
+    if title:
-            book.author_sort = vals['value']
+        vals['value'] = title
-            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
+        out = edit_book_param('title', vals, True)
-                           mimetype='application/json')
+        if out[0].get('success') != True:
-        elif param == 'title':
+            res.extend(out)
-            sort_param = book.sort
+    if title_sort:
-            if handle_title_on_edit(book, vals.get('value', "")):
+        vals['value'] = title_sort
-                rename_error = helper.update_dir_structure(book.id, config.get_book_path())
+        out = edit_book_param('sort', vals, True)
-                if not rename_error:
+        if out[0].get('success') != True:
-                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+            res.extend(out)
-                                   mimetype='application/json')
+    if author_sort:
-                else:
+        vals['value'] = author_sort
-                    ret = Response(json.dumps({'success': False,
+        out = edit_book_param('author_sort', vals, True)
-                                               'msg': rename_error}),
+        if out[0].get('success') != True:
-                                   mimetype='application/json')
+            res.extend(out)
-        elif param == 'sort':
+    if authors:
-            book.sort = vals['value']
+        vals['value'] = authors
-            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
+        out = edit_book_param('authors', vals, True)
-                           mimetype='application/json')
+        if out[0].get('success') != True:
-        elif param == 'comments':
+            res.extend(out)
-            edit_book_comments(vals['value'], book)
+    if categories:
-            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
+        vals['value'] = categories
-                           mimetype='application/json')
+        out = edit_book_param('tags', vals, True)
-        elif param == 'authors':
+        if out[0].get('success') != True:
-            input_authors, __ = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
+            res.extend(out)
-            rename_error = helper.update_dir_structure(book.id, config.get_book_path(), input_authors[0])
+    if series:
-            if not rename_error:
+        vals['value'] = series
-                ret = Response(json.dumps({
+        out = edit_book_param('series', vals, True)
-                    'success': True,
+        if out[0].get('success') != True:
-                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+            res.extend(out)
-                    mimetype='application/json')
+    if languages:
-            else:
+        vals['value'] = languages
-                ret = Response(json.dumps({'success': False,
+        out = edit_book_param('languages', vals, True)
-                                           'msg': rename_error}),
+        if out[0].get('success') != True:
-                               mimetype='application/json')
+            res.extend(out)
-        elif param == 'is_archived':
+    if publishers:
-            is_archived = change_archived_books(book.id, vals['value'] == "True",
+        vals['value'] = publishers
-                                                message="Book {} archive bit set to: {}".format(book.id, vals['value']))
+        out = edit_book_param('publishers', vals, True)
-            if is_archived:
+        if out[0].get('success') != True:
-                kobo_sync_status.remove_synced_book(book.id)
+            res.extend(out)
-            return ""
+    if comments:
-        elif param == 'read_status':
+        vals['value'] = comments
-            ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
+        out = edit_book_param('comments', vals, True)
-            if ret:
+        if out[0].get('success') != True:
-                return ret, 400
+            res.extend(out)
-        elif param.startswith("custom_column_"):
+    if len(res) == 0:
-            new_val = dict()
+        return jsonify([{'success': True, "msg": _("Changes successfully applied")}])
-            new_val[param] = vals['value']
+    else:
-            edit_single_cc_data(book.id, book, param[14:], new_val)
+        return jsonify(res)
-            # ToDo: Very hacky find better solution
+
-            if vals['value'] in ["True", "False"]:
+# Separated from /editbooks so that /editselectedbooks can also use this
-                ret = ""
+#
-            else:
+# param: the property of the book to be changed
-                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+# vals - JSON Object:
-                               mimetype='application/json')
+#   { 
-        else:
+#       'pk': "the book id",
-            return _("Parameter not found"), 400
+#       'value': "changes value of param to what's passed here"
-        book.last_modified = datetime.now(timezone.utc)
+#       'checkA': "Optional. Used to check if autosort author is enabled. Assumed as true if not passed"
+#       'checkT': "Optional. Used to check if autotitle author is enabled. Assumed as true if not passed"
+#   }
+#
+@login_required_if_no_ano
+@edit_required
+def edit_book_param(param, vals, multi=False):
+    elements = vals.get('pk',[])
+    if vals.get('value', None) is None:
+        return {'success':False, 'msg':_("Value is missing on request")}
+    if not elements or len(elements) > 1 and multi == False:
+        return {"success":False, "msg":_("Oops! Selected book is unavailable. File does not exist or is not accessible")}
+    ret = {}
+    out = list()
+    for elem in elements:
+        book = calibre_db.get_book(elem)
+        if not book:
+            ret = {"success": False,
+                   "msg": _("Oops! Selected book is unavailable. File does not exist or is not accessible")}
+            if multi:
+                out.append(ret)
+                continue
+            else:
+                return ret
+        calibre_db.create_functions(config)
+        sort_param = ""
+        try:
+            if param == 'series_index':
+                edit_book_series_index(vals['value'], book)
+                ret = {"success":True,
+                       "newValue":book.series_index}
+            elif param == 'tags':
+                edit_book_tags(vals['value'], book)
+                ret = {"success":True,
+                       "newValue":', '.join([tag.name for tag in book.tags])}
+            elif param == 'series':
+                edit_book_series(vals['value'], book)
+                ret = {"success":True,
+                       "newValue":', '.join([serie.name for serie in book.series])}
+            elif param == 'publishers':
+                edit_book_publisher(vals['value'], book)
+                ret = {"success":True,
+                       "newValue":', '.join([publisher.name for publisher in book.publishers])}
+            elif param == 'languages':
+                invalid = list()
+                edit_book_languages(vals['value'], book, invalid=invalid)
+                if invalid:
+                    ret = {"success": False, "msg": 'Invalid languages in request: {}'.format(','.join(invalid))}
+                    if multi:
+                        out.append(ret)
+                else:
+                    lang_names = list()
+                    for lang in book.languages:
+                        lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
+                    ret = {"success":True,
+                           "newValue":', '.join(lang_names)}
+            elif param == 'author_sort':
+                book.author_sort = vals['value']
+                ret = {"success":True,
+                       "newValue":book.author_sort}
+            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.get_book_path())
+                    if not rename_error:
+                        calibre_db.session.commit()
+                        ret = {"success":True,
+                               "newValue":book.title}
+                    else:
+                        calibre_db.session.rollback()
+                        ret = {"success":False, "msg":rename_error}
+                        if multi:
+                            out.append(ret)
+            elif param == 'sort':
+                book.sort = vals['value']
+                ret = {"success":True,
+                       "newValue":book.sort}
+            elif param == 'comments':
+                edit_book_comments(vals['value'], book)
+                ret = {"success":True,
+                       "newValue":book.comments[0].text}
+            elif param == 'authors':
+                input_authors, __ = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == True)
+                rename_error = helper.update_dir_structure(book.id, config.get_book_path(), input_authors[0])
+                if not rename_error:
+                    calibre_db.session.commit()
+                    ret = {"success":True,
+                        "newValue":' & '.join([author.replace('|', ',') for author in input_authors])}
+                else:
+                    calibre_db.session.rollback()
+                    ret = {"success":False, "msg":rename_error}
+                    if multi:
+                        out.append(ret)
+            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)
+                continue
+            elif param == 'read_status':
+                error = helper.edit_book_read_status(book.id, vals['value'] == "True")
+                if error:
+                    if multi:
+                        out.append({"success":False, "msg":error})
+                        continue
+                    else:
+                        return error, 400
+                continue
+            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 = {"success":True, "newValue":vals['value']}
+            else:
+                if multi:
+                    out.append({"success":False, "msg":_("Parameter not found")})
+                    continue
+                return _("Parameter not found"), 400
+            book.last_modified = datetime.now(timezone.utc)
 
-        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, StaleDataError) as e:
+            # revert change for sort if automatic fields link is deactivated
-        calibre_db.session.rollback()
+            if param == 'title' and vals.get('checkT') == False:
-        log.error_or_exception("Database error: {}".format(e))
+                book.sort = sort_param
-        ret = Response(json.dumps({'success': False,
+                calibre_db.session.commit()
-                                   'msg': 'Database error: {}'.format(e.orig if hasattr(e, "orig") else e)}),
+        except (OperationalError, IntegrityError, StaleDataError, AttributeError) as e:
-                       mimetype='application/json')
+            calibre_db.session.rollback()
-    return ret
+            log.error_or_exception("Database error: {}".format(e))
+            ret = {"success":False, "msg":'Database error: {}'.format(e.orig if hasattr(e, "orig") else e)}
+            if multi:
+                out.append(ret)
+    if multi:
+        if len(out) > 0:
+            return out
+        else:
+            return [ret]
+    else:
+        return ret
 
 
 @editbook.route("/ajax/sort_value/<field>/<int:bookid>")
@@ -327,13 +457,13 @@ def get_sorted_entry(field, bookid):
         book = calibre_db.get_filtered_book(bookid)
         if book:
             if field == 'title':
-                return json.dumps({'sort': book.sort})
+                return make_response(jsonify(sort=book.sort))
             elif field == 'authors':
-                return json.dumps({'author_sort': book.author_sort})
+                return make_response(jsonify(author_sort=book.author_sort))
             if field == 'sort':
-                return json.dumps({'sort': book.title})
+                return make_response(jsonify(sort=book.title))
             if field == 'author_sort':
-                return json.dumps({'authors': " & ".join([a.name for a in calibre_db.order_authors([book])])})
+                return make_response(jsonify(authors=" & ".join([a.name for a in calibre_db.order_authors([book])])))
     return ""
 
 
@@ -349,7 +479,56 @@ def simulate_merge_list_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 make_response(jsonify({'to': to_book, 'from': from_book}))
+    return ""
+
+@editbook.route("/ajax/displayselectedbooks", methods=['POST'])
+@user_login_required
+@edit_required
+def display_selected_books():
+    vals = request.get_json().get('selections')
+    books = []
+    if vals:
+        for book_id in vals:
+            books.append(calibre_db.get_book(book_id).title)
+        return json.dumps({'books': books})
+    return ""
+
+@editbook.route("/ajax/archiveselectedbooks", methods=['POST'])
+@login_required_if_no_ano
+@edit_required
+def archive_selected_books():
+    vals = request.get_json().get('selections')
+    state = request.get_json().get('archive')
+    if vals:
+        for book_id in vals:
+            is_archived = change_archived_books(book_id, state,
+                                                message="Book {} archive bit set to: {}".format(book_id, state))
+            if is_archived:
+                kobo_sync_status.remove_synced_book(book_id)
+        return json.dumps({'success': True})
+    return ""
+
+
+@editbook.route("/ajax/readselectedbooks", methods=['POST'])
+@user_login_required
+@edit_required
+def read_selected_books():
+    vals = request.get_json().get('selections')
+    markAsRead = request.get_json().get('markAsRead')
+    if vals:
+        try:
+            for book_id in vals:
+                ret = helper.edit_book_read_status(book_id, markAsRead)
+
+        except (OperationalError, IntegrityError, StaleDataError) 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 if hasattr(e, "orig") else e)}),
+                    mimetype='application/json')
+
+        return json.dumps({'success': True})
     return ""
 
 
@@ -386,8 +565,8 @@ def merge_list_book():
                                                         element.format,
                                                         element.uncompressed_size,
                                                         to_name))
-                    delete_book_from_table(from_book.id, "", True)
+                    check_delete_book([from_book.id], "", True)
-                    return json.dumps({'success': True})
+                    return make_response(jsonify(success=True))
     return ""
 
 
@@ -427,11 +606,11 @@ def table_xchange_author_title():
             except (OperationalError, IntegrityError, StaleDataError) as e:
                 calibre_db.session.rollback()
                 log.error_or_exception("Database error: {}".format(e))
-                return json.dumps({'success': False})
+                return make_response(jsonify(success=False))
 
             if config.config_use_google_drive:
                 gdriveutils.updateGdriveCalibreFromLocal()
-        return json.dumps({'success': True})
+        return make_response(jsonify(success=True))
     return ""
 
 
@@ -559,7 +738,7 @@ def do_edit_book(book_id, upload_formats=None):
 
         if upload_formats:
             resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
-            return Response(json.dumps(resp), mimetype='application/json')
+            return make_response(jsonify(resp))
 
         if "detail_view" in to_save:
             return redirect(url_for('web.show_book', book_id=book.id))
@@ -663,8 +842,9 @@ def prepare_authors(authr, calibre_path, gdrive=False):
                     all_new_name = helper.get_valid_filename(one_book.title, chars=42) + ' - ' \
                                    + helper.get_valid_filename(renamed_author.name, chars=42)
                     # change location in database to new author/title path
-                    helper.rename_all_files_on_change(one_book, new_path, new_path, all_new_name, gdrive)
+                    error = helper.rename_all_files_on_change(one_book, new_path, new_path, all_new_name, gdrive)
-
+                    if error:
+                        flash(error)
     return input_authors
 
 
@@ -768,17 +948,17 @@ def file_handling_on_upload(requested_file):
         if config.config_check_extensions and allowed_extensions != ['']:
             if not validate_mime_type(requested_file, allowed_extensions):
                 flash(_("File type isn't allowed to be uploaded to this server"), category="error")
-                return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+                return None, make_response(jsonify(location=url_for("web.index")))
     if '.' in requested_file.filename:
         file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
         if file_ext not in allowed_extensions and '' not in allowed_extensions:
             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')
+            return None, make_response(jsonify(location=url_for("web.index")))
     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')
+        return None, make_response(jsonify(location=url_for("web.index")))
 
     # extract metadata from file
     try:
@@ -787,7 +967,7 @@ def file_handling_on_upload(requested_file):
         log.error("File %s could not saved to temp dir", requested_file.filename)
         flash(_("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 None, make_response(jsonify(location=url_for("web.index")))
     return meta, None
 
 
@@ -856,86 +1036,109 @@ def delete_whole_book(book_id, book):
     calibre_db.session.query(db.Books).filter(db.Books.id == book_id).delete()
 
 
-def render_delete_book_result(book_format, json_response, warning, book_id, location=""):
+def render_delete_book_result(book_format, book_id, location=""):
     if book_format:
-        if json_response:
+        flash(_('Book Format Successfully Deleted'), category="success")
-            return json.dumps([warning, {"location": url_for("edit-book.show_edit_book", book_id=book_id),
+        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
-                                         "type": "success",
-                                         "format": book_format,
-                                         "message": _('Book Format Successfully Deleted')}])
-        else:
-            flash(_('Book Format Successfully Deleted'), category="success")
-            return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
     else:
-        if json_response:
+        flash(_('Book Successfully Deleted'), category="success")
-            return json.dumps([warning, {"location": get_redirect_location(location, "web.index"),
+        return redirect(get_redirect_location(location, "web.index"))
-                                         "type": "success",
-                                         "format": book_format,
-                                         "message": _('Book Successfully Deleted')}])
-        else:
-            flash(_('Book Successfully Deleted'), category="success")
-            return redirect(get_redirect_location(location, "web.index"))
 
 
-def delete_book_from_table(book_id, book_format, json_response, location=""):
+def check_delete_book(book_id, book_format, json_response, location=""):
-    warning = {}
     if current_user.role_delete_books():
-        book = calibre_db.get_book(book_id)
+        if json_response:
-        if book:
+            # if json response is set, it's possible to delete more than one book, but never a format is deleted
-            try:
+            res = list()
-                result, error = helper.delete_book(book, config.get_book_path(), book_format=book_format.upper())
+            for b in book_id:
-                if not result:
+                ret = delete_book_from_table(b)
-                    if json_response:
+                if ret:
-                        return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
+                    res.extend([ret])
-                                            "type": "danger",
+            if len(res) == 0:
-                                            "format": "",
+                return [{"location": get_redirect_location(location, "web.index"),
-                                            "message": error}])
+                        "type": "success",
-                    else:
+                        "format": "",
-                        flash(error, category="error")
+                        "message": _('Book Successfully Deleted')}]
-                        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
+            return jsonify(res)
-                if error:
-                    if json_response:
-                        warning = {"location": url_for("edit-book.show_edit_book", book_id=book_id),
-                                   "type": "warning",
-                                   "format": "",
-                                   "message": error}
-                    else:
-                        flash(error, category="warning")
-                if not book_format:
-                    delete_whole_book(book_id, book)
-                else:
-                    calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
-                        filter(db.Data.format == book_format).delete()
-                    if book_format.upper() in ['KEPUB', 'EPUB', 'EPUB3']:
-                        kobo_sync_status.remove_synced_book(book.id, True)
-                calibre_db.session.commit()
-            except Exception as ex:
-                log.error_or_exception(ex)
-                calibre_db.session.rollback()
-                if json_response:
-                    return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
-                                        "type": "danger",
-                                        "format": "",
-                                        "message": ex}])
-                else:
-                    flash(str(ex), category="error")
-                    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
-
         else:
-            # book not found
+            return delete_book_from_UI(book_id, book_format, location)
-            log.error('Book with id "%s" could not be deleted: not found', book_id)
-        return render_delete_book_result(book_format, json_response, warning, book_id, location)
     message = _("You are missing permissions to delete books")
     if json_response:
-        return json.dumps({"location": url_for("edit-book.show_edit_book", book_id=book_id),
+        try:
-                           "type": "danger",
+            return jsonify({"location": url_for("edit-book.show_edit_book", book_id=int(book_id)),
-                           "format": "",
+                               "type": "danger",
-                           "message": message})
+                               "format": "",
+                               "message": message})
+        except TypeError as e:
+            return jsonify({"location": url_for("web.index"), "type": "danger", "format": "",
+                            "message": str(e)})
     else:
         flash(message, category="error")
         return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
 
+def delete_book_from_UI(book_id, book_format, location=""):
+    book = calibre_db.get_book(book_id)
+    if book:
+        try:
+            result, error = helper.delete_book(book, config.get_book_path(), book_format=book_format.upper())
+            if not result:
+                flash(error, category="error")
+                return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
+            if error:
+                flash(error, category="warning")
+            if not book_format:
+                delete_whole_book(book_id, book)
+            else:
+                calibre_db.session.query(db.Data).filter(db.Data.book == book.id). \
+                    filter(db.Data.format == book_format).delete()
+                if book_format.upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                    kobo_sync_status.remove_synced_book(book.id, True)
+            calibre_db.session.commit()
+        except Exception as ex:
+            log.error_or_exception(ex)
+            calibre_db.session.rollback()
+            flash(str(ex), category="error")
+            return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
+    else:
+        # book not found
+        log.error('Book with id "%s" could not be deleted: not found', book_id)
+    return render_delete_book_result(book_format, book_id, location)
+
+
+def delete_book_from_table(book_id):
+    book = calibre_db.get_book(book_id)
+    if book:
+        try:
+            result, error = helper.delete_book(book, config.get_book_path(), book_format="")
+            if not result:
+                return {"location": url_for("edit-book.show_edit_book", book_id=book_id),
+                        "type": "danger",
+                        "format": "",
+                        "message": error}
+            delete_whole_book(book_id, book)
+            calibre_db.session.commit()
+            if error:
+                return {"location": url_for("edit-book.show_edit_book", book_id=book_id),
+                           "type": "warning",
+                           "format": "",
+                           "message": error}
+        except Exception as ex:
+            log.error_or_exception(ex)
+            calibre_db.session.rollback()
+            return {"location": url_for("edit-book.show_edit_book", book_id=book_id),
+                    "type": "danger",
+                    "format": "",
+                    "message": ex}
+    else:
+        # book not found
+        log.error('Book with id "%s" could not be deleted: not found', book_id)
+        return {"location": url_for("edit-book.show_edit_book", book_id=book_id),
+                "type": "danger",
+                "format": "",
+                "message": _('Book with id "{}" could not be deleted: not found'.format(book_id))}
+
+
 def render_edit_book(book_id):
     cc = calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
@@ -1408,7 +1611,7 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
             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)
+                new_element = db_object(add_element, db.title_sort(add_element, config))
             elif db_type == 'custom':
                 new_element = db_object(value=add_element)
             elif db_type == 'publisher':
@@ -1439,7 +1642,7 @@ def create_objects_for_addition(db_element, add_element, db_type):
     elif db_type == 'series':
         if db_element.name != add_element:
             db_element.name = add_element
-            db_element.sort = add_element
+            db_element.sort = db.title_sort(add_element, config)
     elif db_type == 'author':
         if db_element.name != add_element:
             db_element.name = add_element

cps/embed_helper.py

@@ -36,7 +36,8 @@ def do_calibre_export(book_id, book_format):
         if config.config_calibre_split:
             my_env['CALIBRE_OVERRIDE_DATABASE_PATH'] = os.path.join(config.config_calibre_dir, "metadata.db")
         library_path = config.get_book_path()
-        opf_command = [calibredb_binarypath, 'export', '--dont-write-opf', '--with-library', library_path,
+        opf_command = [calibredb_binarypath, 'export', '--dont-write-opf', '--dont-save-cover',
+                       '--with-library', library_path,
                        '--to-dir', tmp_dir, '--formats', book_format, "--template", "{}".format(temp_file_name),
                        str(book_id)]
         p = process_open(opf_command, quotes, my_env)

cps/epub.py

@@ -56,7 +56,7 @@ def get_epub_layout(book, book_data):
         p = tree.xpath('/pkg:package/pkg:metadata', namespaces=default_ns)[0]
 
         layout = p.xpath('pkg:meta[@property="rendition:layout"]/text()', namespaces=default_ns)
-    except (etree.XMLSyntaxError, KeyError, IndexError, OSError) as e:
+    except (etree.XMLSyntaxError, KeyError, IndexError, OSError, UnicodeDecodeError) as e:
         log.error("Could not parse epub metadata of book {} during kobo sync: {}".format(book.id, e))
         layout = []
 
@@ -175,7 +175,7 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
     for cs in cover_section:
         if cs.endswith('.xhtml') or cs.endswith('.html'):
             markup = epub_zip.read(os.path.join(cover_path, cs))
-            markup_tree = etree.fromstring(markup)
+            markup_tree = etree.fromstring(markup, parser=etree.XMLParser(resolve_entities=False, no_network=True))
             # no matter xhtml or html with no namespace
             img_src = markup_tree.xpath("//*[local-name() = 'img']/@src")
             # Alternative image source

cps/epub_helper.py

@@ -53,16 +53,20 @@ def updateEpub(src, dest, filename, data, ):
         zf.writestr(filename, data)
 
 
+# Safe parser: disable entity resolution and network access to prevent XXE attacks
+_safe_parser = etree.XMLParser(resolve_entities=False, no_network=True)
+
+
 def get_content_opf(file_path, ns=None):
     if ns is None:
         ns = default_ns
     epubZip = zipfile.ZipFile(file_path)
     txt = epubZip.read('META-INF/container.xml')
-    tree = etree.fromstring(txt)
+    tree = etree.fromstring(txt, parser=_safe_parser)
     cf_name = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
     cf = epubZip.read(cf_name)
 
-    return etree.fromstring(cf), cf_name
+    return etree.fromstring(cf, parser=_safe_parser), cf_name
 
 
 def create_new_metadata_backup(book,  custom_columns, export_language, translated_cover_name, lang_type=3):

cps/error_handler.py

@@ -18,38 +18,67 @@
 
 import traceback
 
-from flask import render_template
+from flask import render_template, request, flash, make_response
+from flask_limiter import RateLimitExceeded
+from flask_babel import gettext as _
 from werkzeug.exceptions import default_exceptions
+
+from .cw_login import current_user
 try:
     from werkzeug.exceptions import FailedDependency
 except ImportError:
     from werkzeug.exceptions import UnprocessableEntity as FailedDependency
 
 from . import config, app, logger, services
-
+from .render_template import render_title_template
+from .web import render_login
+from .usermanagement import auth
+from cps.string_helper import strip_whitespaces
 
 log = logger.create()
 
 # custom error page
 
 def error_http(error):
+    headers = {'WWW-Authenticate': 'Basic realm="calibre-web"'} if error.code == 401 else {}
     return render_template('http_error.html',
                            error_code="Error {0}".format(error.code),
                            error_name=error.name,
                            issue=False,
+                           goto_admin=False,
                            unconfigured=not config.db_configured,
                            instance=config.config_calibre_web_title
-                           ), error.code
+                           ), error.code, headers
 
 
 def internal_error(error):
+    if (isinstance(error.original_exception, AttributeError) and
+        error.original_exception.args[0] == "'NoneType' object has no attribute 'query'"
+        and error.original_exception.name == "query"):
+        return render_template('http_error.html',
+                               error_code="Database Error",
+                               error_name='The library used is invalid or has permission errors',
+                               issue=False,
+                               goto_admin=True,
+                               unconfigured=False,
+                               error_stack="",
+                               instance=config.config_calibre_web_title
+                               ), 500
+    log.error("500 Internal Server Error: %s", traceback.format_exc())
+    error_stack = ""
+    try:
+        if current_user.is_authenticated and current_user.role_admin():
+            error_stack = traceback.format_exc().split("\n")
+    except Exception:
+        pass
     return render_template('http_error.html',
                            error_code="500 Internal Server Error",
                            error_name='The server encountered an internal error and was unable to complete your '
                                       'request. There is an error in the application.',
                            issue=True,
+                           goto_admin=False,
                            unconfigured=False,
-                           error_stack=traceback.format_exc().split("\n"),
+                           error_stack=error_stack,
                            instance=config.config_calibre_web_title
                            ), 500
 
@@ -70,3 +99,21 @@ def init_errorhandler():
             log.debug('LDAP server not accessible while trying to login to opds feed')
             return error_http(FailedDependency())
 
+
+@app.errorhandler(RateLimitExceeded)
+def handle_rate_limit(__):
+    log.error("Rate limit exceeded {}".format(request.endpoint))
+    if "register" in request.endpoint:
+        flash(_(u"Please wait one minute to register next user"), category="error")
+        return render_title_template('register.html', config=config, title=_("Register"), page="register")
+    elif "login" in request.endpoint:
+        form = request.form.to_dict()
+        username = strip_whitespaces(form.get('username', "")).lower().replace("\n", "").replace("\r", "")
+        flash(_("Please wait one minute before next login"), category="error")
+        return render_login(username, form.get("password", ""))
+    elif "opds" in request.endpoint:
+        return auth.auth_error_callback(429)
+    else:
+        return make_response('', 429)
+
+

cps/fb2.py

@@ -20,6 +20,9 @@ from lxml import etree
 
 from .constants import BookMeta
 
+# Safe parser: disable entity resolution and network access to prevent XXE attacks
+_safe_parser = etree.XMLParser(resolve_entities=False, no_network=True)
+
 
 def get_fb2_info(tmp_file_path, original_file_extension):
 
@@ -29,7 +32,7 @@ def get_fb2_info(tmp_file_path, original_file_extension):
     }
 
     fb2_file = open(tmp_file_path, encoding="utf-8")
-    tree = etree.fromstring(fb2_file.read().encode())
+    tree = etree.fromstring(fb2_file.read().encode(), parser=_safe_parser)
 
     authors = tree.xpath('/fb:FictionBook/fb:description/fb:title-info/fb:author', namespaces=ns)
 

cps/file_helper.py

@@ -34,6 +34,15 @@ except ImportError as e:
     error = "Cannot import python-magic, checking uploaded file metadata will not work: {}".format(e)
 
 
+def get_mimetype(ext):
+    # overwrite some mimetypes for proper file detection
+    mimes = {".fb2": "text/xml",
+             ".cbz": "application/zip",
+             ".cbr": "application/x-rar"
+             }
+    return mimes.get(ext, mimetypes.types_map[ext])
+
+
 def get_temp_dir():
     tmp_dir = os.path.join(gettempdir(), 'calibre_web')
     if not os.path.isdir(tmp_dir):
@@ -54,7 +63,7 @@ def validate_mime_type(file_buffer, allowed_extensions):
     allowed_mimetypes = list()
     for x in allowed_extensions:
         try:
-            allowed_mimetypes.append(mimetypes.types_map["." + x])
+            allowed_mimetypes.append(get_mimetype("." + x))
         except KeyError:
             log.error("Unkown mimetype for Extension: {}".format(x))
     tmp_mime_type = mime.from_buffer(file_buffer.read())

cps/fs.py

@@ -17,7 +17,7 @@
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from . import logger
-from .constants import CACHE_DIR
+from .constants import CACHE_DIRECTORY
 from os import makedirs, remove
 from os.path import isdir, isfile, join
 from shutil import rmtree
@@ -25,7 +25,7 @@ from shutil import rmtree
 
 class FileSystem:
     _instance = None
-    _cache_dir = CACHE_DIR
+    _cache_dir = CACHE_DIRECTORY
 
     def __new__(cls):
         if cls._instance is None:

cps/gdrive.py

@@ -140,7 +140,7 @@ try:
             if response:
                 dbpath = os.path.join(config.config_calibre_dir, "metadata.db").encode()
                 if not response['deleted'] and response['file']['title'] == 'metadata.db' \
-                  and response['file']['md5Checksum'] != hashlib.md5(dbpath):  # nosec
+                  and response['file']['md5Checksum'] != hashlib.md5(dbpath).hexdigest():  # nosec
                     tmp_dir = get_temp_dir()
 
                     log.info('Database file updated')

cps/helper.py

@@ -30,7 +30,7 @@ import requests
 import unidecode
 from uuid import uuid4
 
-from flask import send_from_directory, make_response, abort, url_for, Response
+from flask import send_from_directory, make_response, abort, url_for, Response, request, after_this_request
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
 from flask_babel import get_locale
@@ -199,7 +199,7 @@ def check_send_to_ereader(entry):
 # Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
 # list with supported formats
 def check_read_formats(entry):
-    extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU', 'DJV'}
+    extensions_reader = {'TXT', 'PDF', 'EPUB', 'KEPUB', 'CBZ', 'CBT', 'CBR', 'DJVU', 'DJV'}
     book_formats = list()
     if len(entry.data):
         for ele in iter(entry.data):
@@ -237,7 +237,7 @@ def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id)
     return _("The requested file could not be read. Maybe wrong permissions?")
 
 
-def get_valid_filename(value, replace_whitespace=True, chars=128):
+def get_valid_filename(value, replace_whitespace=True, chars=128, force_unidecode=False):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
@@ -245,7 +245,7 @@ def get_valid_filename(value, replace_whitespace=True, chars=128):
     if value[-1:] == '.':
         value = value[:-1]+'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
-    if config.config_unicode_filename:
+    if config.config_unicode_filename or force_unidecode:
         value = (unidecode.unidecode(value))
     if replace_whitespace:
         #  *+:\"/<>? are replaced by _
@@ -307,18 +307,16 @@ def edit_book_read_status(book_id, read_status=None):
     if not config.config_read_column:
         book = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.user_id == int(current_user.id),
                                                          ub.ReadBook.book_id == book_id)).first()
-        if book:
+        if not book:
-            if read_status is None:
-                if book.read_status == ub.ReadBook.STATUS_FINISHED:
-                    book.read_status = ub.ReadBook.STATUS_UNREAD
-                else:
-                    book.read_status = ub.ReadBook.STATUS_FINISHED
-            else:
-                book.read_status = ub.ReadBook.STATUS_FINISHED if read_status else ub.ReadBook.STATUS_UNREAD
-        else:
             read_book = ub.ReadBook(user_id=current_user.id, book_id=book_id)
-            read_book.read_status = ub.ReadBook.STATUS_FINISHED
             book = read_book
+        if read_status is None:
+            if book.read_status == ub.ReadBook.STATUS_FINISHED:
+                book.read_status = ub.ReadBook.STATUS_UNREAD
+            else:
+                book.read_status = ub.ReadBook.STATUS_FINISHED
+        else:
+            book.read_status = ub.ReadBook.STATUS_FINISHED if read_status == True else ub.ReadBook.STATUS_UNREAD
         if not book.kobo_reading_state:
             kobo_reading_state = ub.KoboReadingState(user_id=current_user.id, book_id=book_id)
             kobo_reading_state.current_bookmark = ub.KoboBookmark()
@@ -329,7 +327,7 @@ def edit_book_read_status(book_id, read_status=None):
     else:
         try:
             calibre_db.create_functions(config)
-            book = calibre_db.get_filtered_book(book_id)
+            book = calibre_db.get_filtered_book(book_id, True)
             book_read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
             if len(book_read_status):
                 if read_status is None:
@@ -396,10 +394,16 @@ def delete_book_file(book, calibrepath, book_format=None):
 def rename_all_files_on_change(one_book, new_path, old_path, all_new_name, gdrive=False):
     for file_format in one_book.data:
         if not gdrive:
-            if not os.path.exists(new_path):
+            try:
-                os.makedirs(new_path)
+                if not os.path.exists(new_path):
-            shutil.move(os.path.join(old_path, file_format.name + '.' + file_format.format.lower()),
+                    os.makedirs(new_path)
-                    os.path.join(new_path, all_new_name + '.' + file_format.format.lower()))
+                shutil.move(os.path.join(old_path, file_format.name + '.' + file_format.format.lower()),
+                        os.path.join(new_path, all_new_name + '.' + file_format.format.lower()))
+            except (PermissionError, FileNotFoundError) as ex:
+                log.error("Moving book-id %s folder %s failed: %s", one_book.id, new_path, ex)                
+                return _("Moving book path of Book %(book_id)s to: '%(src)s' failed with error: %(error)s",
+                 book_id=one_book.id, src=new_path, error=str(ex))
+            
         else:
             g_file = gd.getFileFromEbooksFolder(old_path,
                                                 file_format.name + '.' + file_format.format.lower())
@@ -412,6 +416,7 @@ def rename_all_files_on_change(one_book, new_path, old_path, all_new_name, gdriv
 
         # change name in Database
         file_format.name = all_new_name
+    return False
 
 
 def rename_author_path(first_author, old_author_dir, renamed_author, calibre_path="", gdrive=False):
@@ -466,14 +471,15 @@ def update_dir_structure_file(book_id, calibre_path, original_filepath, new_auth
                                      db_filename,
                                      original_filepath,
                                      path)
-        new_path = os.path.join(calibre_path, new_author_dir, new_title_dir).replace('\\', '/')
+        if not error:
-        all_new_name = get_valid_filename(local_book.title, chars=42) + ' - ' \
+            new_path = os.path.join(calibre_path, new_author_dir, new_title_dir).replace('\\', '/')
-                       + get_valid_filename(new_author, chars=42)
+            all_new_name = get_valid_filename(local_book.title, chars=42) + ' - ' \
-        # Book folder already moved, only files need to be renamed
+                           + get_valid_filename(new_author, chars=42)
-        rename_all_files_on_change(local_book, new_path, new_path, all_new_name)
+            # Book folder already moved, only files need to be renamed
+            renameerror = rename_all_files_on_change(local_book, new_path, new_path, all_new_name)
 
-        if error:
+        if error or renameerror:
-            return error
+            return error or renameerror
     return False
 
 
@@ -513,11 +519,11 @@ def update_dir_structure_gdrive(book_id, first_author):
             book.path = new_authordir + '/' + book.path.split('/')[1]
             gd.updateDatabaseOnEdit(g_file['id'], book.path)
         else:
-            return _('File %(file)s not found on Google Drive', file=authordir)  # file not found'''
+            return _('File %(file)s not found on Google Drive', file=authordir)  # file not found
     if titledir != new_titledir or authordir != new_authordir :
         all_new_name = get_valid_filename(book.title, chars=42) + ' - ' \
                        + get_valid_filename(new_authordir, chars=42)
-        rename_all_files_on_change(book, book.path, book.path, all_new_name, gdrive=True)  # todo: Move filenames on gdrive
+        return rename_all_files_on_change(book, book.path, book.path, all_new_name, gdrive=True)  # todo: Move filenames on gdrive
     return False
 
 
@@ -553,33 +559,13 @@ def move_files_on_change(calibre_path, new_author_dir, new_titledir, localbook,
                     log.error("Deleting authorpath for book %s failed: %s", localbook.id, ex)
         # change location in database to new author/title path
         localbook.path = os.path.join(new_author_dir, new_titledir).replace('\\', '/')
-    except OSError as ex:
+    except (OSError, FileNotFoundError) as ex:
         log.error_or_exception("Rename title from {} to {} failed with error: {}".format(path, new_path, ex))
         return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                  src=path, dest=new_path, error=str(ex))
     return False
 
 
-def rename_files_on_change(first_author,
-                           renamed_author,
-                           local_book,
-                           original_filepath="",
-                           path="",
-                           calibre_path="",
-                           gdrive=False):
-    # Rename all files from old names to new names
-    #try:
-        #clean_author_database(renamed_author, calibre_path, gdrive=gdrive)
-        #if first_author and first_author not in renamed_author:
-        #    clean_author_database([first_author], calibre_path, local_book, gdrive)
-        #if not gdrive and not renamed_author and not original_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-        #    shutil.rmtree(os.path.dirname(path))
-    #except (OSError, FileNotFoundError) as ex:
-    #    log.error_or_exception("Error in rename file in path {}".format(ex))
-    #    return _("Error in rename file in path: {}".format(str(ex)))
-    return False
-
-
 def delete_book_gdrive(book, book_format):
     error = None
     if book_format:
@@ -905,7 +891,7 @@ def save_cover(img, book_path):
             else:
                 imgc = Image(blob=io.BytesIO(img.content))
             imgc.format = 'jpeg'
-            imgc.transform_colorspace("rgb")
+            imgc.transform_colorspace("srgb")
             img = imgc
         except (BlobError, MissingDelegateError):
             log.error("Invalid cover file content")
@@ -970,11 +956,23 @@ def do_download_file(book, book_format, client, data, headers):
         else:
             download_name = book_name
 
+    # Clean up staged copies in /tmp/calibre_web after the response is sent
+    # (kepubify / calibre-export branches) so the temp dir does not grow unbounded.
+    if filename == get_temp_dir():
+        _tmp_path = os.path.join(filename, download_name + "." + book_format)
+        @after_this_request
+        def _cleanup_staged_download(resp):
+            try:
+                os.remove(_tmp_path)
+            except OSError as ex:
+                log.warning('Failed to remove staged download %s: %s', _tmp_path, ex)
+            return resp
     response = make_response(send_from_directory(filename, download_name + "." + book_format))
     # ToDo Check headers parameter
     for element in headers:
         response.headers[element[0]] = element[1]
-    log.info('Downloading file: {}'.format(os.path.join(filename, book_name + "." + book_format)))
+    log.info('Downloading file: \'%s\' by %s - %s', format(os.path.join(filename, book_name + "." + book_format)),
+             current_user.name, request.headers.get('X-Forwarded-For', request.remote_addr))
     return response
 
 
@@ -1104,11 +1102,17 @@ def get_download_link(book_id, book_format, client):
             file_name = book.title
             if len(book.authors) > 0:
                 file_name = file_name + ' - ' + book.authors[0].name
-            file_name = get_valid_filename(file_name, replace_whitespace=False)
+            original_name = file_name
+            file_name = get_valid_filename(file_name, replace_whitespace=False, force_unidecode=True)
+            if client == "kindle":
+                quoted_file_name = file_name
+            else:
+                native_name = get_valid_filename(original_name, replace_whitespace=False, force_unidecode=False)
+                quoted_file_name = quote(native_name)
             headers = Headers()
             headers["Content-Type"] = mimetypes.types_map.get('.' + book_format, "application/octet-stream")
-            headers["Content-Disposition"] = "attachment; filename=%s.%s; filename*=UTF-8''%s.%s" % (
+            headers["Content-Disposition"] = ('attachment; filename="{}.{}"; filename*=UTF-8\'\'{}.{}').format(
-                quote(file_name), book_format, quote(file_name), book_format)
+                file_name, book_format, quoted_file_name, book_format)
             return do_download_file(book, book_format, client, data1, headers)
     else:
         log.error("Book id {} not found for downloading".format(book_id))

cps/iso_language_names.py

@@ -12,6 +12,384 @@
 # map iso639 language codes to language names, translated
 
 LANGUAGE_NAMES = {
+    "ar": {
+        "abk": "Abkhazian",
+        "ace": "Achinese",
+        "ach": "Acoli",
+        "ada": "Adangme",
+        "ady": "Adyghe",
+        "aar": "Afar",
+        "afh": "Afrihili",
+        "afr": "الأفريكانس",
+        "ain": "Ainu (Japan)",
+        "aka": "Akan",
+        "akk": "Akkadian",
+        "sqi": "Albanian",
+        "ale": "Aleut",
+        "amh": "Amharic",
+        "anp": "Angika",
+        "ara": "العربية",
+        "arg": "Aragonese",
+        "arp": "Arapaho",
+        "arw": "Arawak",
+        "hye": "الأرمينية",
+        "asm": "Assamese",
+        "ast": "Asturian",
+        "ava": "Avaric",
+        "ave": "Avestan",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "الأذربيجانية",
+        "ban": "البالية",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "bas": "Basa (Cameroon)",
+        "bak": "Bashkir",
+        "eus": "الباسك",
+        "bej": "Beja",
+        "bel": "بلاروسي",
+        "bem": "Bemba (Zambia)",
+        "ben": "البنغالية",
+        "bit": "Berinomo",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "byn": "Bilin",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "zbl": "Blissymbols",
+        "bos": "Bosnian",
+        "bra": "Braj",
+        "bre": "البريتون",
+        "bug": "البجينيز",
+        "bul": "البلغارية",
+        "bua": "Buriat",
+        "mya": "البورمية",
+        "cad": "Caddo",
+        "cat": "الكاتالانية",
+        "ceb": "Cebuano",
+        "chg": "Chagatai",
+        "cha": "Chamorro",
+        "che": "Chechen",
+        "chr": "الشيروكى",
+        "chy": "Cheyenne",
+        "chb": "Chibcha",
+        "zho": "الصينية",
+        "chn": "Chinook jargon",
+        "chp": "Chipewyan",
+        "cho": "Choctaw",
+        "cht": "Cholón",
+        "chk": "Chuukese",
+        "chv": "Chuvash",
+        "cop": "القبطية",
+        "cor": "Cornish",
+        "cos": "Corsican",
+        "cre": "Cree",
+        "mus": "Creek",
+        "hrv": "الكرواتية",
+        "ces": "التشيكية",
+        "dak": "Dakota",
+        "dan": "الدنماركية",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "div": "Dhivehi",
+        "din": "Dinka",
+        "doi": "Dogri (macrolanguage)",
+        "dgr": "Dogrib",
+        "dua": "Duala",
+        "nld": "الهولندية",
+        "dse": "Dutch Sign Language",
+        "dyu": "Dyula",
+        "dzo": "الزونخاية",
+        "efi": "Efik",
+        "egy": "Egyptian (Ancient)",
+        "eka": "Ekajuk",
+        "elx": "Elamite",
+        "eng": "الإنجليزية",
+        "enu": "Enu",
+        "myv": "Erzya",
+        "epo": "الإسبرانتو",
+        "est": "الإستونية",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fat": "Fanti",
+        "fao": "Faroese",
+        "fij": "Fijian",
+        "fil": "Filipino",
+        "fin": "الفنلندية",
+        "fon": "Fon",
+        "fra": "الفرنسية",
+        "fur": "Friulian",
+        "ful": "Fulah",
+        "gaa": "Ga",
+        "glg": "Galician",
+        "lug": "Ganda",
+        "gay": "Gayo",
+        "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
+        "gez": "Geez",
+        "kat": "Georgian",
+        "deu": "الألمانية",
+        "gil": "Gilbertese",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "القوطية",
+        "grb": "Grebo",
+        "grn": "Guarani",
+        "guj": "الغوجاراتية",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hau": "Hausa",
+        "haw": "Hawaiian",
+        "heb": "العبرية",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "الهندية",
+        "hmo": "Hiri Motu",
+        "hit": "Hittite",
+        "hmn": "Hmong",
+        "hun": "الهنغارية (المجرية)",
+        "hup": "Hupa",
+        "iba": "Iban",
+        "isl": "الآيسلندية",
+        "ido": "Ido",
+        "ibo": "Igbo",
+        "ilo": "Iloko",
+        "ind": "الإندونيسية",
+        "inh": "Ingush",
+        "ina": "Interlingua (International Auxiliary Language Association)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiaq",
+        "gle": "الأيرلندية",
+        "ita": "الإيطالية",
+        "jpn": "اليابانية",
+        "jav": "الجاوية",
+        "jrb": "Judeo-Arabic",
+        "jpr": "Judeo-Persian",
+        "kbd": "Kabardian",
+        "kab": "Kabyle",
+        "kac": "Kachin",
+        "kal": "Kalaallisut",
+        "xal": "Kalmyk",
+        "kam": "Kamba (Kenya)",
+        "kan": "الكانادا",
+        "kau": "Kanuri",
+        "kaa": "Kara-Kalpak",
+        "krc": "Karachay-Balkar",
+        "krl": "Karelian",
+        "kas": "Kashmiri",
+        "csb": "Kashubian",
+        "kaw": "Kawi",
+        "kaz": "Kazakh",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirghiz",
+        "tlh": "Klingon",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kok": "Konkani (macrolanguage)",
+        "kor": "الكورية",
+        "kos": "Kosraean",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "الكردية",
+        "kru": "Kurukh",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "اللاو",
+        "lat": "Latin",
+        "lav": "اللاتفية",
+        "lez": "Lezghian",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "الليتوانية",
+        "jbo": "Lojban",
+        "loz": "Lozi",
+        "lub": "Luba-Katanga",
+        "lua": "Luba-Lulua",
+        "lui": "Luiseno",
+        "smj": "Lule Sami",
+        "lun": "Lunda",
+        "luo": "Luo (Kenya and Tanzania)",
+        "lus": "Lushai",
+        "ltz": "Luxembourgish",
+        "mkd": "المقدونية",
+        "mad": "Madurese",
+        "mag": "Magahi",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mlg": "Malagasy",
+        "msa": "Malay (macrolanguage)",
+        "mal": "الماليالام",
+        "mlt": "المالطية",
+        "mnc": "Manchu",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri",
+        "glv": "Manx",
+        "mri": "الموري",
+        "arn": "Mapudungun",
+        "mar": "Marathi",
+        "chm": "Mari (Russia)",
+        "mah": "Marshallese",
+        "mwr": "Marwari",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mwl": "Mirandese",
+        "moh": "Mohawk",
+        "mdf": "Moksha",
+        "lol": "Mongo",
+        "mon": "المغولية",
+        "mos": "Mossi",
+        "mul": "Multiple languages",
+        "nqo": "N'Ko",
+        "nau": "Nauru",
+        "nav": "Navajo",
+        "ndo": "Ndonga",
+        "nap": "Neapolitan",
+        "nia": "Nias",
+        "niu": "Niuean",
+        "zxx": "No linguistic content",
+        "nog": "Nogai",
+        "nor": "النرويجية",
+        "nob": "Norwegian Bokmål",
+        "nno": "Norwegian Nynorsk",
+        "nym": "Nyamwezi",
+        "nya": "Nyanja",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Ossetian",
+        "pal": "Pahlavi",
+        "pau": "Palauan",
+        "pli": "Pali",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Panjabi",
+        "pap": "Papiamento",
+        "fas": "الفارسي",
+        "phn": "الفينيقية",
+        "pon": "Pohnpeian",
+        "pol": "البولندية",
+        "por": "البرتغالية",
+        "pus": "Pashto",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "ron": "الرومانية",
+        "roh": "Romansh",
+        "rom": "Romany",
+        "run": "Rundi",
+        "rus": "الروسية",
+        "smo": "Samoan",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "san": "Sanskrit",
+        "sat": "Santali",
+        "srd": "Sardinian",
+        "sas": "Sasak",
+        "sco": "Scots",
+        "sel": "Selkup",
+        "srp": "الصربية",
+        "srr": "Serer",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Sicilian",
+        "sid": "Sidamo",
+        "bla": "Siksika",
+        "snd": "Sindhi",
+        "sin": "السينهالا",
+        "den": "Slave (Athapascan)",
+        "slk": "السلوفاكية",
+        "slv": "السلوفينية",
+        "sog": "Sogdian",
+        "som": "Somali",
+        "snk": "Soninke",
+        "spa": "الأسبانية",
+        "srn": "Sranan Tongo",
+        "suk": "Sukuma",
+        "sux": "Sumerian",
+        "sun": "السوندية",
+        "sus": "Susu",
+        "swa": "Swahili (macrolanguage)",
+        "ssw": "Swati",
+        "swe": "السويدية",
+        "syr": "السريانية",
+        "tgl": "التاغالوغية",
+        "tah": "Tahitian",
+        "tgk": "Tajik",
+        "tmh": "Tamashek",
+        "tam": "التاميلية",
+        "tat": "Tatar",
+        "tel": "التيلوغو",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tha": "التايلاندية",
+        "bod": "التبتية",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tem": "Timne",
+        "tiv": "Tiv",
+        "tli": "Tlingit",
+        "tpi": "Tok Pisin",
+        "tkl": "Tokelau",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga Islands)",
+        "tsi": "Tsimshian",
+        "tso": "Tsonga",
+        "tsn": "Tswana",
+        "tum": "Tumbuka",
+        "tur": "التركية",
+        "tuk": "Turkmen",
+        "tvl": "Tuvalu",
+        "tyv": "Tuvinian",
+        "twi": "Twi",
+        "udm": "Udmurt",
+        "uga": "الأجاريتيكية",
+        "uig": "الاغورية",
+        "ukr": "Ukrainian",
+        "umb": "Umbundu",
+        "mis": "Uncoded languages",
+        "und": "Undetermined",
+        "urd": "الاردية",
+        "uzb": "Uzbek",
+        "vai": "الفاي",
+        "ven": "Venda",
+        "vie": "الفييتنامية",
+        "vol": "Volapük",
+        "vot": "Votic",
+        "wln": "الوالون",
+        "war": "Waray (Philippines)",
+        "was": "Washo",
+        "cym": "الويلزية",
+        "wal": "Wolaytta",
+        "wol": "Wolof",
+        "xho": "الهاوسا",
+        "sah": "Yakut",
+        "yao": "Yao",
+        "yap": "Yapese",
+        "yid": "Yiddish",
+        "yor": "Yoruba",
+        "zap": "Zapotec",
+        "zza": "Zaza",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zul": "الزولو",
+        "zun": "Zuni"
+    },
     "cs": {
         "aar": "afarština",
         "abk": "abchazajština",

cps/jinjia.py

@@ -30,6 +30,7 @@ from uuid import uuid4
 from flask import Blueprint, request, url_for, g
 from flask_babel import format_date
 from .cw_login import current_user
+from .clean_html import clean_string as html_clean_string
 
 from . import constants, logger
 
@@ -43,6 +44,8 @@ def url_for_other_page(page):
     args = request.view_args.copy()
     args['page'] = page
     for get, val in request.args.items():
+        if get == "page":
+            continue
         args[get] = val
     return url_for(request.endpoint, **args)
 
@@ -111,7 +114,7 @@ def yesno(value, yes, no):
 
 @jinjia.app_template_filter('formatfloat')
 def formatfloat(value, decimals=1):
-    if not value:
+    if not value or (isinstance(value, str) and not value.is_numeric()):
         return value
     formated_value = ('{0:.' + str(decimals) + 'f}').format(value)
     if formated_value.endswith('.' + "0" * decimals):
@@ -119,20 +122,6 @@ def formatfloat(value, decimals=1):
     return formated_value
 
 
-'''@jinjia.app_template_filter('formatseriesindex')
-def formatseriesindex_filter(series_index):
-    if series_index:
-        try:
-            if int(series_index) - series_index == 0:
-                return int(series_index)
-            else:
-                return series_index
-        except (ValueError, TypeError):
-            return series_index
-    return 0
-'''
-
-
 @jinjia.app_template_filter('escapedlink')
 def escapedlink_filter(url, text):
     return "<a href='{}'>{}</a>".format(url, escape(text))
@@ -193,3 +182,9 @@ def contains_music(book_formats):
         if format.format.lower() in g.constants.EXTENSIONS_AUDIO:
             result = True
     return result
+
+@jinjia.app_template_filter('clean_string')
+def clean_string(unsafe_text):
+    return html_clean_string(unsafe_text)
+
+

cps/kobo.py

@@ -25,6 +25,7 @@ import zipfile
 from time import gmtime, strftime
 import json
 from urllib.parse import unquote
+import requests
 
 from flask import (
     Blueprint,
@@ -41,13 +42,11 @@ from werkzeug.datastructures import Headers
 from sqlalchemy import func
 from sqlalchemy.sql.expression import and_, or_
 from sqlalchemy.exc import StatementError
-from sqlalchemy.sql import select
-import requests
 
 from . import config, logger, kobo_auth, db, calibre_db, helper, shelf as shelf_lib, ub, csrf, kobo_sync_status
-from . import isoLanguages
+from . import isoLanguages, limiter
 from .epub import get_epub_layout
-from .constants import COVER_THUMBNAIL_SMALL, COVER_THUMBNAIL_MEDIUM, COVER_THUMBNAIL_LARGE
+from .constants import COVER_THUMBNAIL_SMALL, COVER_THUMBNAIL_MEDIUM, COVER_THUMBNAIL_LARGE, BASE_DIR
 from .helper import get_download_link
 from .services import SyncToken as SyncToken
 from .web import download_required
@@ -106,24 +105,29 @@ def make_request_to_kobo_store(sync_token=None):
     return store_response
 
 
-def redirect_or_proxy_request():
+def redirect_or_proxy_request(auth=False):
     if config.config_kobo_proxy:
-        if request.method == "GET":
+        try:
-            return redirect(get_store_url_for_current_request(), 307)
+            if request.method == "GET":
-        else:
+                alfa = redirect(get_store_url_for_current_request(), 307)
-            # The Kobo device turns other request types into GET requests on redirects,
+                return alfa
-            # so we instead proxy to the Kobo store ourselves.
+            else:
-            store_response = make_request_to_kobo_store()
+                # The Kobo device turns other request types into GET requests on redirects,
+                # so we instead proxy to the Kobo store ourselves.
+                store_response = make_request_to_kobo_store()
 
-            response_headers = store_response.headers
+                response_headers = store_response.headers
-            for header_key in CONNECTION_SPECIFIC_HEADERS:
+                for header_key in CONNECTION_SPECIFIC_HEADERS:
-                response_headers.pop(header_key, default=None)
+                    response_headers.pop(header_key, default=None)
 
-            return make_response(
+                return make_response(
-                store_response.content, store_response.status_code, response_headers.items()
+                    store_response.content, store_response.status_code, response_headers.items()
-            )
+                )
-    else:
+        except Exception as e:
-        return make_response(jsonify({}))
+            log.error("Failed to receive or parse response from Kobo's endpoint: {}".format(e))
+            if auth:
+                return make_calibre_web_auth_response()
+    return make_response(jsonify({}))
 
 
 def convert_to_kobo_timestamp_string(timestamp):
@@ -136,7 +140,6 @@ def convert_to_kobo_timestamp_string(timestamp):
 
 @kobo.route("/v1/library/sync")
 @requires_kobo_auth
-# @download_required
 def HandleSyncRequest():
     if not current_user.role_download():
         log.info("Users need download permissions for syncing library to Kobo reader")
@@ -323,7 +326,7 @@ def generate_sync_response(sync_token, sync_results, set_cont=False):
     sync_token.to_headers(extra_headers)
 
     # log.debug("Kobo Sync Content: {}".format(sync_results))
-    # jsonify decodes the unicode string different to what kobo expects
+    # jsonify decodes the Unicode string different to what kobo expects
     response = make_response(json.dumps(sync_results), extra_headers)
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
@@ -364,7 +367,7 @@ def get_download_url_for_book(book_id, book_format):
         )
     return url_for(
         "kobo.download_book",
-        auth_token=kobo_auth.get_auth_token(),
+        auth_token=get_auth_token(),
         book_id=book_id,
         book_format=book_format.lower(),
         _external=True,
@@ -499,6 +502,7 @@ def get_metadata(book):
     return metadata
 
 
+
 @csrf.exempt
 @kobo.route("/v1/library/tags", methods=["POST", "DELETE"])
 @requires_kobo_auth
@@ -727,7 +731,7 @@ def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
     ub.session_commit()
 
 
-# Creates a Kobo "Tag" object from a ub.Shelf object
+# Creates a Kobo "Tag" object from an ub.Shelf object
 def create_kobo_tag(shelf):
     tag = {
         "Created": convert_to_kobo_timestamp_string(shelf.created),
@@ -807,6 +811,8 @@ def HandleStateRequest(book_uuid):
 
         ub.session.merge(kobo_reading_state)
         ub.session_commit()
+        update_results_response["LastModified"] = convert_to_kobo_timestamp_string(kobo_reading_state.last_modified)
+        update_results_response["PriorityTimestamp"] = convert_to_kobo_timestamp_string(kobo_reading_state.priority_timestamp)
         return jsonify({
             "RequestResult": "Success",
             "UpdateResults": [update_results_response],
@@ -883,14 +889,21 @@ def get_statistics_response(statistics):
     return resp
 
 
+def _clean_progress(value):
+    """Return progress as int if it's a whole number, preserving Kobo device expectations."""
+    if value is not None and value == int(value):
+        return int(value)
+    return value
+
+
 def get_current_bookmark_response(current_bookmark):
     resp = {
         "LastModified": convert_to_kobo_timestamp_string(current_bookmark.last_modified),
     }
-    if current_bookmark.progress_percent:
+    if current_bookmark.progress_percent is not None:
-        resp["ProgressPercent"] = current_bookmark.progress_percent
+        resp["ProgressPercent"] = _clean_progress(current_bookmark.progress_percent)
-    if current_bookmark.content_source_progress_percent:
+    if current_bookmark.content_source_progress_percent is not None:
-        resp["ContentSourceProgressPercent"] = current_bookmark.content_source_progress_percent
+        resp["ContentSourceProgressPercent"] = _clean_progress(current_bookmark.content_source_progress_percent)
     if current_bookmark.location_value:
         resp["Location"] = {
             "Value": current_bookmark.location_value,
@@ -955,8 +968,10 @@ def HandleBookDeletionRequest(book_uuid):
 
 # TODO: Implement the following routes
 @csrf.exempt
-@kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET"])
+@kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET", "POST"])
+@kobo.route("/v1/library/<dummy>/preview", methods=["POST"])
 def HandleUnimplementedRequest(dummy=None):
+    [limiter.limiter.clear(limit.limit, *limit.request_args) for limit in limiter.current_limits]
     log.debug("Unimplemented Library Request received: %s (request is forwarded to kobo if configured)",
               request.base_url)
     return redirect_or_proxy_request()
@@ -971,6 +986,9 @@ def HandleUnimplementedRequest(dummy=None):
 @kobo.route("/v1/analytics/<dummy>", methods=["GET", "POST"])
 @kobo.route("/v1/assets", methods=["GET"])
 def HandleUserRequest(dummy=None):
+    [limiter.limiter.clear(limit.limit, *limit.request_args) for limit in limiter.current_limits]
+    log.error("Key: {}".format(limiter.current_limit.key))
+    log.error("Remaining: {}".format(limiter.current_limit.remaining))
     log.debug("Unimplemented User Request received: %s (request is forwarded to kobo if configured)", request.base_url)
     return redirect_or_proxy_request()
 
@@ -978,6 +996,7 @@ def HandleUserRequest(dummy=None):
 @csrf.exempt
 @kobo.route("/v1/user/loyalty/benefits", methods=["GET"])
 def handle_benefits():
+    [limiter.limiter.clear(limit.limit, *limit.request_args) for limit in limiter.current_limits]
     if config.config_kobo_proxy:
         return redirect_or_proxy_request()
     else:
@@ -987,6 +1006,7 @@ def handle_benefits():
 @csrf.exempt
 @kobo.route("/v1/analytics/gettests", methods=["GET", "POST"])
 def handle_getests():
+    [limiter.limiter.clear(limit.limit, *limit.request_args) for limit in limiter.current_limits]
     if config.config_kobo_proxy:
         return redirect_or_proxy_request()
     else:
@@ -1008,9 +1028,12 @@ def handle_getests():
 @kobo.route("/v1/products/dailydeal", methods=["GET", "POST"])
 @kobo.route("/v1/products/deals", methods=["GET", "POST"])
 @kobo.route("/v1/products", methods=["GET", "POST"])
+@kobo.route("/v1/products/<path:dummy>", methods=["GET", "POST"])
+@kobo.route("/v1/products/<path:dummy>/", methods=["GET", "POST"])
 @kobo.route("/v1/affiliate", methods=["GET", "POST"])
 @kobo.route("/v1/deals", methods=["GET", "POST"])
 def HandleProductsRequest(dummy=None):
+    [limiter.limiter.clear(limit.limit, *limit.request_args) for limit in limiter.current_limits]
     log.debug("Unimplemented Products Request received: %s (request is forwarded to kobo if configured)",
               request.base_url)
     return redirect_or_proxy_request()
@@ -1036,13 +1059,16 @@ def make_calibre_web_auth_response():
 
 
 @csrf.exempt
+@kobo.route("/v1/auth/refresh", methods=["POST"])
 @kobo.route("/v1/auth/device", methods=["POST"])
 @requires_kobo_auth
 def HandleAuthRequest():
+    log.error(limiter.current_limit)
+    log.error(limiter.current_limit)
     log.debug('Kobo Auth request')
     if config.config_kobo_proxy:
         try:
-            return redirect_or_proxy_request()
+            return redirect_or_proxy_request(auth=True)
         except Exception:
             log.error("Failed to receive or parse response from Kobo's auth endpoint. Falling back to un-proxied mode.")
     return make_calibre_web_auth_response()
@@ -1080,7 +1106,7 @@ def HandleInitRequest():
         kobo_resources["image_host"] = calibre_web_url
         kobo_resources["image_url_quality_template"] = unquote(calibre_web_url +
                                                                url_for("kobo.HandleCoverImageRequest",
-                                                                       auth_token=kobo_auth.get_auth_token(),
+                                                                       auth_token=get_auth_token(),
                                                                        book_uuid="{ImageId}",
                                                                        width="{width}",
                                                                        height="{height}",
@@ -1088,15 +1114,17 @@ def HandleInitRequest():
                                                                        isGreyscale='isGreyscale'))
         kobo_resources["image_url_template"] = unquote(calibre_web_url +
                                                        url_for("kobo.HandleCoverImageRequest",
-                                                               auth_token=kobo_auth.get_auth_token(),
+                                                               auth_token=get_auth_token(),
                                                                book_uuid="{ImageId}",
                                                                width="{width}",
                                                                height="{height}",
                                                                isGreyscale='false'))
+        kobo_resources["library_sync"] = calibre_web_url + url_for("kobo.HandleSyncRequest",
+                                                                    auth_token=kobo_auth.get_auth_token())
     else:
         kobo_resources["image_host"] = url_for("web.index", _external=True).strip("/")
         kobo_resources["image_url_quality_template"] = unquote(url_for("kobo.HandleCoverImageRequest",
-                                                                       auth_token=kobo_auth.get_auth_token(),
+                                                                       auth_token=get_auth_token(),
                                                                        book_uuid="{ImageId}",
                                                                        width="{width}",
                                                                        height="{height}",
@@ -1104,12 +1132,15 @@ def HandleInitRequest():
                                                                        isGreyscale='isGreyscale',
                                                                        _external=True))
         kobo_resources["image_url_template"] = unquote(url_for("kobo.HandleCoverImageRequest",
-                                                               auth_token=kobo_auth.get_auth_token(),
+                                                               auth_token=get_auth_token(),
                                                                book_uuid="{ImageId}",
                                                                width="{width}",
                                                                height="{height}",
                                                                isGreyscale='false',
                                                                _external=True))
+        kobo_resources["library_sync"] = url_for("kobo.HandleSyncRequest",
+                                                  auth_token=kobo_auth.get_auth_token(),
+                                                  _external=True)
 
     response = make_response(jsonify({"Resources": kobo_resources}))
     response.headers["x-kobo-apitoken"] = "e30="
@@ -1125,26 +1156,46 @@ def download_book(book_id, book_format):
 
 
 def NATIVE_KOBO_RESOURCES():
+    kobo_file = os.path.join(BASE_DIR, "kobo_resources.txt")
+    try:
+        if os.path.isfile(kobo_file):
+            with open(kobo_file, "r") as f:
+                lines = f.read()
+            return json.loads(lines)
+    except Exception as e:
+        log.error(e)
     return {
-        "account_page": "https://secure.kobobooks.com/profile",
+        "account_page": "https://www.kobo.com/account/settings",
         "account_page_rakuten": "https://my.rakuten.co.jp/",
+        "add_device": "https://storeapi.kobo.com/v1/user/add-device",
         "add_entitlement": "https://storeapi.kobo.com/v1/library/{RevisionIds}",
         "affiliaterequest": "https://storeapi.kobo.com/v1/affiliate",
+        "assets": "https://storeapi.kobo.com/v1/assets",
+        "audiobook": "https://storeapi.kobo.com/v1/products/audiobooks/{ProductId}",
+        "audiobook_detail_page": "https://www.kobo.com/{region}/{language}/audiobook/{slug}",
+        "audiobook_landing_page": "https://www.kobo.com/{region}/{language}/audiobooks",
+        "audiobook_preview": "https://storeapi.kobo.com/v1/products/audiobooks/{Id}/preview",
+        "audiobook_purchase_withcredit": "https://storeapi.kobo.com/v1/store/audiobook/{Id}",
         "audiobook_subscription_orange_deal_inclusion_url": "https://authorize.kobo.com/inclusion",
         "authorproduct_recommendations": "https://storeapi.kobo.com/v1/products/books/authors/recommendations",
         "autocomplete": "https://storeapi.kobo.com/v1/products/autocomplete",
-        "blackstone_header": {"key": "x-amz-request-payer", "value": "requester"},
+        "blackstone_header": {
+            "key": "x-amz-request-payer",
+            "value": "requester"
+        },
         "book": "https://storeapi.kobo.com/v1/products/books/{ProductId}",
-        "book_detail_page": "https://store.kobobooks.com/{culture}/ebook/{slug}",
+        "book_detail_page": "https://www.kobo.com/{region}/{language}/ebook/{slug}",
-        "book_detail_page_rakuten": "https://books.rakuten.co.jp/rk/{crossrevisionid}",
+        "book_detail_page_rakuten": "http://books.rakuten.co.jp/rk/{crossrevisionid}",
-        "book_landing_page": "https://store.kobobooks.com/ebooks",
+        "book_landing_page": "https://www.kobo.com/ebooks",
         "book_subscription": "https://storeapi.kobo.com/v1/products/books/subscriptions",
+        "browse_history": "https://storeapi.kobo.com/v1/user/browsehistory",
         "categories": "https://storeapi.kobo.com/v1/categories",
-        "categories_page": "https://store.kobobooks.com/ebooks/categories",
+        "categories_page": "https://www.kobo.com/ebooks/categories",
         "category": "https://storeapi.kobo.com/v1/categories/{CategoryId}",
         "category_featured_lists": "https://storeapi.kobo.com/v1/categories/{CategoryId}/featured",
         "category_products": "https://storeapi.kobo.com/v1/categories/{CategoryId}/products",
         "checkout_borrowed_book": "https://storeapi.kobo.com/v1/library/borrow",
+        "client_authd_referral": "https://authorize.kobo.com/api/AuthenticatedReferral/client/v1/getLink",
         "configuration_data": "https://storeapi.kobo.com/v1/configuration",
         "content_access_book": "https://storeapi.kobo.com/v1/products/books/{ProductId}/access",
         "customer_care_live_chat": "https://v2.zopim.com/widget/livechat.html?key=Y6gwUmnu4OATxN3Tli4Av9bYN319BTdO",
@@ -1155,92 +1206,112 @@ def NATIVE_KOBO_RESOURCES():
         "delete_tag_items": "https://storeapi.kobo.com/v1/library/tags/{TagId}/items/delete",
         "device_auth": "https://storeapi.kobo.com/v1/auth/device",
         "device_refresh": "https://storeapi.kobo.com/v1/auth/refresh",
-        "dictionary_host": "https://kbdownload1-a.akamaihd.net",
+        "dictionary_host": "https://ereaderfiles.kobo.com",
         "discovery_host": "https://discovery.kobobooks.com",
+        "ereaderdevices": "https://storeapi.kobo.com/v2/products/EReaderDeviceFeeds",
         "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":
+        "facebook_sso_page": "https://authorize.kobo.com/signin/provider/Facebook/login?returnUrl=http://kobo.com/",
-            "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}/"
+            "NL": "https://www.kobo.com/{region}/{language}/List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
-                  "List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
+            "PT": "https://www.kobo.com/{region}/{language}/p/livros-gratis"
-            "PT": "https://www.kobo.com/{region}/{language}/p/livros-gratis",
         },
         "fte_feedback": "https://storeapi.kobo.com/v1/products/ftefeedback",
+        "funnel_metrics": "https://storeapi.kobo.com/v1/funnelmetrics",
+        "get_download_keys": "https://storeapi.kobo.com/v1/library/downloadkeys",
+        "get_download_link": "https://storeapi.kobo.com/v1/library/downloadlink",
         "get_tests_request": "https://storeapi.kobo.com/v1/analytics/gettests",
         "giftcard_epd_redeem_url": "https://www.kobo.com/{storefront}/{language}/redeem-ereader",
         "giftcard_redeem_url": "https://www.kobo.com/{storefront}/{language}/redeem",
-        "help_page": "https://www.kobo.com/help",
+        "gpb_flow_enabled": "False",
-        "kobo_audiobooks_enabled": "False",
+        "help_page": "http://www.kobo.com/help",
+        "image_host": "//cdn.kobo.com/book-images/",
+        "image_url_quality_template": "https://cdn.kobo.com/book-images/{ImageId}/{Width}/{Height}/{Quality}/{IsGreyscale}/image.jpg",
+        "image_url_template": "https://cdn.kobo.com/book-images/{ImageId}/{Width}/{Height}/false/image.jpg",
+        "instapaper_enabled": "True",
+        "instapaper_env_url": "https://www.instapaper.com/api/kobo",
+        "instapaper_link_account_start": "https://authorize.kobo.com/{region}/{language}/linkinstapaper",
+        "kobo_audiobooks_credit_redemption": "False",
+        "kobo_audiobooks_enabled": "True",
         "kobo_audiobooks_orange_deal_enabled": "False",
         "kobo_audiobooks_subscriptions_enabled": "False",
-        "kobo_nativeborrow_enabled": "True",
+        "kobo_display_price": "True",
+        "kobo_dropbox_link_account_enabled": "False",
+        "kobo_google_tax": "False",
+        "kobo_googledrive_link_account_enabled": "False",
+        "kobo_nativeborrow_enabled": "False",
+        "kobo_onedrive_link_account_enabled": "False",
         "kobo_onestorelibrary_enabled": "False",
+        "kobo_privacyCentre_url": "https://www.kobo.com/privacy",
         "kobo_redeem_enabled": "True",
         "kobo_shelfie_enabled": "False",
-        "kobo_subscriptions_enabled": "False",
+        "kobo_subscriptions_enabled": "True",
-        "kobo_superpoints_enabled": "False",
+        "kobo_superpoints_enabled": "True",
         "kobo_wishlist_enabled": "True",
         "library_book": "https://storeapi.kobo.com/v1/user/library/books/{LibraryItemId}",
         "library_items": "https://storeapi.kobo.com/v1/user/library",
         "library_metadata": "https://storeapi.kobo.com/v1/library/{Ids}/metadata",
         "library_prices": "https://storeapi.kobo.com/v1/user/library/previews/prices",
-        "library_stack": "https://storeapi.kobo.com/v1/user/library/stacks/{LibraryItemId}",
+        "library_search": "https://storeapi.kobo.com/v1/library/search",
         "library_sync": "https://storeapi.kobo.com/v1/library/sync",
-        "love_dashboard_page": "https://store.kobobooks.com/{culture}/kobosuperpoints",
+        "love_dashboard_page": "https://www.kobo.com/{region}/{language}/kobosuperpoints",
-        "love_points_redemption_page":
+        "love_points_redemption_page": "https://www.kobo.com/{region}/{language}/KoboSuperPointsRedemption?productId={ProductId}",
-            "https://store.kobobooks.com/{culture}/KoboSuperPointsRedemption?productId={ProductId}",
+        "magazine_landing_page": "https://www.kobo.com/emagazines",
-        "magazine_landing_page": "https://store.kobobooks.com/emagazines",
+        "more_sign_in_options": "https://authorize.kobo.com/signin?returnUrl=http://kobo.com/#allProviders",
+        "notebooks": "https://storeapi.kobo.com/api/internal/notebooks",
         "notifications_registration_issue": "https://storeapi.kobo.com/v1/notifications/registration",
         "oauth_host": "https://oauth.kobo.com",
-        "overdrive_account": "https://auth.overdrive.com/account",
+        "password_retrieval_page": "https://www.kobo.com/passwordretrieval.html",
-        "overdrive_library": "https://{libraryKey}.auth.overdrive.com/library",
+        "personalizedrecommendations": "https://storeapi.kobo.com/v2/users/personalizedrecommendations",
-        "overdrive_library_finder_host": "https://libraryfinder.api.overdrive.com",
+        "pocket_link_account_start": "https://authorize.kobo.com/{region}/{language}/linkpocket",
-        "overdrive_thunder_host": "https://thunder.api.overdrive.com",
-        "password_retrieval_page": "https://www.kobobooks.com/passwordretrieval.html",
         "post_analytics_event": "https://storeapi.kobo.com/v1/analytics/event",
+        "ppx_purchasing_url": "https://purchasing.kobo.com",
         "privacy_page": "https://www.kobo.com/privacypolicy?style=onestore",
         "product_nextread": "https://storeapi.kobo.com/v1/products/{ProductIds}/nextread",
         "product_prices": "https://storeapi.kobo.com/v1/products/{ProductIds}/prices",
         "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":
+        "productsv2": "https://storeapi.kobo.com/v2/products",
-            "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://store.kobobooks.com/",
+        "provider_external_sign_in_page": "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://kobo.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",
         "quickbuy_create": "https://storeapi.kobo.com/v1/store/quickbuy/purchase",
+        "rakuten_token_exchange": "https://storeapi.kobo.com/v1/auth/rakuten_token_exchange",
         "rating": "https://storeapi.kobo.com/v1/products/{ProductId}/rating/{Rating}",
+        "reading_services_host": "https://readingservices.kobo.com",
         "reading_state": "https://storeapi.kobo.com/v1/library/{Ids}/state",
-        "redeem_interstitial_page": "https://store.kobobooks.com",
+        "redeem_interstitial_page": "https://www.kobo.com",
-        "registration_page": "https://authorize.kobo.com/signup?returnUrl=http://store.kobobooks.com/",
+        "registration_page": "https://authorize.kobo.com/signup?returnUrl=http://kobo.com/",
         "related_items": "https://storeapi.kobo.com/v1/products/{Id}/related",
         "remaining_book_series": "https://storeapi.kobo.com/v1/products/books/series/{SeriesId}",
         "rename_tag": "https://storeapi.kobo.com/v1/library/tags/{TagId}",
         "review": "https://storeapi.kobo.com/v1/products/reviews/{ReviewId}",
         "review_sentiment": "https://storeapi.kobo.com/v1/products/reviews/{ReviewId}/sentiment/{Sentiment}",
         "shelfie_recommendations": "https://storeapi.kobo.com/v1/user/recommendations/shelfie",
-        "sign_in_page": "https://authorize.kobo.com/signin?returnUrl=http://store.kobobooks.com/",
+        "sign_in_page": "https://authorize.kobo.com/signin?returnUrl=http://kobo.com/",
         "social_authorization_host": "https://social.kobobooks.com:8443",
         "social_host": "https://social.kobobooks.com",
-        "stacks_host_productId": "https://store.kobobooks.com/collections/byproductid/",
         "store_home": "www.kobo.com/{region}/{language}",
-        "store_host": "store.kobobooks.com",
+        "store_host": "www.kobo.com",
-        "store_newreleases": "https://store.kobobooks.com/{culture}/List/new-releases/961XUjtsU0qxkFItWOutGA",
+        "store_newreleases": "https://www.kobo.com/{region}/{language}/List/new-releases/961XUjtsU0qxkFItWOutGA",
-        "store_search": "https://store.kobobooks.com/{culture}/Search?Query={query}",
+        "store_search": "https://www.kobo.com/{region}/{language}/Search?Query={query}",
-        "store_top50": "https://store.kobobooks.com/{culture}/ebooks/Top",
+        "store_top50": "https://www.kobo.com/{region}/{language}/ebooks/Top",
+        "subs_landing_page": "https://www.kobo.com/{region}/{language}/plus",
+        "subs_management_page": "https://www.kobo.com/{region}/{language}/account/subscriptions",
+        "subs_plans_page": "https://www.kobo.com/{region}/{language}/plus/plans",
+        "subs_purchase_buy_templated": "https://www.kobo.com/{region}/{language}/Checkoutoption/{ProductId}/{TierId}",
         "tag_items": "https://storeapi.kobo.com/v1/library/tags/{TagId}/Items",
         "tags": "https://storeapi.kobo.com/v1/library/tags",
         "taste_profile": "https://storeapi.kobo.com/v1/products/tasteprofile",
+        "terms_of_sale_page": "https://authorize.kobo.com/{region}/{language}/terms/termsofsale",
         "update_accessibility_to_preview": "https://storeapi.kobo.com/v1/library/{EntitlementIds}/preview",
-        "use_one_store": "False",
+        "use_one_store": "True",
         "user_loyalty_benefits": "https://storeapi.kobo.com/v1/user/loyalty/benefits",
         "user_platform": "https://storeapi.kobo.com/v1/user/platform",
         "user_profile": "https://storeapi.kobo.com/v1/user/profile",
@@ -1248,6 +1319,6 @@ def NATIVE_KOBO_RESOURCES():
         "user_recommendations": "https://storeapi.kobo.com/v1/user/recommendations",
         "user_reviews": "https://storeapi.kobo.com/v1/user/reviews",
         "user_wishlist": "https://storeapi.kobo.com/v1/user/wishlist",
-        "userguide_host": "https://kbdownload1-a.akamaihd.net",
+        "userguide_host": "https://ereaderfiles.kobo.com",
-        "wishlist_page": "https://store.kobobooks.com/{region}/{language}/account/wishlist",
+        "wishlist_page": "https://www.kobo.com/{region}/{language}/account/wishlist"
     }

cps/kobo_auth.py

@@ -22,7 +22,7 @@
 This module also includes research notes into the auth protocol used by Kobo devices.
 
 Log-in:
-When first booting a Kobo device the user must sign into a Kobo (or affiliate) account.
+When first booting a Kobo device the user must log in to a Kobo (or affiliate) account.
 Upon successful sign-in, the user is redirected to
     https://auth.kobobooks.com/CrossDomainSignIn?id=<some id>
 which serves the following response:
@@ -41,7 +41,7 @@ issue for a few years now https://www.mobileread.com/forums/showpost.php?p=34768
 will still grant access given the userkey.)
 
 Official Kobo Store Api authorization:
-* For most of the endpoints we care about (sync, metadata, tags, etc), the userKey is
+* For most of the endpoints we care about (sync, metadata, tags, etc.), the userKey is
 passed in the x-kobo-userkey header, and is sufficient to authorize the API call.
 * Some endpoints (e.g: AnnotationService) instead make use of Bearer tokens pass through
 an authorization header. To get a BearerToken, the device makes a POST request to the
@@ -67,7 +67,6 @@ from functools import wraps
 from flask import g, Blueprint, abort, request
 from .cw_login import login_user, current_user
 from flask_babel import gettext as _
-from flask_limiter import RateLimitExceeded
 
 from . import logger, config, calibre_db, db, helper, ub, lm, limiter
 from .render_template import render_title_template
@@ -82,6 +81,8 @@ kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
 @kobo_auth.route("/generate_auth_token/<int:user_id>")
 @user_login_required
 def generate_auth_token(user_id):
+    if current_user.id != user_id and not current_user.role_admin():
+        abort(403)
     warning = False
     host_list = request.host.rsplit(':')
     if len(host_list) == 1:
@@ -124,6 +125,8 @@ def generate_auth_token(user_id):
 @kobo_auth.route("/deleteauthtoken/<int:user_id>", methods=["POST"])
 @user_login_required
 def delete_auth_token(user_id):
+    if current_user.id != user_id and not current_user.role_admin():
+        abort(403)
     # Invalidate any previously generated Kobo Auth token for this user
     ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == user_id)\
         .filter(ub.RemoteAuthToken.token_type==1).delete()
@@ -154,13 +157,6 @@ def requires_kobo_auth(f):
     def inner(*args, **kwargs):
         auth_token = get_auth_token()
         if auth_token is not None:
-            try:
-                limiter.check()
-            except RateLimitExceeded:
-                return abort(429)
-            except (ConnectionError, Exception) as e:
-                log.error("Connection error to limiter backend: %s", e)
-                return abort(429)
             user = (
                 ub.session.query(ub.User)
                 .join(ub.RemoteAuthToken)
@@ -169,7 +165,7 @@ def requires_kobo_auth(f):
             )
             if user is not None:
                 login_user(user)
-                [limiter.limiter.storage.clear(k.key) for k in limiter.current_limits]
+                [limiter.limiter.clear(limit.limit, *limit.request_args) for limit in limiter.current_limits]
                 return f(*args, **kwargs)
         log.debug("Received Kobo request without a recognizable auth token.")
         return abort(401)

cps/kobo_sync_status.py

@@ -51,13 +51,15 @@ def remove_synced_book(book_id, all=False, session=None):
         ub.session_commit(_session=session)
 
 
+# If state == none, it will toggle the archive state of the passed book_id. 
+# state = true archives it, state = false unarchives it
 def change_archived_books(book_id, state=None, message=None):
     archived_book = ub.session.query(ub.ArchivedBook).filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
                                                                   ub.ArchivedBook.book_id == book_id)).first()
-    if not archived_book:
+    if not archived_book: # and (state == True or state == None):
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
 
-    archived_book.is_archived = state if state else not archived_book.is_archived
+    archived_book.is_archived = state if state != None else not archived_book.is_archived
     archived_book.last_modified = datetime.now(timezone.utc)        # toDo. Check utc timestamp
 
     ub.session.merge(archived_book)

cps/logger.py

@@ -29,7 +29,7 @@ from .constants import CONFIG_DIR as _CONFIG_DIR
 ACCESS_FORMATTER_GEVENT  = Formatter("%(message)s")
 ACCESS_FORMATTER_TORNADO = Formatter("[%(asctime)s] %(message)s")
 
-FORMATTER           = Formatter("[%(asctime)s] %(levelname)5s {%(name)s:%(lineno)d} %(message)s")
+FORMATTER           = Formatter("[%(asctime)s] %(levelname)5s {%(filename)s:%(lineno)d} %(message)s")
 DEFAULT_LOG_LEVEL   = logging.INFO
 DEFAULT_LOG_FILE    = os.path.join(_CONFIG_DIR, "calibre-web.log")
 DEFAULT_ACCESS_LOG  = os.path.join(_CONFIG_DIR, "access.log")
@@ -42,18 +42,12 @@ logging.addLevelName(logging.CRITICAL, "CRIT")
 
 class _Logger(logging.Logger):
 
-    def error_or_exception(self, message, stacklevel=2, *args, **kwargs):
+    def error_or_exception(self, message, stacklevel=1, *args, **kwargs):
         is_debug = self.getEffectiveLevel() <= logging.DEBUG
-        if sys.version_info > (3, 7):
+        if not is_debug:
-            if is_debug:
+            self.exception(message, stacklevel=stacklevel, *args, **kwargs)
-                self.exception(message, stacklevel=stacklevel, *args, **kwargs)
-            else:
-                self.error(message, stacklevel=stacklevel, *args, **kwargs)
         else:
-            if is_debug:
+            self.error(message, stacklevel=stacklevel, *args, **kwargs)
-                self.exception(message, stack_info=True, *args, **kwargs)
-            else:
-                self.error(message, *args, **kwargs)
 
     def debug_no_auth(self, message, *args, **kwargs):
         message = message.strip("\r\n")

cps/main.py

@@ -24,13 +24,14 @@ from flask import request
 
 
 def request_username():
-    return request.authorization.username
+    return request.authorization.username if request.authorization else ""
 
 
 def main():
     app = create_app()
 
     from .web import web
+    from .basic import basic
     from .opds import opds
     from .admin import admi
     from .gdrive import gdrive
@@ -64,8 +65,9 @@ def main():
     app.register_blueprint(search)
     app.register_blueprint(tasks)
     app.register_blueprint(web)
-    app.register_blueprint(opds)
+    app.register_blueprint(basic)
     limiter.limit("3/minute", key_func=request_username)(opds)
+    app.register_blueprint(opds)
     app.register_blueprint(jinjia)
     app.register_blueprint(about)
     app.register_blueprint(shelf)
@@ -75,9 +77,9 @@ def main():
     app.register_blueprint(gdrive)
     app.register_blueprint(editbook)
     if kobo_available:
+        limiter.limit("3/minute", key_func=get_remote_address)(kobo)
         app.register_blueprint(kobo)
         app.register_blueprint(kobo_auth)
-        limiter.limit("3/minute", key_func=get_remote_address)(kobo)
     if oauth_available:
         app.register_blueprint(oauth)
     success = web_server.start()

cps/metadata_provider/comicvine.py

@@ -57,7 +57,7 @@ class ComicVine(Metadata):
                 result.raise_for_status()
             except Exception as e:
                 log.warning(e)
-                return None
+                return []
             for result in result.json()["results"]:
                 match = self._parse_search_result(
                     result=result, generic_cover=generic_cover, locale=locale

cps/metadata_provider/douban.py

@@ -155,7 +155,7 @@ class Douban(Metadata):
             r.raise_for_status()
         except Exception as e:
             log.warning(e)
-            return None
+            return []
 
         match = MetaRecord(
             id=id,

cps/metadata_provider/google.py

@@ -23,7 +23,7 @@ from datetime import datetime
 
 import requests
 
-from cps import logger
+from cps import logger, config
 from cps.isoLanguages import get_lang3, get_language_name
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
@@ -31,13 +31,14 @@ log = logger.create()
 
 
 class Google(Metadata):
-    __name__ = "Google"
+    __name__ = "Google Books"
     __id__ = "google"
     DESCRIPTION = "Google Books"
     META_URL = "https://books.google.com/"
     BOOK_URL = "https://books.google.com/books?id="
     SEARCH_URL = "https://www.googleapis.com/books/v1/volumes?q="
     ISBN_TYPE = "ISBN_13"
+    API_KEY = "&key=" + config.config_googlebooks_api_key 
 
     def search(
         self, query: str, generic_cover: str = "", locale: str = "en"
@@ -50,7 +51,7 @@ class Google(Metadata):
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = "+".join(tokens)
             try:
-                results = requests.get(Google.SEARCH_URL + query)
+                results = requests.get(Google.SEARCH_URL + query + Google.API_KEY)
                 results.raise_for_status()
             except Exception as e:
                 log.warning(e)

cps/oauth.py

@@ -32,7 +32,7 @@ class OAuthBackend(SQLAlchemyBackend):
     Stores and retrieves OAuth tokens using a relational database through
     the `SQLAlchemy`_ ORM.
 
-    .. _SQLAlchemy: https://www.sqlalchemy.org/
+    _SQLAlchemy: https://www.sqlalchemy.org/
     """
     def __init__(self, model, session, provider_id,
                  user=None, user_id=None, user_required=None, anon_user=None,

cps/oauth_bb.py

@@ -134,6 +134,14 @@ def bind_oauth_or_register(provider_id, provider_user_id, redirect_url, provider
         oauth_entry = query.first()
         # already bind with user, just login
         if oauth_entry.user:
+            # If a user is already logged in and it's a different account, reject the link
+            # to prevent account takeover via shared OAuth identities
+            if current_user and current_user.is_authenticated and oauth_entry.user_id != current_user.id:
+                flash(_("This %(oauth)s account is already linked to a different user",
+                        oauth=provider_name), category="error")
+                log.warning("User %s tried to link OAuth account already bound to user %s",
+                            current_user.id, oauth_entry.user_id)
+                return redirect(url_for('web.profile'))
             login_user(oauth_entry.user)
             log.debug("You are now logged in as: '%s'", oauth_entry.user.name)
             flash(_("Success! You are now logged in as: %(nickname)s", nickname=oauth_entry.user.name),

cps/opds.py

@@ -21,10 +21,9 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
-import json
 from urllib.parse import unquote_plus
 
-from flask import Blueprint, request, render_template, make_response, abort, Response, g
+from flask import Blueprint, request, render_template, make_response, abort, g, jsonify
 from flask_babel import get_locale
 from flask_babel import gettext as _
 
@@ -88,8 +87,8 @@ def feed_letter_books(book_id):
                                                         letter,
                                                         [db.Books.sort],
                                                         True, config.config_read_column)
-
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/new")
@@ -101,7 +100,8 @@ def feed_new():
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books, True, [db.Books.timestamp.desc()],
                                                         True, config.config_read_column)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/discover")
@@ -112,7 +112,8 @@ def feed_discover():
     query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
     entries = query.filter(calibre_db.common_filters()).order_by(func.random()).limit(config.config_books_per_page)
     pagination = Pagination(1, config.config_books_per_page, int(config.config_books_per_page))
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/rated")
@@ -125,7 +126,8 @@ def feed_best_rated():
                                                         db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
                                                         [db.Books.timestamp.desc()],
                                                         True, config.config_read_column)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/hot")
@@ -149,7 +151,8 @@ def feed_hot():
     num_books = entries.__len__()
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1),
                             config.config_books_per_page, num_books)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/author")
@@ -174,7 +177,8 @@ def feed_letter_author(book_id):
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             entries.count())
     entries = entries.limit(config.config_books_per_page).offset(off).all()
-    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_author', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_author', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/author/<int:book_id>")
@@ -197,7 +201,8 @@ def feed_publisherindex():
         .limit(config.config_books_per_page).offset(off)
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             len(calibre_db.session.query(db.Publishers).all()))
-    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_publisher', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_publisher', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/publisher/<int:book_id>")
@@ -230,7 +235,8 @@ def feed_letter_category(book_id):
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             entries.count())
     entries = entries.offset(off).limit(config.config_books_per_page).all()
-    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_category', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_category', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/category/<int:book_id>")
@@ -263,7 +269,8 @@ def feed_letter_series(book_id):
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             entries.count())
     entries = entries.offset(off).limit(config.config_books_per_page).all()
-    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_series', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_series', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/series/<int:book_id>")
@@ -275,7 +282,8 @@ def feed_series(book_id):
                                                         db.Books.series.any(db.Series.id == book_id),
                                                         [db.Books.series_index],
                                                         True, config.config_read_column)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/ratings")
@@ -297,7 +305,8 @@ def feed_ratingindex():
     element = list()
     for entry in entries:
         element.append(FeedObject(entry[0].id, _("{} Stars").format(entry.name)))
-    return render_xml_template('feed.xml', listelements=element, folder='opds.feed_ratings', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=element, folder='opds.feed_ratings', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/ratings/<book_id>")
@@ -321,7 +330,8 @@ def feed_formatindex():
     element = list()
     for entry in entries:
         element.append(FeedObject(entry.format, entry.format))
-    return render_xml_template('feed.xml', listelements=element, folder='opds.feed_format', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=element, folder='opds.feed_format', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/formats/<book_id>")
@@ -333,7 +343,8 @@ def feed_format(book_id):
                                                         db.Books.data.any(db.Data.format == book_id.upper()),
                                                         [db.Books.timestamp.desc()],
                                                         True, config.config_read_column)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/language")
@@ -351,7 +362,8 @@ def feed_languagesindex():
         languages[0].name = isoLanguages.get_language_name(get_locale(), languages[0].lang_code)
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             len(languages))
-    return render_xml_template('feed.xml', listelements=languages, folder='opds.feed_languages', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=languages, folder='opds.feed_languages', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/language/<int:book_id>")
@@ -363,7 +375,8 @@ def feed_languages(book_id):
                                                         db.Books.languages.any(db.Languages.id == book_id),
                                                         [db.Books.timestamp.desc()],
                                                         True, config.config_read_column)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/shelfindex")
@@ -377,7 +390,8 @@ def feed_shelfindex():
     number = len(shelf)
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             number)
-    return render_xml_template('feed.xml', listelements=shelf, folder='opds.feed_shelf', pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', listelements=shelf, folder='opds.feed_shelf', pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/shelf/<int:book_id>")
@@ -417,7 +431,8 @@ def feed_shelf(book_id):
             except (OperationalError, InvalidRequestError) as e:
                 ub.session.rollback()
                 log.error_or_exception("Settings Database error: {}".format(e))
-    return render_xml_template('feed.xml', entries=result, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=result, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/download/<book_id>/<book_format>/")
@@ -451,7 +466,7 @@ def get_database_stats():
     stat['authors'] = calibre_db.session.query(db.Authors).count()
     stat['categories'] = calibre_db.session.query(db.Tags).count()
     stat['series'] = calibre_db.session.query(db.Series).count()
-    return Response(json.dumps(stat), mimetype="application/json")
+    return make_response(jsonify(stat))
 
 
 @opds.route("/opds/thumb_240_240/<book_id>")
@@ -470,7 +485,8 @@ def feed_read_books():
         return abort(403)
     off = request.args.get("offset") or 0
     result, pagination = render_read_books(int(off) / (int(config.config_books_per_page)) + 1, True, True)
-    return render_xml_template('feed.xml', entries=result, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=result, pagination=pagination, cc=cc)
 
 
 @opds.route("/opds/unreadbooks")
@@ -480,7 +496,8 @@ def feed_unread_books():
         return abort(403)
     off = request.args.get("offset") or 0
     result, pagination = render_read_books(int(off) / (int(config.config_books_per_page)) + 1, False, True)
-    return render_xml_template('feed.xml', entries=result, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=result, pagination=pagination, cc=cc)
 
 
 class FeedObject:
@@ -502,7 +519,8 @@ def feed_search(term):
         entries, __, ___ = calibre_db.get_search_results(term, config=config)
         entries_count = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entries_count, entries_count)
-        return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
+        cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+        return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination, cc=cc)
     else:
         return render_xml_template('feed.xml', searchterm="")
 
@@ -524,7 +542,8 @@ def render_xml_dataset(data_table, book_id):
                                                         getattr(db.Books, data_table.__tablename__).any(data_table.id == book_id),
                                                         [db.Books.timestamp.desc()],
                                                         True, config.config_read_column)
-    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination, cc=cc)
 
 
 def render_element_index(database_column, linked_table, folder):
@@ -545,7 +564,9 @@ def render_element_index(database_column, linked_table, folder):
         elements.append({'id': entry.id, 'name': entry.id})
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             len(entries) + 1)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     return render_xml_template('feed.xml',
                                letterelements=elements,
                                folder=folder,
-                               pagination=pagination)
+                               pagination=pagination,
+                               cc=cc)

cps/redirect.py

@@ -29,7 +29,7 @@
 
 from urllib.parse import urlparse, urljoin
 
-from flask import request, url_for, redirect, current_app
+from flask import request, url_for, current_app
 
 
 def is_safe_url(target):

cps/render_template.py

@@ -47,7 +47,7 @@ def get_sidebar_config(kwargs=None):
     if current_user.role_admin():
         sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.download_list',
                         "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not current_user.is_anonymous),
-                        "page": "download", "show_text": _('Show Downloaded Books'),
+                        "page": "download", "show_text": _('Show Downloaded Books'), "no_param":True,
                         "config_show": content})
     else:
         sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.books_list',
@@ -69,37 +69,37 @@ def get_sidebar_config(kwargs=None):
                     "visibility": constants.SIDEBAR_RANDOM, 'public': True, "page": "discover",
                     "show_text": _('Show Random Books'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-inbox", "text": _('Categories'), "link": 'web.category_list', "id": "cat",
-                    "visibility": constants.SIDEBAR_CATEGORY, 'public': True, "page": "category",
+                    "visibility": constants.SIDEBAR_CATEGORY, 'public': True, "page": "category", "no_param":True,
                     "show_text": _('Show Category Section'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-bookmark", "text": _('Series'), "link": 'web.series_list', "id": "serie",
-                    "visibility": constants.SIDEBAR_SERIES, 'public': True, "page": "series",
+                    "visibility": constants.SIDEBAR_SERIES, 'public': True, "page": "series", "no_param":True,
                     "show_text": _('Show Series Section'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-user", "text": _('Authors'), "link": 'web.author_list', "id": "author",
-                    "visibility": constants.SIDEBAR_AUTHOR, 'public': True, "page": "author",
+                    "visibility": constants.SIDEBAR_AUTHOR, 'public': True, "page": "author", "no_param":True,
                     "show_text": _('Show Author Section'), "config_show": True})
     sidebar.append(
         {"glyph": "glyphicon-text-size", "text": _('Publishers'), "link": 'web.publisher_list', "id": "publisher",
-         "visibility": constants.SIDEBAR_PUBLISHER, 'public': True, "page": "publisher",
+         "visibility": constants.SIDEBAR_PUBLISHER, 'public': True, "page": "publisher", "no_param":True,
          "show_text": _('Show Publisher Section'), "config_show":True})
     sidebar.append({"glyph": "glyphicon-flag", "text": _('Languages'), "link": 'web.language_overview', "id": "lang",
                     "visibility": constants.SIDEBAR_LANGUAGE, 'public': (current_user.filter_language() == 'all'),
-                    "page": "language",
+                    "page": "language", "no_param":True,
                     "show_text": _('Show Language Section'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-star-empty", "text": _('Ratings'), "link": 'web.ratings_list', "id": "rate",
-                    "visibility": constants.SIDEBAR_RATING, 'public': True,
+                    "visibility": constants.SIDEBAR_RATING, 'public': True, "no_param":True,
                     "page": "rating", "show_text": _('Show Ratings Section'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-file", "text": _('File formats'), "link": 'web.formats_list', "id": "format",
-                    "visibility": constants.SIDEBAR_FORMAT, 'public': True,
+                    "visibility": constants.SIDEBAR_FORMAT, 'public': True, "no_param":True,
                     "page": "format", "show_text": _('Show File Formats Section'), "config_show": True})
     sidebar.append(
-        {"glyph": "glyphicon-trash", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
+        {"glyph": "glyphicon-folder-open", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
          "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not current_user.is_anonymous), "page": "archived",
          "show_text": _('Show Archived Books'), "config_show": content})
     if not simple:
         sidebar.append(
             {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
-             "visibility": constants.SIDEBAR_LIST, 'public': (not current_user.is_anonymous), "page": "list",
+             "visibility": constants.SIDEBAR_LIST, 'public': (not current_user.is_anonymous),
-             "show_text": _('Show Books List'), "config_show": content})
+             "show_text": _('Show Books List'), "config_show": content, "no_param":True})
     g.shelves_access = ub.session.query(ub.Shelf).filter(
         or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == current_user.id)).order_by(ub.Shelf.name).all()
 

cps/reverseproxy.py

@@ -41,9 +41,9 @@ class ReverseProxied(object):
     """Wrap the application in this middleware and configure the
     front-end server to add these headers, to let you quietly bind
     this to a URL other than / and to an HTTP scheme that is
-    different than what is used locally.
+    different from what is used locally.
 
-    Code courtesy of: http://flask.pocoo.org/snippets/35/
+    Code courtesy of: https://flask.pocoo.org/snippets/35/
 
     In nginx:
     location /myprefix {
@@ -61,11 +61,13 @@ class ReverseProxied(object):
 
     def __call__(self, environ, start_response):
         self.proxied = False
+        self.script_name = "/"
         script_name = environ.get('HTTP_X_SCRIPT_NAME', '')
         if script_name:
             self.proxied = True
             environ['SCRIPT_NAME'] = script_name
             path_info = environ.get('PATH_INFO', '')
+            self.script_name = script_name
             if path_info and path_info.startswith(script_name):
                 environ['PATH_INFO'] = path_info[len(script_name):]
 

cps/search.py

@@ -177,11 +177,24 @@ def adv_search_serie(q, include_series_inputs, 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)\
+    if len(include_shelf_inputs):
-        .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
+        in_shelf = (
-    if len(include_shelf_inputs) > 0:
+            calibre_db.session.query(ub.BookShelf.id)
-        q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
+            .filter(ub.BookShelf.book_id == db.Books.id)
+            .filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
+            .exists()
+        )
+        q = q.filter(in_shelf)
+    if len(exclude_shelf_inputs):
+        ex_shelf = (
+            calibre_db.session.query(ub.BookShelf.id)
+            .filter(ub.BookShelf.book_id == db.Books.id)
+            .filter(ub.BookShelf.shelf.in_(exclude_shelf_inputs))
+            .exists()
+        )
+        q = q.filter(~ex_shelf)
     return q
 
 def extend_search_term(searchterm,
@@ -245,7 +258,6 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 
     cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     calibre_db.create_functions()
-    # 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.id == db.books_series_link.c.book)\
         .outerjoin(db.Series)\
@@ -341,10 +353,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         q = adv_search_ratings(q, rating_high, rating_low)
 
         if description:
+            pass
             q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
 
         # search custom columns
         try:
+            pass
             q = adv_search_custom_columns(cc, term, q)
         except AttributeError as ex:
             log.debug_or_exception(ex)

cps/search_metadata.py

@@ -23,7 +23,7 @@ import json
 import os
 import sys
 
-from flask import Blueprint, Response, request, url_for
+from flask import Blueprint, request, url_for, make_response, jsonify
 from .cw_login import current_user
 from flask_babel import get_locale
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -89,7 +89,7 @@ def metadata_provider():
         provider.append(
             {"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__}
         )
-    return Response(json.dumps(provider), mimetype="application/json")
+    return make_response(jsonify(provider))
 
 
 @meta.route("/metadata/provider", methods=["POST"])
@@ -114,9 +114,7 @@ def metadata_change_active_provider(prov_name):
         provider = next((c for c in cl if c.__id__ == prov_name), None)
         if provider is not None:
             data = provider.search(new_state.get("query", ""))
-        return Response(
+        return make_response(jsonify([asdict(x) for x in data]))
-            json.dumps([asdict(x) for x in data]), mimetype="application/json"
-        )
     return ""
 
 
@@ -137,5 +135,5 @@ def metadata_search():
                 if active.get(c.__id__, True)
             }
             for future in concurrent.futures.as_completed(meta):
-                data.extend([asdict(x) for x in future.result() if x])
+                data.extend([asdict(x) for x in (future.result() or []) if x])
-    return Response(json.dumps(data), mimetype="application/json")
+    return  make_response(jsonify(data))

cps/server.py

@@ -41,7 +41,7 @@ except ImportError:
     VERSION = 'Tornado ' + _version
     _GEVENT = False
 
-from . import logger
+from . import logger, constants
 
 
 log = logger.create()
@@ -216,6 +216,13 @@ class WebServer(object):
         try:
             sock, output = self._make_gevent_listener()
             log.info('Starting Gevent server on %s', output)
+            try:
+                # Also print to stdout so interactive terminals show a clear success message
+                if constants.APP_MODE not in ['development', 'test']:
+                    print(f"Calibre-Web: server started on {output}")
+            except Exception:
+                print(f"Calibre-Web: error {output}")
+                pass
             self.wsgiserver = WSGIServer(sock, self.app, log=self.access_logger, handler_class=MyWSGIHandler,
                                          error_log=log,
                                          spawn=Pool(), **ssl_args)
@@ -266,6 +273,13 @@ class WebServer(object):
                 output = _readable_listen_address(self.listen_address, self.listen_port)
                 http_server.listen(self.listen_port, self.listen_address)
             log.info('Starting Tornado server on %s', output)
+            # Also print to stdout so interactive terminals show a clear success message
+            try:
+                if constants.APP_MODE not in ['development', 'test']:
+                    print(f"Calibre-Web: server started on {output}")
+            except Exception:
+                print(f"Calibre-Web: error {output}")
+                pass
 
             self.wsgiserver = IOLoop.current()
             self.wsgiserver.start()

cps/services/gmail.py

@@ -92,7 +92,7 @@ def send_messsage(token, msg):
     if creds and creds.expired and creds.refresh_token:
         creds.refresh(Request())
     service = build('gmail', 'v1', credentials=creds)
-    message_as_bytes = msg.as_bytes()  # the message should converted from string to bytes.
+    message_as_bytes = msg.as_bytes()  # the message should be converted from string to bytes.
     message_as_base64 = base64.urlsafe_b64encode(message_as_bytes)  # encode in base64 (printable letters coding)
     raw = message_as_base64.decode()  # convert to something  JSON serializable
     body = {'raw': raw}

cps/services/goodreads_support.py

@@ -22,7 +22,7 @@ import requests
 
 from goodreads.client import GoodreadsClient
 from goodreads.request import GoodreadsRequest
-import xmltodict
+from lxml import etree
 
 try:
     import Levenshtein
@@ -33,6 +33,39 @@ from .. import logger
 from ..clean_html import clean_string
 
 
+
+
+def etree_to_dict(t):
+    """
+    Convert lxml ElementTree to a nested dict (similar to xmltodict).
+    """
+    d = {t.tag: {} if t.attrib else None}
+    children = list(t)
+
+    if children:
+        dd = {}
+        for dc in map(etree_to_dict, children):
+            for k, v in dc.items():
+                if k in dd:
+                    if not isinstance(dd[k], list):
+                        dd[k] = [dd[k]]
+                    dd[k].append(v)
+                else:
+                    dd[k] = v
+        d = {t.tag: dd}
+
+    if t.attrib:
+        d[t.tag].update(('@' + k, v) for k, v in t.attrib.items())
+
+    text = (t.text or '').strip()
+    if text:
+        if children or t.attrib:
+            d[t.tag]['#text'] = text
+        else:
+            d[t.tag] = text
+
+    return d
+
 class my_GoodreadsClient(GoodreadsClient):
 
     def request(self, *args, **kwargs):
@@ -59,7 +92,9 @@ class my_GoodreadsRequest(GoodreadsRequest):
         if resp.status_code != 200:
             raise GoodreadsRequestException(resp.reason, self.path)
         if self.req_format == 'xml':
-            data_dict = xmltodict.parse(resp.content)
+            root = etree.fromstring(resp.content, parser=etree.XMLParser(resolve_entities=False, no_network=True))
+            data_dict = etree_to_dict(root)
+
             return data_dict['GoodreadsResponse']
         else:
             raise Exception("Invalid format")
@@ -117,7 +152,7 @@ def get_author_info(author_name):
 
 
 def get_other_books(author_info, library_books=None):
-    # Get all identifiers (ISBN, Goodreads, etc) and filter author's books by that list so we show fewer duplicates
+    # Get all identifiers (ISBN, Goodreads, etc.) and filter author's books by that list so we show fewer duplicates
     # Note: Not all images will be shown, even though they're available on Goodreads.com.
     #       See https://www.goodreads.com/topic/show/18213769-goodreads-book-images
 

cps/services/simpleldap.py

@@ -31,6 +31,16 @@ except ImportError:
 log = logger.create()
 
 
+def _escape_ldap_filter(s):
+    """Escape special characters for safe use in LDAP filter strings (RFC 4515)."""
+    s = s.replace('\\', '\\5c')
+    s = s.replace('*', '\\2a')
+    s = s.replace('(', '\\28')
+    s = s.replace(')', '\\29')
+    s = s.replace('\x00', '\\00')
+    return s
+
+
 class LDAPLogger(object):
 
     @staticmethod
@@ -148,9 +158,11 @@ def bind_user(username, password):
 
     :returns: True if login succeeded, False if login failed, None if server unavailable.
     '''
+    # Escape LDAP special characters to prevent LDAP injection in search filters
+    safe_username = _escape_ldap_filter(username)
     try:
-        if _ldap.get_object_details(username):
+        if _ldap.get_object_details(safe_username):
-            result = _ldap.bind_user(username, password)
+            result = _ldap.bind_user(safe_username, password)
             log.debug("LDAP login '%s': %r", username, result)
             return result is not None, None
         return None, None       # User not found

cps/services/worker.py

@@ -199,7 +199,7 @@ class CalibreTask:
             self.run(*args)
         except Exception as ex:
             self._handleError(str(ex))
-            log.error_or_exception(ex)
+            log.exception(ex)
 
         self.end_time = datetime.now()
 

cps/shelf.py

@@ -102,6 +102,52 @@ def add_to_shelf(shelf_id, book_id):
     return "", 204
 
 
+@shelf.route("/shelf/massremove/<int:shelf_id>", methods=["POST"])
+@user_login_required
+def search_from_shelf(shelf_id):
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
+    if shelf is None:
+        log.error("Invalid shelf specified: {}".format(shelf_id))
+        flash(_("Invalid shelf specified"), category="error")
+        return redirect(url_for('web.index'))
+
+    if not check_shelf_edit_permissions(shelf):
+        log.warning("You are not allowed to remove a book from the shelf".format(shelf.name))
+        flash(_("You are not allowed to remove a book from the shelf"), category="error")
+        return redirect(url_for('web.index'))
+
+    if current_user.id in ub.searched_ids and ub.searched_ids[current_user.id]:
+        books_from_shelf = list()
+        books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).all()
+        if books_in_shelf:
+            book_ids = [book_id.book_id for book_id in books_in_shelf]
+            for searchid in ub.searched_ids[current_user.id]:
+                if searchid in book_ids:
+                    books_from_shelf.append(searchid)
+        else:
+            log.error("No Books are part of {}".format(shelf.name))
+            flash(_("No Books are part of the shelf: %(name)s", name=shelf.name), category="error")
+            return redirect(url_for('web.index'))
+
+        # maxOrder = ub.session.query(func.max(ub.BookShelf.order)).filter(ub.BookShelf.shelf == shelf_id).first()[0] or 0
+
+        for book in books_from_shelf:
+            ub.session.delete(ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).filter(
+                ub.BookShelf.book_id == book).first())
+        shelf.last_modified = datetime.now(timezone.utc)
+        try:
+            ub.session.commit()
+            flash(_("Books have been removed from shelf: %(sname)s", sname=shelf.name), category="success")
+        except (OperationalError, InvalidRequestError) as e:
+            ub.session.rollback()
+            log.error_or_exception("Settings Database error: {}".format(e))
+            flash(_("Oops! Database Error: %(error)s.", error=e.orig), category="error")
+    else:
+        log.error("Could not remove books from shelf: {}".format(shelf.name))
+        flash(_("Could not remove books from shelf: %(sname)s", sname=shelf.name), category="error")
+    return redirect(url_for('web.index'))
+
+
 @shelf.route("/shelf/massadd/<int:shelf_id>", methods=["POST"])
 @user_login_required
 def search_to_shelf(shelf_id):
@@ -120,9 +166,7 @@ def search_to_shelf(shelf_id):
         books_for_shelf = list()
         books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).all()
         if books_in_shelf:
-            book_ids = list()
+            book_ids = [book_id.book_id for book_id in books_in_shelf]
-            for book_id in books_in_shelf:
-                book_ids.append(book_id.book_id)
             for searchid in ub.searched_ids[current_user.id]:
                 if searchid not in book_ids:
                     books_for_shelf.append(searchid)
@@ -264,6 +308,9 @@ def order_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     if shelf and check_shelf_view_permissions(shelf):
         if request.method == "POST":
+            if not check_shelf_edit_permissions(shelf):
+                flash(_("Sorry you are not allowed to edit this shelf"), category="error")
+                return redirect(url_for('web.index'))
             to_save = request.form.to_dict()
             books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
                 ub.BookShelf.order.asc()).all()

cps/static/css/basic.css

@@ -0,0 +1,108 @@
+body {
+  margin: 0;
+}
+
+nav {
+  height: 75px;
+  padding: 5px 20px;
+  width: 100%;
+  display: table;
+  box-sizing: border-box;
+  border-bottom: 1px solid black;
+}
+
+nav > * {
+  display: inline-block;
+  display: table-cell;
+  vertical-align: middle;
+  float: none;
+  text-align: center;
+  width: auto;
+}
+
+nav > *:first-child {
+  text-align: left;
+  width: 1%;
+}
+
+.theme{
+    text-align: center;
+    margin: 10px;
+}
+nav > *:last-child {
+  text-align: right;
+  width: 1%;
+}
+
+nav > a {
+  color: black;
+  margin: 0 20px;
+}
+
+.search {
+  margin: auto auto;
+}
+
+form > input {
+  width: 18ch;
+  padding-left: 4px;
+}
+
+form > * {
+  height: 50px;
+  background-color: white;
+  border-radius: 0;
+  border: 1px solid #ccc;
+  padding: 0;
+  margin: 0;
+  display: inline-block;
+  vertical-align: top;
+}
+
+form > span {
+  margin-left: -5px;
+}
+
+button {
+  border: none;
+  padding: 0 10px;
+  margin: 0;
+  width: 160px;
+  height: 100%;
+  background-color: white;
+}
+
+.body {
+  padding: 5px 20px;
+}
+
+a {
+  color: black;
+}
+
+img {
+  width: 150px;
+  height: 250px;
+  object-fit: cover;
+}
+
+.listing {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin-right: 20px;
+}
+
+.pagination {
+  padding: 10px 0;
+  height: 20px;
+  font-weight: 700;
+}
+
+.pagination > div {
+  float: left;
+}
+
+.pagination > div:last-child {
+  float: right;
+}

cps/static/css/caliBlur.css

@@ -2018,7 +2018,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previo
     display: none
 }
 
-body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container > div.col-xs-12, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container > div.col-xs-12, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container > div.col-sm-6, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container > div.col-sm-6 {
+body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container1 > div.col-xs-12, body.downloadlist > div.container-fluid > div > div.col-sm-10 > div.container1 > div.col-xs-12, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container1 > div.col-xs-12, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container1 > div.col-sm-6, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container1 > div.col-sm-6 {
     width: 100%
 }
 
@@ -2042,7 +2042,7 @@ body.serieslist > div.container-fluid > div > div.col-sm-10:before {
   }
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.container {
+body > div.container-fluid > div > div.col-sm-10 > div.container1 {
     width: calc(80% - 30px);
     margin: 120px 0 30px 20%;
     border-top: 2px solid rgba(0, 0, 0, .3);
@@ -2051,19 +2051,19 @@ body > div.container-fluid > div > div.col-sm-10 > div.container {
     max-width: calc(80% - 30px)
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.container > div {
+body > div.container-fluid > div > div.col-sm-10 > div.container1 > div {
     padding: 0
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row {
+body > div.container-fluid > div > div.col-sm-10 > div.container1 > div > .row {
     padding: 4px 0
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row:nth-of-type(even) {
+body > div.container-fluid > div > div.col-sm-10 > div.container1 > div > .row:nth-of-type(even) {
     background: hsla(0, 0%, 100%, .02)
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row > .col-xs-6 {
+body > div.container-fluid > div > div.col-sm-10 > div.container1 > div > .row > .col-xs-6 {
     width: calc(91.666% - 30px);
     overflow: hidden;
     -o-text-overflow: ellipsis;
@@ -2072,7 +2072,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row >
     padding-left: 60px
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row > .col-xs-6 > a {
+body > div.container-fluid > div > div.col-sm-10 > div.container1 > div > .row > .col-xs-6 > a {
     -o-text-overflow: ellipsis;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -2082,7 +2082,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row >
 }
 
 
-body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container {
+body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container1 {
     width: calc(80% - 30px);
     margin: 120px 0 30px 20%;
     border-top: 2px solid rgba(0, 0, 0, .3);
@@ -2091,19 +2091,19 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container
     max-width: calc(80% - 30px)
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container > div {
+body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container1 > div {
     padding: 0
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container > div > .row {
+body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container1 > div > .row {
     padding: 4px 0
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container > div > .row:nth-of-type(even) {
+body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container1 > div > .row:nth-of-type(even) {
     background: hsla(0, 0%, 100%, .02)
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container > div > .row > .col-xs-6 {
+body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container1 > div > .row > .col-xs-6 {
     width: calc(91.666% - 30px);
     overflow: hidden;
     -o-text-overflow: ellipsis;
@@ -2112,7 +2112,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container
     padding-left: 60px
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container > div > .row > .col-xs-6 > a {
+body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container1 > div > .row > .col-xs-6 > a {
     -o-text-overflow: ellipsis;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -2146,7 +2146,6 @@ body.catlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
   }
 }
 
-
 body.authorlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.langlist > div.container-fluid > div > div.col-sm-10:before {
     font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
@@ -2172,10 +2171,12 @@ body.authorlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
 }
 
 body.langlist > div.container-fluid > div > div.col-sm-10:before {
-    content: "\e034"
+    content: "\e034";
+    top: 240px;
 }
 
-body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+
+body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.downloadlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     top: 60px;
     font-size: 24px;
     color: #eee;
@@ -2186,63 +2187,104 @@ body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:befo
     font-weight: 400
 }
 
-body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "Authors";
     top: 115px;
+    display: table;
 }
 
 @media screen and (max-width: 992px) {
-  body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
-body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+@media screen and (max-width: 992px) {
+  body.downloadlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
+      top: 60px;
+  }
+}
+
+body.downloadlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
+    font-family: Glyphicons Halflings, serif;
+    content: "\E026";
+    font-style: normal;
+    font-weight: 400;
+    line-height: 1;
+    font-size: 6vw;
+    position: fixed;
+    left: 240px;
+    top: 240px;
+    width: calc(20% - 55px);
+    text-align: center
+}
+
+
+@media screen and (max-width: 992px) {
+  body.downloadlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
+      top: 180px;
+  }
+}
+
+body.downloadlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
+    content: "Downloads";
+    top: 115px;
+    display: table;
+}
+
+
+body.catlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "Categories";
     top: 115px;
+    display: table;
 }
 
 @media screen and (max-width: 992px) {
-  body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.catlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
-body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "Series";
     top: 115px;
+    display: table;
 }
 
 @media screen and (max-width: 992px) {
-  body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
-body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "File formats";
     top: 115px;
+    display: table;
 }
 
 @media screen and (max-width: 992px) {
-  body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
-body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "File formats";
     top: 115px;
+    display: table;
 }
 
 @media screen and (max-width: 992px) {
-  body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
-body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.langlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
-    content: "Languages"
+    content: "Languages";
+    top: 115px;
+    display: table;
 }
 
 body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
@@ -6421,7 +6463,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         display: none !important
     }
 
-    .shelforder > .container-fluid > .row-fluid > .col-sm-10 > div.col-sm-6.col-lg-6.col-xs-6 > h2:before, body.advsearch > div.container-fluid > div > div.col-sm-10:before, body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.login .navbar > .container-fluid > .navbar-header > button.navbar-toggle, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+    .shelforder > .container-fluid > .row-fluid > .col-sm-10 > div.col-sm-6.col-lg-6.col-xs-6 > h2:before, body.advsearch > div.container-fluid > div > div.col-sm-10:before, body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.downloadlist > div.container-fluid > div > div.col-sm-10 > div.container1:before, body.login .navbar > .container-fluid > .navbar-header > button.navbar-toggle, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
         display: none
     }
 
@@ -6527,7 +6569,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         background-size: 30px
     }
 
-    body.advanced_search > div.container-fluid > div > div.col-sm-10 > div.col-sm-8:before, body.author:not(.authorlist) .undefined-img:before, body.authorlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.catlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.langlist > div.container-fluid > div > div.col-sm-10:before, body.ratingslist > div.container-fluid > div > div.col-sm-10:before, body.serieslist > div.container-fluid > div > div.col-sm-10:before, body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
+    body.advanced_search > div.container-fluid > div > div.col-sm-10 > div.col-sm-8:before, body.author:not(.authorlist) .undefined-img:before, body.authorlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.catlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.downloadlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.langlist > div.container-fluid > div > div.col-sm-10:before, body.ratingslist > div.container-fluid > div > div.col-sm-10:before, body.serieslist > div.container-fluid > div > div.col-sm-10:before, body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
         position: fixed;
         top: 62px;
         right: 23px;
@@ -6547,7 +6589,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         border-top: 1px solid hsla(0, 0%, 78%, .15)
     }
 
-    body > div.container-fluid > div > div.col-sm-10 > div.container {
+    body > div.container-fluid > div > div.col-sm-10 > div.container1 {
         left: 0;
         width: auto;
         margin: 0 !important;
@@ -6674,7 +6716,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         margin-bottom: 5px
     }
 
-    body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row {
+    body > div.container-fluid > div > div.col-sm-10 > div.container1 > div > .row {
         padding: 0
     }
 
@@ -7153,12 +7195,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     }
 
     body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3, body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3 {
-        max-width: 130px;
+        position: relative;
-        width: 130px;
+        max-width: unset;
-        height: 180px;
+        width: 100%;
-        margin: 0;
+        height: unset;
         padding: 15px;
-        position: absolute
     }
 
     body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-9, body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-9 {
@@ -7167,10 +7208,6 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         width: 100%
     }
 
-    body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-9 > .form-group:nth-child(1), body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-9 > .form-group:nth-child(2), body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-9 > .form-group:nth-child(1), body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-9 > .form-group:nth-child(2) {
-        padding-left: 120px
-    }
-
     #deleteButton, body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3 > div.text-center > #delete, body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3 > div.text-center > #delete {
         top: 48px;
         height: 42px
@@ -7446,11 +7483,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         text-decoration: none
     }
 
-    body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row:nth-of-type(even) {
+    body > div.container-fluid > div > div.col-sm-10 > div.container1 > div > .row:nth-of-type(even) {
         background: 0 0
     }
 
-    body > div.container-fluid > div > div.col-sm-10 > div.container > div > .row {
+    body > div.container-fluid > div > div.col-sm-10 > div.container1 > div > .row {
         border-bottom: 1px solid hsla(0, 0%, 78%, .15)
     }
 
@@ -7605,7 +7642,7 @@ body.formatslist > div.container-fluid > div > div.col-sm-10:before {
   }
 }
 
-body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "Publishers";
     top: 115px;
     font-size: 24px;
@@ -7613,17 +7650,18 @@ body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container:b
     line-height: 1;
     padding-left: 15px;
     position: absolute;
+    display: table;
     font-family: Open Sans Bold, Helvetica Neue, Helvetica, Arial, sans-serif;
     font-weight: 400
 }
 
 @media screen and (max-width: 992px) {
-  body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
-body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "Ratings";
     top: 115px;
     font-size: 24px;
@@ -7631,23 +7669,24 @@ body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container:bef
     line-height: 1;
     padding-left: 15px;
     position: absolute;
+    display: table;
     font-family: Open Sans Bold, Helvetica Neue, Helvetica, Arial, sans-serif;
     font-weight: 400
 }
 
 @media screen and (max-width: 992px) {
-  body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
 @media screen and (max-width: 768px) {
-  body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.ratingslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       display: none;
   }
 }
 
-body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
     content: "File formats";
     top: 115px;
     font-size: 24px;
@@ -7660,18 +7699,18 @@ body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container:bef
 }
 
 @media screen and (max-width: 992px) {
-  body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       top: 60px;
   }
 }
 
 @media screen and (max-width: 768px) {
-  body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+  body.formatslist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
       display: none;
   }
 }
 
-body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container > div.col-sm-6 {
+body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container1 > div.col-sm-6 {
     width: 100%
 }
 
@@ -7710,7 +7749,7 @@ body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container >
         color: hsla(0, 0%, 100%, .7)
     }
 
-    body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+    body.publisherlist > div.container-fluid > div > div.col-sm-10 > div.container1:before {
         display: none !important
     }
 }

cps/static/css/caliBlur_override.css

@@ -26,3 +26,14 @@ body.serieslist.grid-view div.container-fluid > div > div.col-sm-10::before {
 input.datepicker {color: transparent}
 input.datepicker:focus {color: transparent}
 input.datepicker:focus + input {color: #555}
+
+.col-sm-3.col-lg-2.col-xs-6.book.session {
+    margin-left: 0;
+    margin-right: 0;
+}
+
+@media only screen and (max-width: 767px) {
+        .row-fluid > .col-sm-2 {
+        visibility: hidden;
+    }
+}

cps/static/css/epub_themes.css

@@ -13,6 +13,11 @@
 	color: #000;
 }
 
+.amberTheme {
+    background: #e8bf5e;
+    color: #000;
+}
+
 .blackTheme {
 	background: #000;
 	color: #fff;

cps/static/css/libs/typeahead.css

@@ -157,7 +157,6 @@ fieldset[disabled] .twitter-typeahead .tt-input {
   list-style: none;
   font-size: 14px;
   background-color: #ffffff;
-  border: 1px solid #cccccc;
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-radius: 4px;
   -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);

cps/static/css/main.css

@@ -1,11 +1,10 @@
 @font-face {
-  font-family: 'fontello';
+  font-family: "fontello";
-  src: url('fonts/fontello.eot?60518104');
+  src: url("fonts/fontello.eot?60518104");
-  src:
+  src: url("fonts/fontello.eot?60518104#iefix") format("embedded-opentype"),
-    url('fonts/fontello.eot?60518104#iefix') format('embedded-opentype'),
+    url("fonts/fontello.woff?60518104") format("woff"),
-    url('fonts/fontello.woff?60518104') format('woff'),
+    url("fonts/fontello.ttf?60518104") format("truetype"),
-    url('fonts/fontello.ttf?60518104') format('truetype'),
+    url("fonts/fontello.svg?60518104#fontello") format("svg");
-    url('fonts/fontello.svg?60518104#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -16,7 +15,7 @@ body {
 }
 
 .myselect {
-    overflow: visible !important;
+  overflow: visible !important;
 }
 
 #main {
@@ -48,7 +47,7 @@ body {
   -webkit-transition: opacity 0.5s;
   -moz-transition: opacity 0.5s;
   transition: opacity 0.5s;
-  z-index: 10;
+  z-index: 100;
 }
 
 #titlebar:hover {
@@ -93,14 +92,18 @@ body {
   box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
 }
 
-#book-title { font-weight: 600; }
+#book-title {
-#title-seperator { display: none; }
+  font-weight: 600;
+}
+#title-seperator {
+  display: none;
+}
 
 #viewer {
   width: 80%;
   height: 80%;
   margin: 0 auto;
-  z-index: 2;
+  z-index: 0;
   position: relative;
   overflow: hidden;
 }
@@ -136,6 +139,7 @@ body {
   user-select: none;
   padding-top: 160px;
   padding-bottom: 160px;
+  z-index: 10;
 }
 
 .arrow:hover {
@@ -200,10 +204,16 @@ body {
   max-width: 80%;
 }
 
-#title-controls { float: right; }
+#title-controls {
+  float: right;
+}
 
-#panels a::before { visibility: visible; }
+#panels a::before {
-#panels a:hover { color: #aaa; }
+  visibility: visible;
+}
+#panels a:hover {
+  color: #aaa;
+}
 
 .list_item.currentChapter > a,
 .list_item a:hover {
@@ -237,8 +247,12 @@ body {
   margin-top: -1px;
 }
 
-input::-webkit-input-placeholder { color: #454545; }
+input::-webkit-input-placeholder {
-input:-moz-placeholder { color: #454545; }
+  color: #454545;
+}
+input:-moz-placeholder {
+  color: #454545;
+}
 
 #divider {
   position: absolute;
@@ -378,14 +392,14 @@ input:-moz-placeholder { color: #454545; }
 }
 
 .toc_toggle::before {
-  content: '▸';
+  content: "▸";
   color: #fff;
   margin-right: -4px;
 }
 
 .currentChapter > .toc_toggle::before,
 .openChapter > .toc_toggle::before {
-  content: '▾';
+  content: "▾";
 }
 
 .view {
@@ -499,24 +513,36 @@ input:-moz-placeholder { color: #454545; }
   list-style-type: none;
 }
 
-#settingsPanel .xsmall { font-size: x-small; }
+#settingsPanel .xsmall {
-#settingsPanel .small { font-size: small; }
+  font-size: x-small;
-#settingsPanel .medium { font-size: medium; }
+}
-#settingsPanel .large { font-size: large; }
+#settingsPanel .small {
-#settingsPanel .xlarge { font-size: x-large; }
+  font-size: small;
+}
+#settingsPanel .medium {
+  font-size: medium;
+}
+#settingsPanel .large {
+  font-size: large;
+}
+#settingsPanel .xlarge {
+  font-size: x-large;
+}
 
-.highlight { background-color: yellow; }
+.highlight {
+  background-color: yellow;
+}
 
 .modal {
   position: fixed;
   top: 50%;
   left: 50%;
-  width: 630px;
+  transform: translate(-50%, -50%);
-  height: auto;
+  width: 97vw;
+  height: 90dvh;
+  max-width: 630px;
   z-index: 2000;
   visibility: hidden;
-  margin-left: -320px;
-  margin-top: -160px;
 }
 
 .overlay {
@@ -539,7 +565,7 @@ input:-moz-placeholder { color: #454545; }
 }
 
 .md-show ~ .overlay {
-  opacity: 1;
+  /* opacity: 1; */
   visibility: visible;
 }
 
@@ -554,7 +580,7 @@ input:-moz-placeholder { color: #454545; }
 }
 
 .md-content > div {
-  padding: 15px 40px 30px;
+  padding: 10px 20px;
   margin: 0;
   font-weight: 300;
   font-size: 14px;
@@ -581,6 +607,7 @@ input:-moz-placeholder { color: #454545; }
   color: white;
 }
 
+.md-content .themes button.lightTheme,
 .md-content .themes button.whiteTheme {
   background-color: white;
   color: black;
@@ -591,6 +618,11 @@ input:-moz-placeholder { color: #454545; }
   color: black;
 }
 
+.md-content .themes button.amberTheme {
+  background-color: #e8bf5e;
+  color: black;
+}
+
 .md-content .themes button.blackTheme {
   background-color: black;
   color: white;
@@ -638,31 +670,47 @@ input:-moz-placeholder { color: #454545; }
 
 @media only screen and (max-width: 900px) {
   #viewer {
-    width: 60%;
+    width: 100%;
-    margin-left: 20%;
+    height: calc(100dvh - 99px);
+    margin-left: 0;
+  }
+
+  #viewer iframe {
+    width: 100%;
+    height: 100%;
   }
 
   #prev {
     left: 20px;
+    z-index: 10;
   }
 
   #next {
     right: 20px;
+    z-index: 10;
   }
 }
 
 @media only screen and (max-width: 550px) {
   #viewer {
-    width: 80%;
+    width: 100%;
-    margin-left: 10%;
+    height: calc(100dvh - 99px);
+    margin-left: 0;
+  }
+
+  #viewer iframe {
+    width: 100%;
+    height: 100%;
   }
 
   #prev {
     left: 0;
+    z-index: 10;
   }
 
   #next {
     right: 0;
+    z-index: 10;
   }
 
   .arrow {
@@ -712,11 +760,7 @@ input:-moz-placeholder { color: #454545; }
   }
 }
 
-@media only screen
+@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) /* and (-webkit-min-device-pixel-ratio: 2) */ {
-  and (min-device-width: 768px)
-  and (max-device-width: 1024px)
-  and (orientation: landscape)
-  /* and (-webkit-min-device-pixel-ratio: 2)*/ {
   #viewer {
     width: 80%;
     margin-left: 10%;
@@ -739,47 +783,52 @@ input:-moz-placeholder { color: #454545; }
 /* For iPhone 6\6s portrait layouts only */
 @media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: portrait) {
   #viewer {
-    width: 300px;
+    width: 100%;
-    height: 480px;
+    height: calc(100dvh - 99px);
   }
 
   #viewer iframe {
-   width: 300px;
+    width: 100%;
-   height: 480px;
+    height: 100%;
   }
 }
 
 /* For iPhone 6\6s landscape layouts only */
 @media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: landscape) {
   #viewer {
-    width: 450px;
+    width: 100%;
-    height: 300px;
+    height: calc(100dvh - 99px);
   }
 
   #viewer iframe {
-    width: 450px;
+    width: 100%;
-    height: 300px;
+    height: 100%;
   }
 }
 
 /* For iPhone portrait layouts only */
 @media only screen and (max-device-width: 374px) and (orientation: portrait) {
   #viewer {
-    width: 256px;
+    width: 100%;
-    height: 432px;
+    height: calc(100dvh - 99px);
   }
 
   #viewer iframe {
-    width: 256px;
+    width: 100%;
-    height: 432px;
+    height: 100%;
   }
 }
 
 /* For iPhone landscape layouts only */
 @media only screen and (max-device-width: 374px) and (orientation: landscape) {
+  #viewer {
+    width: 100%;
+    height: calc(100dvh - 99px);
+  }
+
   #viewer iframe {
-    width: 256px;
+    width: 100%;
-    height: 124px;
+    height: 100%;
   }
 }
 
@@ -803,32 +852,69 @@ input:-moz-placeholder { color: #454545; }
   font-size: 112%;
 }
 
-.icon-search::before { content: '\e807'; } /* '' */
+.icon-search::before {
-.icon-resize-full-1::before { content: '\e804'; } /* '' */
+  content: "\e807";
-.icon-cancel-circled2::before { content: '\e80f'; } /* '' */
+} /* '' */
-.icon-link::before { content: '\e80d'; } /* '' */
+.icon-resize-full-1::before {
-.icon-bookmark::before { content: '\e805'; } /* '' */
+  content: "\e804";
-.icon-bookmark-empty::before { content: '\e806'; } /* '' */
+} /* '' */
-.icon-download-cloud::before { content: '\e811'; } /* '' */
+.icon-cancel-circled2::before {
-.icon-edit::before { content: '\e814'; } /* '' */
+  content: "\e80f";
-.icon-menu::before { content: '\e802'; } /* '' */
+} /* '' */
-.icon-cog::before { content: '\e813'; } /* '' */
+.icon-link::before {
-.icon-resize-full::before { content: '\e812'; } /* '' */
+  content: "\e80d";
-.icon-cancel-circled::before { content: '\e80e'; } /* '' */
+} /* '' */
-.icon-up-dir::before { content: '\e80c'; } /* '' */
+.icon-bookmark::before {
-.icon-right-dir::before { content: '\e80b'; } /* '' */
+  content: "\e805";
-.icon-angle-right::before { content: '\e809'; } /* '' */
+} /* '' */
-.icon-angle-down::before { content: '\e80a'; } /* '' */
+.icon-bookmark-empty::before {
-.icon-right::before { content: '\e815'; } /* '' */
+  content: "\e806";
-.icon-list-1::before { content: '\e803'; } /* '' */
+} /* '' */
-.icon-list-numbered::before { content: '\e801'; } /* '' */
+.icon-download-cloud::before {
-.icon-columns::before { content: '\e810'; } /* '' */
+  content: "\e811";
-.icon-list::before { content: '\e800'; } /* '' */
+} /* '' */
-.icon-resize-small::before { content: '\e808'; } /* '' */
+.icon-edit::before {
-
+  content: "\e814";
-#progress{
+} /* '' */
-    right: 4rem;
+.icon-menu::before {
-    bottom: 4rem;
+  content: "\e802";
-    width: fit-content;
+} /* '' */
-    position: absolute;
+.icon-cog::before {
-}
+  content: "\e813";
+} /* '' */
+.icon-resize-full::before {
+  content: "\e812";
+} /* '' */
+.icon-cancel-circled::before {
+  content: "\e80e";
+} /* '' */
+.icon-up-dir::before {
+  content: "\e80c";
+} /* '' */
+.icon-right-dir::before {
+  content: "\e80b";
+} /* '' */
+.icon-angle-right::before {
+  content: "\e809";
+} /* '' */
+.icon-angle-down::before {
+  content: "\e80a";
+} /* '' */
+.icon-right::before {
+  content: "\e815";
+} /* '' */
+.icon-list-1::before {
+  content: "\e803";
+} /* '' */
+.icon-list-numbered::before {
+  content: "\e801";
+} /* '' */
+.icon-columns::before {
+  content: "\e810";
+} /* '' */
+.icon-list::before {
+  content: "\e800";
+} /* '' */
+.icon-resize-small::before {
+  content: "\e808";
+} /* '' */

cps/static/css/reader.css

@@ -1,47 +1,81 @@
 .fontSizeWrapper {
-    position: relative;
+  position: relative;
 }
 .slider {
-    position: absolute;
+  position: absolute;
-    top: 50%;
+  top: 50%;
-    transform: translate(0,-50%);
+  transform: translate(0, -50%);
-    width: 90%;
+  width: 90%;
-    height: 60px;
+  height: 60px;
-    background: transparent;
+  background: transparent;
-    border-radius: 20px;
+  border-radius: 20px;
-    display: flex;
+  display: flex;
-    align-items: center;
+  align-items: center;
-    box-shadow: 0px 15px 40px #7E6D5766;
+  box-shadow: 0px 15px 40px #7e6d5766;
 }
 .slider label {
-    font-size: 20px;
+  font-size: 20px;
-    font-weight: 400;
+  font-weight: 400;
-    font-family: Open Sans;
+  font-family: Open Sans;
-    padding-right: 10px;
+  padding-right: 10px;
-    color: white;
+  color: white;
 }
 .slider input[type="range"] {
-    width: 80%;
+  width: 80%;
-    height: 5px;
+  height: 5px;
-    background: black;
+  background: black;
-    border: none;
+  border: none;
-    outline: none;
+  outline: none;
 }
 
 .item {
-    font-size: 20px;
+  font-size: 14px;
-    font-weight: 400;
+  font-weight: 600;
-    font-family: Open Sans;
+  font-family: Open Sans;
-    padding-right: 10px;
+  padding-right: 10px;
-    color: white;
+  color: white;
 }
 
-.item~button {
+.item ~ button {
-    display: inline-block;
+  display: inline-block;
-    border: none;
+  border: none;
-    text-align: center;
+  text-align: center;
-    text-decoration: none;
+  text-decoration: none;
-    margin-top: 5%;
+  margin-top: 5%;
-    margin-right: 1%;
+  margin-right: 1%;
-    font-size: 16px;
+  font-size: 16px;
+}
+
+#main,
+#viewer,
+#sidebar,
+#tocView {
+  touch-action: pan-y;
+}
+
+.read-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 12px;
+}
+.read-footer #pages-count {
+  font-size: 12px;
+
+  position: absolute;
+  left: 12px;
+  bottom: 2px;
+}
+
+#back-button {
+  width: 50px !important;
+  right: 50px;
+  // position: absolute;
+}
+
+#progress {
+  right: 4rem;
+  bottom: 2px;
+  width: fit-content;
+  position: absolute;
 }

cps/static/css/style.css

@@ -1,3 +1,7 @@
+#add-to-shelves.dropdown-menu, #remove-from-shelves.dropdown-menu {
+  max-height: 300px;
+  overflow-y: auto;
+}
 
 .tooltip.bottom .tooltip-inner {
   font-size: 13px;
@@ -429,6 +433,9 @@ div.log {
   padding: 0.5em;
 }
 
+.badge-sm{
+    font-size: 70%;
+}
 #detailcover { cursor:zoom-in; }
 #detailcover:-webkit-full-screen { cursor:zoom-out; border: 0; }
 #detailcover:-moz-full-screen { cursor:zoom-out; border: 0; }
@@ -438,3 +445,43 @@ div.log {
 .error-list {
     margin-top: 5px;
   }
+
+body > div.container-fluid > div.row-fluid > div.col-sm-10 {
+  max-height: calc(100vh - 111px);
+  overflow-y: auto;
+}
+
+body > div.container-fluid > div.row-fluid > div.col-sm-2 {
+  max-height: calc(100vh - 111px);
+  overflow-y: auto;
+  /* hide scrollbar in IE, Edge */
+  -ms-overflow-style: none;
+
+  /* hide scrollbar in Firefox */
+  scrollbar-width: none;
+}
+
+/* hide scrollbar in WebKit browsers (Chrome, Safari, Opera) */
+body > div.container-fluid > div.row-fluid > div.col-sm-2::-webkit-scrollbar {
+  display: none;
+}
+
+.scrollable-col {
+  /* keep vertical scrolling */
+  overflow-y: auto;
+
+  /* hide scrollbar in IE, Edge */
+  -ms-overflow-style: none;
+
+  /* hide scrollbar in Firefox */
+  scrollbar-width: none;
+}
+
+/* hide scrollbar in WebKit browsers (Chrome, Safari, Opera) */
+.scrollable-col::-webkit-scrollbar {
+  display: none;
+}
+
+body > div.container-fluid  {
+  padding-right: 0px;
+}

cps/static/js/get_meta.js

@@ -103,11 +103,11 @@ $(function () {
                         });
                     }
                     else {
-                        $("#meta-info").html("<p class=\"text-danger\">" + msg.no_result + "!</p>" + $("#meta-info")[0].innerHTML)
+                        $("#meta-info").html("<p class=\"text-danger\">" + msg.no_result + "</p>" + $("#meta-info")[0].innerHTML)
                     }
                 },
                 error: function error() {
-                    $("#meta-info").html("<p class=\"text-danger\">" + msg.search_error + "!</p>" + $("#meta-info")[0].innerHTML);
+                    $("#meta-info").html("<p class=\"text-danger\">" + msg.search_error + "</p>" + $("#meta-info")[0].innerHTML);
                 },
             });
         }

cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ar.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.ar={days:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت","الأحد"],daysShort:["أحد","اثنين","ثلاثاء","أربعاء","خميس","جمعة","سبت","أحد"],daysMin:["ح","ن","ث","ع","خ","ج","س","ح"],months:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],monthsShort:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],today:"هذا اليوم",rtl:!0}}(jQuery);

cps/static/js/libs/pdf.js

@@ -16667,7 +16667,7 @@ const PDFWorkerUtil = {
 {
   if (isNodeJS) {
     PDFWorkerUtil.isWorkerDisabled = true;
-    GlobalWorkerOptions.workerSrc ||= "./pdf.worker.mjs";
+    GlobalWorkerOptions.workerSrc ||= "./pdf.worker.js";
   }
   PDFWorkerUtil.isSameOrigin = function (baseUrl, otherUrl) {
     let base;

cps/static/js/libs/pwstrength/pwstrength-bootstrap.js

@@ -183,7 +183,7 @@ try {
                 ];
                 $.each(sequences, function(ignore, sequence) {
                     for (j = 0; j < word.length - 2; j += 1) {
-                        // iterate the word trough a sliding window of size 3:
+                        // iterate the word through a sliding window of size 3:
                         if (
                             sequence.indexOf(
                                 word.toLowerCase().substring(j, j + 3)

cps/static/js/libs/viewer.js

@@ -828,7 +828,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "../build/pdf.worker.mjs",
+    value: "../build/pdf.worker.js",
     kind: OptionKind.WORKER
   }
 };

cps/static/js/main.js

@@ -49,7 +49,7 @@ function elementSorter(a, b) {
     return 0;
 }
 
-// Generic control/related handler to show/hide fields based on a checkbox' value
+// Generic control/related handler to show/hide fields based on a 'checkbox' value
 // e.g.
 //  <input type="checkbox" data-control="stuff-to-show">
 //  <div data-related="stuff-to-show">...</div>
@@ -63,7 +63,7 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
     });
 });
 
-// Generic control/related handler to show/hide fields based on a select' value
+// Generic control/related handler to show/hide fields based on a 'select' value
 $(document).on("change", "select[data-control]", function() {
     var $this = $(this);
     var name = $this.data("control");
@@ -79,7 +79,7 @@ $(document).on("change", "select[data-control]", function() {
     }
 });
 
-// Generic control/related handler to show/hide fields based on a select' value
+// Generic control/related handler to show/hide fields based on a 'select' value
 // this one is made to show all values if select value is not 0
 $(document).on("change", "select[data-controlall]", function() {
     var $this = $(this);
@@ -229,10 +229,12 @@ $("#delete_confirm").click(function(event) {
         postButton(event, getPath() + "/delete/" + deleteId + "/" + bookFormat);
     } else {
         if (ajaxResponse) {
-            path = getPath() + "/ajax/delete/" + deleteId;
             $.ajax({
-                method:"post",
+                url: getPath() + "/ajax/deletebook",
-                url: path,
+                method: "post",
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                data: JSON.stringify({"bookid": [deleteId]}),
                 timeout: 900,
                 success:function(data) {
                     data.forEach(function(item) {
@@ -408,17 +410,17 @@ $(function() {
         });
 
         // fix for infinite scroll on CaliBlur Theme (#981)
-        if ($("body").hasClass("blur")) {
+
-            $(".col-sm-10").bind("scroll", function () {
+        $(".col-sm-10").bind("scroll", function () {
-                if (
+            if (
-                    $(this).scrollTop() + $(this).innerHeight() >=
+                $(this).scrollTop() + $(this).innerHeight() >=
-                    $(this)[0].scrollHeight
+                $(this)[0].scrollHeight
-                ) {
+            ) {
-                    $loadMore.infiniteScroll("loadNextPage");
+                $loadMore.infiniteScroll("loadNextPage");
-                    window.history.replaceState({}, null, $loadMore.infiniteScroll("getAbsolutePath"));
+                window.history.replaceState({}, null, $loadMore.infiniteScroll("getAbsolutePath"));
-                }
+            }
-            });
+        });
-        }
+
     }
 
     $("#restart").click(function() {
@@ -726,20 +728,20 @@ $(function() {
             url: getPath() + "/ajax/simulatedbchange",
             data: {config_calibre_dir: $("#config_calibre_dir").val(), csrf_token: $("input[name='csrf_token']").val()},
             success: function success(data) {
-                if ( data.change ) {
+                if ( !data.valid ) {
-                    if ( data.valid ) {
+                    $("#InvalidDialog").modal('show');
+                }
+                else{
+                    if ( data.change ) {
                         confirmDialog(
                             "db_submit",
                             "GeneralChangeModal",
                             0,
                             changeDbSettings
                         );
-                    }
+                    } else {
-                    else {
-                        $("#InvalidDialog").modal('show');
-                    }
-                } else {
                     changeDbSettings();
+                   }
                 }
             }
         });

cps/static/js/reading/epub-progress.js

@@ -1,54 +0,0 @@
-/**
- * waits until queue is finished, meaning the book is done loading
- * @param callback
- */
-function qFinished(callback){
-    let timeout=setInterval(()=>{
-        if(reader.rendition.q.running===undefined)
-            clearInterval(timeout);
-            callback();
-        },300
-    )
-}
-
-function calculateProgress(){
-    let data=reader.rendition.location.end;
-    return Math.round(epub.locations.percentageFromCfi(data.cfi)*100);
-}
-
-// register new event emitter locationchange that fires on urlchange
-// source: https://stackoverflow.com/a/52809105/21941129
-(() => {
-    let oldPushState = history.pushState;
-    history.pushState = function pushState() {
-        let ret = oldPushState.apply(this, arguments);
-        window.dispatchEvent(new Event('locationchange'));
-        return ret;
-    };
-
-    let oldReplaceState = history.replaceState;
-    history.replaceState = function replaceState() {
-        let ret = oldReplaceState.apply(this, arguments);
-        window.dispatchEvent(new Event('locationchange'));
-        return ret;
-    };
-
-    window.addEventListener('popstate', () => {
-        window.dispatchEvent(new Event('locationchange'));
-    });
-})();
-
-window.addEventListener('locationchange',()=>{
-    let newPos=calculateProgress();
-    progressDiv.textContent=newPos+"%";
-});
-
-var epub=ePub(calibre.bookUrl)
-
-let progressDiv=document.getElementById("progress");
-
-qFinished(()=>{
-    epub.locations.generate().then(()=> {
-    window.dispatchEvent(new Event('locationchange'))
-});
-})

cps/static/js/reading/epub.js

@@ -2,7 +2,7 @@
 
 var reader;
 
-(function() {
+(function () {
     "use strict";
 
     EPUBJS.filePath = calibre.filePath;
@@ -10,7 +10,7 @@ var reader;
 
     reader = ePubReader(calibre.bookUrl, {
         restore: true,
-        bookmarks: calibre.bookmark ? [calibre.bookmark] : []
+        bookmarks: calibre.bookmark ? [calibre.bookmark] : [],
     });
 
     Object.keys(themes).forEach(function (theme) {
@@ -52,6 +52,95 @@ var reader;
         }
     });
 
+    // Update progress percentage
+    let progressDiv = document.getElementById("progress");
+    // Pages counter (virtual pages via EPUB locations)
+    let pagesDiv = document.getElementById("pages-count");
+    // Honor saved visibility preference for pages counter
+    (function () {
+        try {
+            var pref = localStorage.getItem("calibre.reader.showPages");
+            var show = pref === null ? true : pref === "true";
+            if (pagesDiv)
+                pagesDiv.style.visibility = show ? "visible" : "hidden";
+        } catch (e) {}
+    })();
+
+    reader.book.ready.then(() => {
+        let locations_key = reader.book.key() + "-locations";
+        // Key to persist last-read position for this book in localStorage
+        let position_key = "calibre.reader.position." + reader.book.key();
+        let stored_locations = localStorage.getItem(locations_key);
+        let make_locations, save_locations;
+        if (stored_locations) {
+            make_locations = Promise.resolve(
+                reader.book.locations.load(stored_locations)
+            );
+            // No-op because locations are already saved
+            save_locations = () => {};
+        } else {
+            make_locations = reader.book.locations.generate();
+            save_locations = () => {
+                localStorage.setItem(
+                    locations_key,
+                    reader.book.locations.save()
+                );
+            };
+        }
+        make_locations
+            .then(() => {
+                // Try to restore last position (CFI) from localStorage if present
+                try {
+                    var _savedPos = localStorage.getItem(position_key);
+                    if (_savedPos) {
+                        try {
+                            var _posObj = JSON.parse(_savedPos);
+                            if (_posObj && _posObj.cfi) {
+                                // Display the saved CFI location
+                                try {
+                                    reader.rendition.display(_posObj.cfi);
+                                } catch (e) {}
+                            }
+                        } catch (e) {}
+                    }
+                } catch (e) {}
+
+                reader.rendition.on("relocated", (location) => {
+                    let percentage = Math.round(location.end.percentage * 100);
+                    progressDiv.textContent = percentage + "%";
+
+                    // Pages based on generated EPUB locations (CFI positions)
+                    const cfi = location.start.cfi;
+                    const current =
+                        reader.book.locations.locationFromCfi(cfi) || 0; // 1-based index typically
+                    const total = reader.book.locations.length() || 0;
+
+                    if (total > 0) {
+                        pagesDiv.textContent = current + "/" + total;
+                        pagesDiv.style.visibility = "visible";
+                    } else {
+                        pagesDiv.textContent = "";
+                        pagesDiv.style.visibility = "hidden";
+                    }
+
+                    // Persist last position (CFI + percentage) to localStorage so reader can restore on next open
+                    try {
+                        var posObj = {
+                            cfi: location.start.cfi,
+                            percentage: location.start.percentage,
+                        };
+                        localStorage.setItem(
+                            position_key,
+                            JSON.stringify(posObj)
+                        );
+                    } catch (e) {}
+                });
+                reader.rendition.reportLocation();
+                progressDiv.style.visibility = "visible";
+            })
+            .then(save_locations);
+    });
+
     /**
      * @param {string} action - Add or remove bookmark
      * @param {string|int} location - Location or zero
@@ -59,11 +148,15 @@ var reader;
     function updateBookmark(action, location) {
         // Remove other bookmarks (there can only be one)
         if (action === "add") {
-            this.settings.bookmarks.filter(function (bookmark) {
+            this.settings.bookmarks
-                return bookmark && bookmark !== location;
+                .filter(function (bookmark) {
-            }).map(function (bookmark) {
+                    return bookmark && bookmark !== location;
-                this.removeBookmark(bookmark);
+                })
-            }.bind(this));
+                .map(
+                    function (bookmark) {
+                        this.removeBookmark(bookmark);
+                    }.bind(this)
+                );
         }
 
         var csrftoken = $("input[name='csrf_token']").val();
@@ -72,7 +165,7 @@ var reader;
         $.ajax(calibre.bookmarkUrl, {
             method: "post",
             data: { bookmark: location || "" },
-            headers: { "X-CSRFToken": csrftoken }
+            headers: { "X-CSRFToken": csrftoken },
         }).fail(function (xhr, status, error) {
             alert(error);
         });
@@ -81,4 +174,17 @@ var reader;
     // Default settings load
     const theme = localStorage.getItem("calibre.reader.theme") ?? "lightTheme";
     selectTheme(theme);
+
+    // Restore saved font and font size after reader is ready
+    reader.book.ready.then(() => {
+        const savedFontSize = localStorage.getItem("calibre.reader.fontSize");
+        if (savedFontSize) {
+            reader.rendition.themes.fontSize(`${savedFontSize}%`);
+        }
+
+        const savedFont = localStorage.getItem("calibre.reader.font");
+        if (savedFont && window.selectFont) {
+            window.selectFont(savedFont);
+        }
+    });
 })();

cps/static/js/table.js

@@ -81,20 +81,78 @@ $(function() {
                 $("#merge_books").addClass("disabled");
                 $("#merge_books").attr("aria-disabled", true);
             }
+            if (selections.length >= 1) {
+                $("#delete_selected_books").removeClass("disabled");
+                $("#delete_selected_books").attr("aria-disabled", false);
+
+                $("#archive_selected_books").removeClass("disabled");
+                $("#archive_selected_books").attr("aria-disabled", false);
+
+                $("#unarchive_selected_books").removeClass("disabled");
+                $("#unarchive_selected_books").attr("aria-disabled", false);
+
+                $("#read_selected_books").removeClass("disabled");
+                $("#read_selected_books").attr("aria-disabled", false);
+
+                $("#unread_selected_books").removeClass("disabled");
+                $("#unread_selected_books").attr("aria-disabled", false);
+
+                $("#edit_selected_books").removeClass("disabled");
+                $("#edit_selected_books").attr("aria-disabled", false);
+            } else {
+                $("#delete_selected_books").addClass("disabled");
+                $("#delete_selected_books").attr("aria-disabled", true);
+
+                $("#archive_selected_books").addClass("disabled");
+                $("#archive_selected_books").attr("aria-disabled", true);
+
+                $("#unarchive_selected_books").addClass("disabled");
+                $("#unarchive_selected_books").attr("aria-disabled", true);
+
+                $("#read_selected_books").addClass("disabled");
+                $("#read_selected_books").attr("aria-disabled", true);
+
+                $("#unread_selected_books").addClass("disabled");
+                $("#unread_selected_books").attr("aria-disabled", true);
+
+                $("#edit_selected_books").addClass("disabled");
+                $("#edit_selected_books").attr("aria-disabled", true);
+            }
             if (selections.length < 1) {
-                $("#delete_selection").addClass("disabled");
+                // $("#book_delete_selection").addClass("disabled");
-                $("#delete_selection").attr("aria-disabled", true);
+                // $("#book_delete_selection").attr("aria-disabled", true);
                 $("#table_xchange").addClass("disabled");
                 $("#table_xchange").attr("aria-disabled", true);
             } else {
-                $("#delete_selection").removeClass("disabled");
+                // $("#book_delete_selection").removeClass("disabled");
-                $("#delete_selection").attr("aria-disabled", false);
+                // $("#book_delete_selection").attr("aria-disabled", false);
                 $("#table_xchange").removeClass("disabled");
                 $("#table_xchange").attr("aria-disabled", false);
-
             }
+            handle_header_buttons();
         });
-    $("#delete_selection").click(function() {
+
+    // Small block to initialize the state of the author/title sort inputs in metadata form
+    {
+        let checkA = $('#autoupdate_authorsort').prop('checked');
+        $('#author_sort_input').prop('disabled', checkA);
+        let checkT = $('#autoupdate_titlesort').prop('checked');
+        $('#title_sort_input').prop('disabled', checkT);
+    }
+
+    // Disable/enable author and title sort input in respect to auto-update title/author sort being checked on or not
+    $("#autoupdate_authorsort").on('change', function(event) {
+            let checkA = $('#autoupdate_authorsort').prop('checked');
+            $('#author_sort_input').prop('disabled', checkA);
+    })
+
+    $("#autoupdate_titlesort").on('change', function(event) {
+            let checkT = $('#autoupdate_titlesort').prop('checked');
+            $('#title_sort_input').prop('disabled', checkT);
+    })
+    /////
+
+    $("#book_delete_selection").click(function () {
         $("#books-table").bootstrapTable("uncheckAll");
     });
 
@@ -103,7 +161,7 @@ $(function() {
             method:"post",
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../ajax/mergebooks",
+            url: getPath() + "/ajax/mergebooks",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success() {
                 $("#books-table").bootstrapTable("refresh");
@@ -122,7 +180,7 @@ $(function() {
             method:"post",
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../ajax/simulatemerge",
+            url: getPath() + "/ajax/simulatemerge",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success(booTitles) {
                 $('#merge_from').empty();
@@ -135,12 +193,256 @@ $(function() {
         });
     });
 
+    $("#edit_selected_books").click(function(event) {
+        if ($(this).hasClass("disabled")) {
+            event.stopPropagation()
+        } else {
+            $('#edit_selected_modal').modal("show");
+        }
+    });
+
+    $("#edit_selected_confirm").click(function(event) {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/editselectedbooks",
+            data: JSON.stringify({
+                "selections": selections,
+                "title": $("#title_input").val(),
+                "title_sort": $("#title_sort_input").val(),
+                "author_sort": $("#author_sort_input").val(),
+                "authors": $("#authors_input").val(),
+                "categories": $("#categories_input").val(),
+                "series": $("#series_input").val(),
+                "languages": $("#languages_input").val(),
+                "publishers": $("#publishers_input").val(),
+                "comments": $("#comments_input").val().toString(),
+                "checkA": $('#autoupdate_authorsort').prop('checked'),
+                "checkT": $('#autoupdate_titlesort').prop('checked')
+            }),
+            success: function success(data) {
+                let result = "";
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
+
+                $("#title_input").val("");
+                $("#title_sort_input").val("");
+                $("#author_sort_input").val("");
+                $("#authors_input").val("");
+                $("#categories_input").val("");
+                $("#series_input").val("");
+                $("#languages_input").val("");
+                $("#publishers_input").val("");
+                $("#comments_input").val("");
+
+                $("#flash_success").remove();
+                $("#flash_danger").remove();
+
+                if (!jQuery.isEmptyObject(data)) {
+                    data.forEach(function(item) {
+                        if (item.success === true) {
+                            result = "success";
+                        } else {
+                            result = "danger";
+                        }
+                        $(".navbar").after('<div class="row-fluid text-center">' +
+                            '<div id="flash_' + result + '" class="alert alert-' + result + '">' + item.msg + '</div>' +
+                            '</div>');
+                    });
+                }
+                $(".table.table-striped").bootstrapTable("refresh");
+                // handleListServerResponse(data);
+            }
+        });
+    });
+
+    $(document).on('click', '#archive_selected_books', function(event) {
+        if ($(this).hasClass("disabled")) {
+            event.stopPropagation()
+        } else {
+            $('#archive_selected_modal').modal("show");
+        }
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/displayselectedbooks",
+            data: JSON.stringify({"selections":selections}),
+            success: function success(booTitles) {
+                $('#display-archive-selected-books').empty();
+                $.each(booTitles.books, function(i, item) {
+                    $("<span>- " + item + "</span><p></p>").appendTo("#display-archive-selected-books");
+                });
+
+            }
+        });
+    });
+
+    /*$(document).on('click', '#archive_selected_confirm', function(event) {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/archiveselectedbooks",
+            data: JSON.stringify({"selections":selections, "archive": true}),
+            success: function success(booTitles) {
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
+            }
+        });
+    });
+
+    $(document).on('click', '#unarchive_selected_books', function(event) {
+        if ($(this).hasClass("disabled")) {
+            event.stopPropagation()
+        } else {
+            $('#unarchive_selected_modal').modal("show");
+        }
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/displayselectedbooks",
+            data: JSON.stringify({"selections":selections}),
+            success: function success(booTitles) {
+                $('#display-unarchive-selected-books').empty();
+                $.each(booTitles.books, function(i, item) {
+                    $("<span>- " + item + "</span><p></p>").appendTo("#display-unarchive-selected-books");
+                });
+
+            }
+        });
+    });
+
+    $(document).on('click', '#unarchive_selected_confirm', function(event) {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/archiveselectedbooks",
+            data: JSON.stringify({"selections":selections, "archive": false}),
+            success: function success(booTitles) {
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
+            }
+        });
+    });
+
+    $(document).on('click', '#delete_selected_books', function(event) {
+        if ($(this).hasClass("disabled")) {
+            event.stopPropagation()
+        } else {
+            $('#delete_selected_modal').modal("show");
+        }
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/displayselectedbooks",
+            data: JSON.stringify({"selections":selections}),
+            success: function success(booTitles) {
+                $('#display-delete-selected-books').empty();
+                $.each(booTitles.books, function(i, item) {
+                    $("<span>- " + item + "</span><p></p>").appendTo("#display-delete-selected-books");
+                });
+
+            }
+        });
+    });
+
+    $(document).on('click', '#delete_selected_confirm', function(event) {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/deleteselectedbooks",
+            data: JSON.stringify({"selections":selections}),
+            success: function success(booTitles) {
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
+            }
+        });
+    });
+
+    $(document).on('click', '#read_selected_books', function(event) {
+        if ($(this).hasClass("disabled")) {
+            event.stopPropagation()
+        } else {
+            $('#read_selected_modal').modal("show");
+        }
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/displayselectedbooks",
+            data: JSON.stringify({"selections":selections}),
+            success: function success(booTitles) {
+                $('#display-read-selected-books').empty();
+                $.each(booTitles.books, function(i, item) {
+                    $("<span>- " + item + "</span><p></p>").appendTo("#display-read-selected-books");
+                });
+
+            }
+        });
+    });
+
+    $(document).on('click', '#read_selected_confirm', function(event) {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/readselectedbooks",
+            data: JSON.stringify({"selections":selections, "markAsRead": true}),
+            success: function success(booTitles) {
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
+            }
+        });
+    });
+
+    $(document).on('click', '#unread_selected_books', function(event) {
+        if ($(this).hasClass("disabled")) {
+            event.stopPropagation()
+        } else {
+            $('#unread_selected_modal').modal("show");
+        }
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/displayselectedbooks",
+            data: JSON.stringify({"selections":selections}),
+            success: function success(booTitles) {
+                $('#display-unread-selected-books').empty();
+                $.each(booTitles.books, function(i, item) {
+                    $("<span>- " + item + "</span><p></p>").appendTo("#display-unread-selected-books");
+                });
+
+            }
+        });
+    });
+
+    $(document).on('click', '#unread_selected_confirm', function(event) {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: getPath() + "/ajax/readselectedbooks",
+            data: JSON.stringify({"selections":selections, "markAsRead": false}),
+            success: function success(booTitles) {
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
+            }
+        });
+    });*/
+
     $("#table_xchange").click(function() {
         $.ajax({
             method:"post",
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../ajax/xchange",
+            url: getPath() + "/ajax/xchange",
             data: JSON.stringify({"xchange":selections}),
             success: function success() {
                 $("#books-table").bootstrapTable("refresh");
@@ -157,6 +459,10 @@ $(function() {
                 editable: {
                     mode: "inline",
                     emptytext: "<span class='glyphicon glyphicon-plus'></span>",
+                    ajaxOptions: {
+                        contentType: "application/json; charset=utf-8",
+                        dataType: "json",
+                    },
                     success: function (response, __) {
                         if (!response.success) return response.msg;
                         return {newValue: response.newValue};
@@ -164,7 +470,8 @@ $(function() {
                     params: function (params) {
                         params.checkA = $('#autoupdate_authorsort').prop('checked');
                         params.checkT = $('#autoupdate_titlesort').prop('checked');
-                        return params
+                        params.pk = [params.pk];
+                        return JSON.stringify(params);
                     }
                 }
             };
@@ -198,7 +505,7 @@ $(function() {
         searchAlign: "left",
         showSearchButton : true,
         searchOnEnterKey: true,
-        checkboxHeader: false,
+        checkboxHeader: true,
         maintainMetaData: true,
         responseHandler: responseHandler,
         columns: column,
@@ -212,7 +519,7 @@ $(function() {
                 $.ajax({
                     method:"get",
                     dataType: "json",
-                    url: window.location.pathname + "/../ajax/sort_value/" + field + "/" + row.id,
+                    url: getPath() + "/ajax/sort_value/" + field + "/" + row.id,
                     success: function success(data) {
                         var key = Object.keys(data)[0];
                         $("#books-table").bootstrapTable("updateCellByUniqueId", {
@@ -224,6 +531,66 @@ $(function() {
                 });
             }
         },
+        onPostBody () {
+            // Remove all checkboxes from Headers for showing the texts in the column selector
+            $('.columns [data-field]').each(function(){
+                var elText = $(this).next().text();
+                $(this).next().empty();
+                var index = elText.lastIndexOf('\n', elText.length - 2);
+                if ( index > -1) {
+                    elText = elText.substr(index);
+                }
+                $(this).next().text(elText);
+            });
+        },
+        onPostHeader() {
+            $(".form-check").each(function () {
+                var item = $(this).parent();
+                var parent = item.parent().parent();
+                if (parent.prop('nodeName') === "TH") {
+                    item.prependTo(parent);
+                }
+            });
+
+            if ($(".button_head").length) {
+                if (!$._data($(".button_head").get(0), "events")) {
+                    $(".button_head").on("click", function () {
+                        var result = $('#books-table').bootstrapTable('getSelections').map(a => a.id);
+                        confirmDialog(
+                            "btndelbook",
+                            "GeneralDeleteModal",
+                            0,
+                            function () {
+                                $.ajax({
+                                    method: "post",
+                                    url: getPath() + "/ajax/deletebook",
+                                    contentType: "application/json; charset=utf-8",
+                                    dataType: "json",
+                                    data: JSON.stringify({"bookid": result}),
+                                    success: function (data) {
+                                        selections = selections.filter((el) => !result.includes(el));
+                                        handleListServerResponse(data);
+                                    },
+                                    error: function (data) {
+                                        handleListServerResponse([{type: "danger", message: data.responseText}])
+                                    },
+                                });
+                            }
+                        );
+                    });
+                }
+            }
+            if ($(".check_head").length) {
+                if (!$._data($(".check_head").get(0), "events")) {
+                    $(".check_head").on("change", function () {
+                        var val = $(this).data("set");
+                        var name = $(this).data("name");
+                        var data = $(this).data("val");
+                        bookCheckboxHeader(val, name, data);
+                    });
+                }
+            }
+        },
         // eslint-disable-next-line no-unused-vars
         onColumnSwitch: function (field, checked) {
             var visible = $("#books-table").bootstrapTable("getVisibleColumns");
@@ -240,10 +607,16 @@ $(function() {
                 method:"post",
                 contentType: "application/json; charset=utf-8",
                 dataType: "json",
-                url: window.location.pathname + "/../ajax/table_settings",
+                url: getPath() + "/ajax/table_settings",
                 data: "{" + st + "}",
             });
+            handle_header_buttons();
         },
+        onLoadSuccess: function() {
+            $("input:radio.check_head:checked").each(function () {
+                $(this).prop('checked', false);
+            });
+        }
     });
 
     $("#domain_allow_submit").click(function(event) {
@@ -252,7 +625,7 @@ $(function() {
         $(this).closest("form").submit();
         $.ajax ({
             method:"get",
-            url: window.location.pathname + "/../../ajax/domainlist/1",
+            url: getPath() + "/ajax/domainlist/1",
             async: true,
             timeout: 900,
             success:function(data) {
@@ -273,7 +646,7 @@ $(function() {
         $(this).closest("form").submit();
         $.ajax ({
             method:"get",
-            url: window.location.pathname + "/../../ajax/domainlist/0",
+            url: getPath() + "/ajax/domainlist/0",
             async: true,
             timeout: 900,
             success:function(data) {
@@ -291,12 +664,12 @@ $(function() {
     function domainHandle(domainId) {
         $.ajax({
             method:"post",
-            url: window.location.pathname + "/../../ajax/deletedomain",
+            url: getPath() + "/ajax/deletedomain",
             data: {"domainid":domainId}
         });
         $.ajax({
             method:"get",
-            url: window.location.pathname + "/../../ajax/domainlist/1",
+            url: getPath() + "/ajax/domainlist/1",
             async: true,
             timeout: 900,
             success:function(data) {
@@ -305,7 +678,7 @@ $(function() {
         });
         $.ajax({
             method:"get",
-            url: window.location.pathname + "/../../ajax/domainlist/0",
+            url: getPath() + "/ajax/domainlist/0",
             async: true,
             timeout: 900,
             success:function(data) {
@@ -541,7 +914,7 @@ $(function() {
                 method:"post",
                 contentType: "application/json; charset=utf-8",
                 dataType: "json",
-                url: window.location.pathname + "/../../ajax/user_table_settings",
+                url: getPath() + "/ajax/user_table_settings",
                 data: "{" + st + "}",
             });
             handle_header_buttons();
@@ -567,8 +940,8 @@ $(function() {
 
 function handle_header_buttons () {
     if (selections.length < 1) {
-        $("#user_delete_selection").addClass("disabled");
+        $(".mass_selection").addClass("disabled");
-        $("#user_delete_selection").attr("aria-disabled", true);
+        $(".mass_selection").attr("aria-disabled", true);
         $(".check_head").attr("aria-disabled", true);
         $(".check_head").attr("disabled", true);
         $(".check_head").prop('checked', false);
@@ -580,8 +953,8 @@ function handle_header_buttons () {
         $(".multi_selector").attr("disabled", true);
         $(".header_select").attr("disabled", true);
     } else {
-        $("#user_delete_selection").removeClass("disabled");
+        $(".mass_selection").removeClass("disabled");
-        $("#user_delete_selection").attr("aria-disabled", false);
+        $(".mass_selection").attr("aria-disabled", false);
         $(".check_head").attr("aria-disabled", false);
         $(".check_head").removeAttr("disabled");
         $(".button_head").attr("aria-disabled", false);
@@ -590,8 +963,10 @@ function handle_header_buttons () {
         $(".multi_head").removeClass("hidden");
         $(".multi_selector").attr("aria-disabled", false);
         $(".multi_selector").removeAttr("disabled");
-        $('.multi_selector').selectpicker('refresh');
         $(".header_select").removeAttr("disabled");
+        if (typeof $.fn.selectpicker === "function") {
+            $('.multi_selector').selectpicker('refresh');
+        }
     }
 }
 
@@ -718,7 +1093,7 @@ function loadSuccess() {
     $("input[data-name='passwd_role'][data-pk='"+guest.data("pk")+"']").prop("disabled", true);
     $("input[data-name='edit_shelf_role'][data-pk='"+guest.data("pk")+"']").prop("disabled", true);
     $("input[data-name='sidebar_read_and_unread'][data-pk='"+guest.data("pk")+"']").prop("disabled", true);
-    $(".user-remove[data-pk='"+guest.data("pk")+"']").hide();
+    $(".user-remove[data-pk='" + guest.data("pk") + "']").hide();
 }
 
 function move_header_elements() {
@@ -760,7 +1135,7 @@ function move_header_elements() {
                     function () {
                         $.ajax({
                             method: "post",
-                            url: window.location.pathname + "/../../ajax/editlistusers/" + field,
+                            url: getPath() + "/ajax/editlistusers/" + field,
                             data: {"pk": result, "value": values, "action": val},
                             success: function (data) {
                                 handleListServerResponse(data);
@@ -774,7 +1149,6 @@ function move_header_elements() {
             });
         }
     }
-
     $("#user_delete_selection").click(function () {
         $("#user-table").bootstrapTable("uncheckAll");
     });
@@ -805,8 +1179,10 @@ function move_header_elements() {
                     function () {
                         $.ajax({
                             method: "post",
-                            url: window.location.pathname + "/../../ajax/deleteuser",
+                            url: getPath() + "/ajax/deleteuser",
-                            data: {"userid": result},
+                            contentType: "application/json; charset=utf-8",
+                            dataType: "json",
+                            data: JSON.stringify({"userid": result}),
                             success: function (data) {
                                 selections = selections.filter((el) => !result.includes(el));
                                 handleListServerResponse(data);
@@ -832,7 +1208,7 @@ function handleListServerResponse (data) {
                 '</div>');
         });
     }
-    $("#user-table").bootstrapTable("refresh");
+    $(".table.table-striped").bootstrapTable("refresh");
 }
 
 function checkboxChange(checkbox, userId, field, field_index) {
@@ -847,30 +1223,30 @@ function checkboxChange(checkbox, userId, field, field_index) {
     });
 }
 
-function BookCheckboxChange(checkbox, userId, field) {
+function BookCheckboxChange(checkbox, bookId, field) {
     var value = checkbox.checked ? "True" : "False";
     var element = checkbox;
     $.ajax({
         method: "post",
         url: getPath() + "/ajax/editbooks/" + field,
-        data: {"pk": userId, "value": value},
+        data: JSON.stringify({"pk": [bookId], "value": value}),
+        contentType: "application/json; charset=utf-8",
+        dataType: "json",
         error: function(data) {
             element.checked = !element.checked;
             handleListServerResponse([{type:"danger", message:data.responseText}])
         },
         success: handleListServerResponse
     });
-    console.log("test");
 }
 
-
 function selectHeader(element, field) {
     if (element.value !== "None") {
         confirmDialog(element.id, "GeneralChangeModal", 0, function () {
             var result = $('#user-table').bootstrapTable('getSelections').map(a => a.id);
             $.ajax({
                 method: "post",
-                url: window.location.pathname + "/../../ajax/editlistusers/" + field,
+                url: getPath() + "/ajax/editlistusers/" + field,
                 data: {"pk": result, "value": element.value},
                 error: function (data) {
                     handleListServerResponse([{type:"danger", message:data.responseText}])
@@ -883,12 +1259,35 @@ function selectHeader(element, field) {
     }
 }
 
+function bookCheckboxHeader(CheckboxState, text, field_index) {
+    confirmDialog(text, "GeneralChangeModal", 0, function() {
+        var result = $('#books-table').bootstrapTable('getSelections').map(a => a.id);
+        $.ajax({
+            method: "post",
+            url: getPath() + "/ajax/editbooks/" + field_index,
+            data: JSON.stringify({"pk": result, "field_index": field_index, "value": CheckboxState, multi: "True"}),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            error: function (data) {
+                handleListServerResponse([{type:"danger", message:data.responseText}])
+            },
+            success: function (data) {
+                handleListServerResponse (data, true)
+            },
+        });
+    },function() {
+        $("input:radio.check_head:checked").each(function() {
+            $(this).prop('checked', false);
+        });
+    });
+}
+
 function checkboxHeader(CheckboxState, field, field_index) {
     confirmDialog(field, "GeneralChangeModal", 0, function() {
         var result = $('#user-table').bootstrapTable('getSelections').map(a => a.id);
         $.ajax({
             method: "post",
-            url: window.location.pathname + "/../../ajax/editlistusers/" + field,
+            url: getPath() + "/ajax/editlistusers/" + field,
             data: {"pk": result, "field_index": field_index, "value": CheckboxState},
             error: function (data) {
                 handleListServerResponse([{type:"danger", message:data.responseText}])
@@ -904,7 +1303,7 @@ function checkboxHeader(CheckboxState, field, field_index) {
     });
 }
 
-function deleteUser(a,id){
+function deleteUser(a, id){
     confirmDialog(
     "btndeluser",
         "GeneralDeleteModal",
@@ -912,8 +1311,10 @@ function deleteUser(a,id){
         function() {
             $.ajax({
                 method:"post",
-                url: window.location.pathname + "/../../ajax/deleteuser",
+                url: getPath() + "/ajax/deleteuser",
-                data: {"userid":id},
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                data: JSON.stringify({"userid": [id]}),
                 success: function (data) {
                     userId = parseInt(id, 10);
                     selections = selections.filter(item => item !== userId);
@@ -940,8 +1341,10 @@ function storeLocation() {
 function user_handle (userId) {
     $.ajax({
         method:"post",
-        url: window.location.pathname + "/../../ajax/deleteuser",
+        contentType: "application/json; charset=utf-8",
-        data: {"userid":userId}
+        dataType: "json",
+        data: JSON.stringify({"userid": [userId]}),
+        url: getPath() + "/ajax/deleteuser",
     });
     $("#user-table").bootstrapTable("refresh");
 }
@@ -949,6 +1352,5 @@ function user_handle (userId) {
 function shorten_html(value, response) {
     if(value) {
         $(this).html("[...]");
-        // value.split('\n').slice(0, 2).join("") +
     }
 }

cps/tasks/convert.py

@@ -28,7 +28,7 @@ from sqlalchemy.exc import SQLAlchemyError
 from flask_babel import lazy_gettext as N_
 
 from cps.services.worker import CalibreTask
-from cps import db
+from cps import db, app
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
@@ -60,36 +60,39 @@ class TaskConvert(CalibreTask):
         self.results = dict()
 
     def run(self, worker_thread):
+        df_cover = None
+        cur_book = None
         self.worker_thread = worker_thread
         if config.config_use_google_drive:
-            worker_db = db.CalibreDB(expire_on_commit=False, init=True)
+            with app.app_context():
-            cur_book = worker_db.get_book(self.book_id)
+                worker_db = db.CalibreDB(app)
-            self.title = cur_book.title
+                cur_book = worker_db.get_book(self.book_id)
-            data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
+                self.title = cur_book.title
-            df = gdriveutils.getFileFromEbooksFolder(cur_book.path,
+                data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
-                                                     data.name + "." + self.settings['old_book_format'].lower())
+                df = gdriveutils.getFileFromEbooksFolder(cur_book.path,
-            df_cover = gdriveutils.getFileFromEbooksFolder(cur_book.path, "cover.jpg")
+                                                         data.name + "." + self.settings['old_book_format'].lower())
-            if df:
+                df_cover = gdriveutils.getFileFromEbooksFolder(cur_book.path, "cover.jpg")
-                datafile_cover = None
+                if df:
-                datafile = os.path.join(config.get_book_path(),
+                    datafile_cover = None
-                                        cur_book.path,
+                    datafile = os.path.join(config.get_book_path(),
-                                        data.name + "." + self.settings['old_book_format'].lower())
+                                            cur_book.path,
-                if df_cover:
+                                            data.name + "." + self.settings['old_book_format'].lower())
-                    datafile_cover = os.path.join(config.get_book_path(),
+                    if df_cover:
-                                                  cur_book.path, "cover.jpg")
+                        datafile_cover = os.path.join(config.get_book_path(),
-                if not os.path.exists(os.path.join(config.get_book_path(), cur_book.path)):
+                                                      cur_book.path, "cover.jpg")
-                    os.makedirs(os.path.join(config.get_book_path(), cur_book.path))
+                    if not os.path.exists(os.path.join(config.get_book_path(), cur_book.path)):
-                df.GetContentFile(datafile)
+                        os.makedirs(os.path.join(config.get_book_path(), cur_book.path))
-                if df_cover:
+                    df.GetContentFile(datafile)
-                    df_cover.GetContentFile(datafile_cover)
+                    if df_cover:
-                worker_db.session.close()
+                        df_cover.GetContentFile(datafile_cover)
-            else:
+                    # worker_db.session.close()
-                # ToDo Include cover in error handling
+                else:
-                error_message = _("%(format)s not found on Google Drive: %(fn)s",
+                    # ToDo Include cover in error handling
-                                  format=self.settings['old_book_format'],
+                    error_message = _("%(format)s not found on Google Drive: %(fn)s",
-                                  fn=data.name + "." + self.settings['old_book_format'].lower())
+                                      format=self.settings['old_book_format'],
-                worker_db.session.close()
+                                      fn=data.name + "." + self.settings['old_book_format'].lower())
-                return self._handleError(error_message)
+                    # worker_db.session.close()
+                    return self._handleError(error_message)
 
         filename = self._convert_ebook_format()
         if config.config_use_google_drive:
@@ -124,88 +127,89 @@ class TaskConvert(CalibreTask):
 
     def _convert_ebook_format(self):
         error_message = None
-        local_db = db.CalibreDB(expire_on_commit=False, init=True)
+        with app.app_context():
-        file_path = self.file_path
+            local_db = db.CalibreDB(app)
-        book_id = self.book_id
+            file_path = self.file_path
-        format_old_ext = '.' + self.settings['old_book_format'].lower()
+            book_id = self.book_id
-        format_new_ext = '.' + self.settings['new_book_format'].lower()
+            format_old_ext = '.' + self.settings['old_book_format'].lower()
+            format_new_ext = '.' + self.settings['new_book_format'].lower()
 
-        # check to see if destination format already exists - or if book is in database
+            # check to see if destination format already exists - or if book is in database
-        # if it does - mark the conversion task as complete and return a success
+            # if it does - mark the conversion task as complete and return a success
-        # this will allow to send to E-Reader workflow to continue to work
+            # this will allow to send to E-Reader workflow to continue to work
-        if os.path.isfile(file_path + format_new_ext) or\
+            if os.path.isfile(file_path + format_new_ext) or\
-                local_db.get_book_format(self.book_id, 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)
+                log.info("Book id %d already converted to %s", book_id, format_new_ext)
-            cur_book = local_db.get_book(book_id)
+                cur_book = local_db.get_book(book_id)
-            self.title = cur_book.title
+                self.title = cur_book.title
-            self.results['path'] = cur_book.path
+                self.results['path'] = cur_book.path
-            self.results['title'] = self.title
+                self.results['title'] = self.title
-            new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id)\
+                new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id)\
-                .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
-            if not new_format:
-                new_format = db.Data(name=os.path.basename(file_path),
-                                     book_format=self.settings['new_book_format'].upper(),
-                                     book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
-                try:
-                    local_db.session.merge(new_format)
-                    local_db.session.commit()
-                except SQLAlchemyError as e:
-                    local_db.session.rollback()
-                    log.error("Database error: %s", e)
-                    local_db.session.close()
-                    self._handleError(N_("Oops! Database Error: %(error)s.", error=e))
-                    return
-                self._handleSuccess()
-                local_db.session.close()
-                return os.path.basename(file_path + format_new_ext)
-        else:
-            log.info("Book id %d - target format of %s does not exist. Moving forward with convert.",
-                     book_id,
-                     format_new_ext)
-
-        if config.config_kepubifypath and format_old_ext == '.epub' and format_new_ext == '.kepub':
-            check, error_message = self._convert_kepubify(file_path,
-                                                          format_old_ext,
-                                                          format_new_ext)
-        else:
-            # check if calibre converter-executable is existing
-            if not os.path.exists(config.config_converterpath):
-                self._handleError(N_("Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
-                return
-            has_cover = local_db.get_book(book_id).has_cover
-            check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext, has_cover)
-
-        if check == 0:
-            cur_book = local_db.get_book(book_id)
-            if os.path.isfile(file_path + format_new_ext):
-                new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id) \
                     .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
                 if not new_format:
-                    new_format = db.Data(name=cur_book.data[0].name,
+                    new_format = db.Data(name=os.path.basename(file_path),
                                          book_format=self.settings['new_book_format'].upper(),
                                          book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
                     try:
                         local_db.session.merge(new_format)
                         local_db.session.commit()
-                        if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
-                            ub_session = init_db_thread()
-                            remove_synced_book(book_id, True, ub_session)
-                            ub_session.close()
                     except SQLAlchemyError as e:
                         local_db.session.rollback()
                         log.error("Database error: %s", e)
                         local_db.session.close()
-                        self._handleError(error_message)
+                        self._handleError(N_("Oops! Database Error: %(error)s.", error=e))
                         return
-                self.results['path'] = cur_book.path
-                self.title = cur_book.title
-                self.results['title'] = self.title
-                if not config.config_use_google_drive:
                     self._handleSuccess()
-                return os.path.basename(file_path + format_new_ext)
+                    local_db.session.close()
+                    return os.path.basename(file_path + format_new_ext)
             else:
-                error_message = N_('%(format)s format not found on disk', format=format_new_ext.upper())
+                log.info("Book id %d - target format of %s does not exist. Moving forward with convert.",
-        local_db.session.close()
+                         book_id,
+                         format_new_ext)
+
+            if config.config_kepubifypath and format_old_ext == '.epub' and format_new_ext == '.kepub':
+                check, error_message = self._convert_kepubify(file_path,
+                                                              format_old_ext,
+                                                              format_new_ext)
+            else:
+                # check if calibre converter-executable is existing
+                if not os.path.exists(config.config_converterpath):
+                    self._handleError(N_("Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
+                    return
+                has_cover = local_db.get_book(book_id).has_cover
+                check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext, has_cover)
+
+            if check == 0:
+                cur_book = local_db.get_book(book_id)
+                if os.path.isfile(file_path + format_new_ext):
+                    new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id) \
+                        .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
+                    if not new_format:
+                        new_format = db.Data(name=cur_book.data[0].name,
+                                             book_format=self.settings['new_book_format'].upper(),
+                                             book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
+                        try:
+                            local_db.session.merge(new_format)
+                            local_db.session.commit()
+                            if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                                ub_session = init_db_thread()
+                                remove_synced_book(book_id, True, ub_session)
+                                ub_session.close()
+                        except SQLAlchemyError as e:
+                            local_db.session.rollback()
+                            log.error("Database error: %s", e)
+                            local_db.session.close()
+                            self._handleError(error_message)
+                            return
+                    self.results['path'] = cur_book.path
+                    self.title = cur_book.title
+                    self.results['title'] = self.title
+                    if not config.config_use_google_drive:
+                        self._handleSuccess()
+                    return os.path.basename(file_path + format_new_ext)
+                else:
+                    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 = N_('Ebook converter failed with unknown error')
@@ -281,6 +285,8 @@ class TaskConvert(CalibreTask):
                 else:
                     error_message = ""
                     for ele in calibre_traceback:
+                        ele = ele.decode('utf-8', errors="ignore").strip('\n')
+                        log.debug(ele)
                         if not ele.startswith('Traceback') and not ele.startswith('  File'):
                             error_message = N_("Calibre failed with error: %(error)s", error=ele)
                     return check, error_message

cps/tasks/database.py

@@ -18,7 +18,7 @@
 
 from flask_babel import lazy_gettext as N_
 
-from cps import config, logger, db, ub
+from cps import config, logger, db, ub, app
 from cps.services.worker import CalibreTask
 
 
@@ -26,11 +26,13 @@ class TaskReconnectDatabase(CalibreTask):
     def __init__(self, task_message=N_('Reconnecting Calibre database')):
         super(TaskReconnectDatabase, self).__init__(task_message)
         self.log = logger.create()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+        # self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
 
     def run(self, worker_thread):
-        self.calibre_db.reconnect_db(config, ub.app_DB_path)
+        with app.app_context():
-        self.calibre_db.session.close()
+            calibre_db = db.CalibreDB(app)
+            calibre_db.reconnect_db(config, ub.app_DB_path)
+        # self.calibre_db.session.close()
         self._handleSuccess()
 
     @property

cps/tasks/mail.py

@@ -25,7 +25,7 @@ import mimetypes
 
 from io import StringIO
 from email.message import EmailMessage
-from email.utils import formatdate, parseaddr
+from email.utils import formatdate, parseaddr, make_msgid
 from email.generator import Generator
 from flask_babel import lazy_gettext as N_
 
@@ -35,7 +35,7 @@ from cps.embed_helper import do_calibre_export
 from cps import logger, config
 from cps import gdriveutils
 from cps.string_helper import strip_whitespaces
-import uuid
+
 
 log = logger.create()
 
@@ -55,8 +55,8 @@ class EmailBase:
         return (code, resp)
 
     def send(self, strg):
-        """Send `strg' to the server."""
+        """Send 'strg' to the server."""
-        log.debug_no_auth('send: {}'.format(strg[:300]))
+        log.debug_no_auth('send: {}'.format(strg[:300]), stacklevel=2)
         if hasattr(self, 'sock') and self.sock:
             try:
                 if self.transferSize:
@@ -102,7 +102,7 @@ class Email(EmailBase, smtplib.SMTP):
         smtplib.SMTP.__init__(self, *args, **kwargs)
 
 
-# Class for sending ssl encrypted email with ability to get current progress, , derived from emailbase class
+# Class for sending ssl encrypted email with ability to get current progress, derived from emailbase class
 class EmailSSL(EmailBase, smtplib.SMTP_SSL):
 
     def __init__(self, *args, **kwargs):
@@ -142,7 +142,7 @@ class TaskEmail(CalibreTask):
         message['To'] = self.recipient
         message['Subject'] = self.subject
         message['Date'] = formatdate(localtime=True)
-        message['Message-Id'] = "{}@{}".format(uuid.uuid4(), self.get_msgid_domain())
+        message['Message-ID'] = make_msgid(domain=self.get_msgid_domain())
         message.set_content(self.text.encode('UTF-8'), "text", "plain")
         if self.attachment:
             data = self._get_attachment(self.filepath, self.attachment)
@@ -169,10 +169,14 @@ class TaskEmail(CalibreTask):
             else:
                 self.send_gmail_email(msg)
         except MemoryError as e:
-            log.error_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=2)
             self._handleError('MemoryError sending e-mail: {}'.format(str(e)))
+        except (smtplib.SMTPRecipientsRefused) as e:
+            log.error_or_exception(e, stacklevel=2)
+            self._handleError('Smtplib Error sending e-mail: {}'.format(
+                (list(e.args[0].values())[0][1]).decode('utf-8)').replace("\n", '. ')))
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
-            log.error_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=2)
             if hasattr(e, "smtp_error"):
                 text = e.smtp_error.decode('utf-8').replace("\n", '. ')
             elif hasattr(e, "message"):
@@ -183,10 +187,10 @@ class TaskEmail(CalibreTask):
                 text = ''
             self._handleError('Smtplib Error sending e-mail: {}'.format(text))
         except (socket.error) as e:
-            log.error_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=2)
             self._handleError('Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
-            log.error_or_exception(ex, stacklevel=3)
+            log.error_or_exception(ex, stacklevel=2)
             self._handleError('Error sending e-mail: {}'.format(ex))
 
     def send_standard_email(self, msg):
@@ -269,7 +273,7 @@ class TaskEmail(CalibreTask):
                 if config.config_binariesdir and config.config_embed_metadata:
                     os.remove(datafile)
             except IOError as e:
-                log.error_or_exception(e, stacklevel=3)
+                log.error_or_exception(e, stacklevel=2)
                 log.error('The requested file could not be read. Maybe wrong permissions?')
                 return None
         return data

cps/tasks/metadata_backup.py

@@ -19,7 +19,7 @@
 import os
 from lxml import etree
 
-from cps import config, db, gdriveutils, logger
+from cps import config, db, gdriveutils, logger, app
 from cps.services.worker import CalibreTask
 from flask_babel import lazy_gettext as N_
 
@@ -34,7 +34,7 @@ class TaskBackupMetadata(CalibreTask):
                  task_message=N_('Backing up Metadata')):
         super(TaskBackupMetadata, self).__init__(task_message)
         self.log = logger.create()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+        # self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.export_language = export_language
         self.translated_title = translated_title
         self.set_dirty = set_dirty
@@ -46,47 +46,51 @@ class TaskBackupMetadata(CalibreTask):
             self.backup_metadata()
 
     def set_all_books_dirty(self):
-        try:
+        with app.app_context():
-            books = self.calibre_db.session.query(db.Books).all()
+            calibre_dbb = db.CalibreDB(app)
-            for book in books:
+            try:
-                self.calibre_db.set_metadata_dirty(book.id)
+                books = calibre_dbb.session.query(db.Books).all()
-            self.calibre_db.session.commit()
+                for book in books:
-            self._handleSuccess()
+                    calibre_dbb.set_metadata_dirty(book.id)
-        except Exception as ex:
+                calibre_dbb.session.commit()
-            self.log.debug('Error adding book for backup: ' + str(ex))
+                self._handleSuccess()
-            self._handleError('Error adding book for backup: ' + str(ex))
+            except Exception as ex:
-            self.calibre_db.session.rollback()
+                self.log.debug('Error adding book for backup: ' + str(ex))
-        self.calibre_db.session.close()
+                self._handleError('Error adding book for backup: ' + str(ex))
+                calibre_dbb.session.rollback()
+        # self.calibre_db.session.close()
 
     def backup_metadata(self):
-        try:
+        with app.app_context():
-            metadata_backup = self.calibre_db.session.query(db.Metadata_Dirtied).all()
+            try:
-            custom_columns = (self.calibre_db.session.query(db.CustomColumns)
+                calibre_dbb = db.CalibreDB(app)
-                              .filter(db.CustomColumns.mark_for_delete == 0)
+                metadata_backup = calibre_dbb.session.query(db.Metadata_Dirtied).all()
-                              .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions))
+                custom_columns = (calibre_dbb.session.query(db.CustomColumns)
-                              .order_by(db.CustomColumns.label).all())
+                                  .filter(db.CustomColumns.mark_for_delete == 0)
-            count = len(metadata_backup)
+                                  .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions))
-            i = 0
+                                  .order_by(db.CustomColumns.label).all())
-            for backup in metadata_backup:
+                count = len(metadata_backup)
-                book = self.calibre_db.session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
+                i = 0
-                self.calibre_db.session.query(db.Metadata_Dirtied).filter(
+                for backup in metadata_backup:
-                    db.Metadata_Dirtied.book == backup.book).delete()
+                    book = calibre_dbb.session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
-                self.calibre_db.session.commit()
+                    calibre_dbb.session.query(db.Metadata_Dirtied).filter(
-                if book:
+                        db.Metadata_Dirtied.book == backup.book).delete()
-                    self.open_metadata(book, custom_columns)
+                    calibre_dbb.session.commit()
-                else:
+                    if book:
-                    self.log.error("Book {} not found in database".format(backup.book))
+                        self.open_metadata(book, custom_columns)
-                i += 1
+                    else:
-                self.progress = (1.0 / count) * i
+                        self.log.error("Book {} not found in database".format(backup.book))
-            self._handleSuccess()
+                    i += 1
-            self.calibre_db.session.close()
+                    self.progress = (1.0 / count) * i
+                self._handleSuccess()
+                # self.calibre_db.session.close()
 
-        except Exception as ex:
+            except Exception as ex:
-            b = "NaN" if not hasattr(book, 'id') else book.id
+                b = "NaN" if not hasattr(book, 'id') else book.id
-            self.log.debug('Error creating metadata backup for book {}: '.format(b) + str(ex))
+                self.log.debug('Error creating metadata backup for book {}: '.format(b) + str(ex))
-            self._handleError('Error creating metadata backup: ' + str(ex))
+                self._handleError('Error creating metadata backup: ' + str(ex))
-            self.calibre_db.session.rollback()
+                calibre_dbb.session.rollback()
-            self.calibre_db.session.close()
+                # self.calibre_db.session.close()
 
     def open_metadata(self, book, custom_columns):
         # package = self.create_new_metadata_backup(book, custom_columns)

cps/tasks/thumbnail.py

@@ -23,10 +23,11 @@ from io import BytesIO
 from datetime import datetime, timezone
 
 from .. import constants
-from cps import config, db, fs, gdriveutils, logger, ub
+from cps import config, db, fs, gdriveutils, logger, ub, app
 from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
 from sqlalchemy import func, text, or_
 from flask_babel import lazy_gettext as N_
+
 try:
     from wand.image import Image
     use_IM = True
@@ -113,9 +114,10 @@ class TaskGenerateCoverThumbnails(CalibreTask):
     @staticmethod
     def get_books_with_covers(book_id=-1):
         filter_exp = (db.Books.id == book_id) if book_id != -1 else True
-        calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+        with app.app_context():
-        books_cover = calibre_db.session.query(db.Books).filter(db.Books.has_cover == 1).filter(filter_exp).all()
+            calibre_db = db.CalibreDB(app) #, expire_on_commit=False, init=True)
-        calibre_db.session.close()
+            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):
@@ -246,7 +248,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(expire_on_commit=False, init=True)
+        # self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -254,58 +256,60 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         ]
 
     def run(self, worker_thread):
-        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+        with app.app_context():
-            self.message = 'Scanning Series'
+            calibre_db = db.CalibreDB(app)
-            all_series = self.get_series_with_four_plus_books()
+            if calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
-            count = len(all_series)
+                self.message = 'Scanning Series'
+                all_series = self.get_series_with_four_plus_books(calibre_db)
+                count = len(all_series)
 
-            total_generated = 0
+                total_generated = 0
-            for i, series in enumerate(all_series):
+                for i, series in enumerate(all_series):
-                generated = 0
+                    generated = 0
-                series_thumbnails = self.get_series_thumbnails(series.id)
+                    series_thumbnails = self.get_series_thumbnails(series.id)
-                series_books = self.get_series_books(series.id)
+                    series_books = self.get_series_books(series.id, calibre_db)
 
-                # Generate new thumbnails for missing covers
+                    # Generate new thumbnails for missing covers
-                resolutions = list(map(lambda t: t.resolution, series_thumbnails))
+                    resolutions = list(map(lambda t: t.resolution, series_thumbnails))
-                missing_resolutions = list(set(self.resolutions).difference(resolutions))
+                    missing_resolutions = list(set(self.resolutions).difference(resolutions))
-                for resolution in missing_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):
                         generated += 1
-                        self.update_series_thumbnail(series_books, thumbnail)
+                        self.create_series_thumbnail(series, series_books, resolution)
 
-                    elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
+                    # Replace outdated or missing thumbnails
-                        generated += 1
+                    for thumbnail in series_thumbnails:
-                        self.update_series_thumbnail(series_books, thumbnail)
+                        if any(book.last_modified > thumbnail.generated_at for book in series_books):
+                            generated += 1
+                            self.update_series_thumbnail(series_books, thumbnail)
 
-                # Increment the progress
+                        elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
-                self.progress = (1.0 / count) * i
+                            generated += 1
+                            self.update_series_thumbnail(series_books, thumbnail)
 
-                if generated > 0:
+                    # Increment the progress
-                    total_generated += generated
+                    self.progress = (1.0 / count) * i
-                    self.message = N_('Generated {0} series thumbnails').format(total_generated)
 
-                # Check if job has been cancelled or ended
+                    if generated > 0:
-                if self.stat == STAT_CANCELLED:
+                        total_generated += generated
-                    self.log.info(f'GenerateSeriesThumbnails task has been cancelled.')
+                        self.message = N_('Generated {0} series thumbnails').format(total_generated)
-                    return
 
-                if self.stat == STAT_ENDED:
+                    # Check if job has been cancelled or ended
-                    self.log.info(f'GenerateSeriesThumbnails task has been ended.')
+                    if self.stat == STAT_CANCELLED:
-                    return
+                        self.log.info(f'GenerateSeriesThumbnails task has been cancelled.')
+                        return
 
-            if total_generated == 0:
+                    if self.stat == STAT_ENDED:
-                self.self_cleanup = True
+                        self.log.info(f'GenerateSeriesThumbnails task has been ended.')
+                        return
 
-        self._handleSuccess()
+                if total_generated == 0:
-        self.app_db_session.remove()
+                    self.self_cleanup = True
 
-    def get_series_with_four_plus_books(self):
+            self._handleSuccess()
-        return self.calibre_db.session \
+            self.app_db_session.remove()
+
+    def get_series_with_four_plus_books(self, calibre_db):
+        return calibre_db.session \
             .query(db.Series) \
             .join(db.books_series_link) \
             .join(db.Books) \
@@ -314,8 +318,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             .having(func.count('book_series_link') > 3) \
             .all()
 
-    def get_series_books(self, series_id):
+    def get_series_books(self, series_id, calibre_db):
-        return self.calibre_db.session \
+        return calibre_db.session \
             .query(db.Books) \
             .join(db.books_series_link) \
             .join(db.Series) \
@@ -461,13 +465,15 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     def run(self, worker_thread):
         if self.app_db_session:
-            if self.book_id == 0:  # delete superfluous thumbnails
+            # delete superfluous thumbnails
-                calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+            if self.book_id == 0:
-                thumbnails = (calibre_db.session.query(ub.Thumbnail)
+                with app.app_context():
-                              .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
+                    calibre_db = db.CalibreDB(app)
-                              .filter(db.Books.id==None)
+                    thumbnails = (calibre_db.session.query(ub.Thumbnail)
-                              .all())
+                                  .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
-                calibre_db.session.close()
+                                  .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:

cps/templates/basic_detail.html

@@ -0,0 +1,81 @@
+{% extends "basic_layout.html" %}
+
+{% block body %}
+<div>
+
+<h2 id="title">{{ entry.title }}</h2>
+<div>
+  {% for author in entry.ordered_authors %}
+    <p>{{ author.name.replace("|",",") }}</p>
+  {% endfor %}
+</div>
+
+<div class="cover">
+    <img title="{{ entry.title }}" src="{{ url_for('web.get_cover', book_id=entry.id, resolution='og', c=entry|last_modified) }}"/>
+</div>
+
+{% if current_user.role_download() %}
+  {% if entry.data|length %}
+    <div>
+      <h2>Download</h2>
+        {% for format in entry.data %}
+          <p>
+            <a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}">
+              {{ format.format }} ({{ format.uncompressed_size|filesizeformat }})</a>
+          </p>
+        {% endfor %}
+    </div>
+  {% endif %}
+{% endif %}
+
+<h2>Details</h2>
+
+{% if entry.series|length > 0 %}
+  <p>{{ _("Book %(index)s of %(range)s", index=entry.series_index|formatfloat(2), range=entry.series[0].name|e) }}</p>
+{% endif %}
+
+{% if entry.languages|length > 0 %}
+  <div>
+    <p>
+      <span>
+        {{_('Language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %}
+      </span>
+    </p>
+  </div>
+{% endif %}
+
+{% if entry.identifiers|length > 0 %}
+  <div>
+    <p>
+      <span></span>
+      {% for identifier in entry.identifiers %}
+          <p>{{ identifier.format_type() }}: {{ identifier|escape }}</p>
+      {% endfor %}
+    </p>
+  </div>
+{% endif %}
+
+{% if entry.publishers|length > 0 %}
+  <div>
+    <p>
+      <span>{{ _('Publisher') }}:
+        <span>{{ entry.publishers[0].name }}</span>
+      </span>
+    </p>
+  </div>
+{% endif %}
+
+{% if (entry.pubdate|string)[:10] != '0101-01-01' %}
+  <div>
+    <p>{{ _('Published') }}: {{ entry.pubdate|formatdate }} </p>
+  </div>
+{% endif %}
+
+{% if entry.comments|length > 0 and entry.comments[0].text|length > 0 %}
+    <div>
+        <h2 id="decription">{{ _('Description:') }}</h2>
+        {{ entry.comments[0].text|clean_string|safe }}
+    </div>
+{% endif %}
+</div>
+{% endblock %}

cps/templates/basic_index.html

@@ -0,0 +1,32 @@
+{% extends "basic_layout.html" %}
+{% block body %}
+
+<div class="pagination">
+  <div>
+    {% if pagination.has_prev %}
+      <a href="{{ (pagination.page - 1)|url_for_other_page }}">&laquo; {{_('Previous')}}</a>
+    {% endif %}
+  </div>
+  <div>
+    {% if pagination.has_next %}
+      <a href="{{ (pagination.page + 1)|url_for_other_page }}">{{_('Next')}} &raquo;</a>
+    {% endif %}
+  </div>
+</div>
+
+{% if entries|length < 1 %}
+  <p>{{_('No Results Found')}}</p>
+{% endif %}
+
+{% for entry in entries %}
+  {% if entry.Books.authors %}
+    {% set author = entry.Books.authors[0].name.replace('|',',')|shortentitle(30) %}
+  {% else %}
+    {% set author = '' %}
+  {% endif %}
+  <a href="{{ url_for('basic.show_book', book_id=entry.Books.id) }}">
+    <p class="listing" title="{{entry.Books.title}}">{{ author }} - {{entry.Books.title|shortentitle}}</p>
+  </a>
+{% endfor %}
+
+{% endblock %}

cps/templates/basic_layout.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="{{ current_user.locale }}">
+
+<head>
+<title>{{instance}} | {{title}}</title>
+<meta charset="utf-8">
+<meta name='viewport' content='initial-scale=1,maximum-scale=5,user-scalable=no' />
+<link href="{{ url_for('static', filename='css/basic.css') }}" rel="stylesheet" media="screen">
+</head>
+
+<body>
+  <div>
+    <div>
+      {% if current_user.is_authenticated or g.allow_anonymous %}
+        <nav>
+          <a href="{{url_for('basic.index')}}">
+            <span><h1>{{_('Home')}}</h1></span>
+          </a>
+          <div class="search">
+            <form role="search" action="{{url_for('basic.index')}}" method="GET">
+              <input type="text" id="query" name="query" placeholder="{{_('Search Library')}}" value="{{ searchterm }}">
+              <span>
+                <button type="submit" id="query_submit">{{_('Search')}}</button>
+              </span>
+            </form>
+          </div>
+          {% if not current_user.is_anonymous %}
+            <a href="{{url_for('web.logout')}}">
+              <span>{{_('Logout')}}</span>
+            </a>
+          {% endif %}
+        </nav>
+        <div class="theme">
+                  <a href="{{url_for('web.index')}}">
+            <span>{{_('Normal Theme')}}</span>
+          </a>
+        </div>
+      {% endif %}
+    </div>
+  </div>
+  <div class="body">
+    {% block body %}
+    {% endblock %}
+  </div>
+</body>
+
+</html>

cps/templates/book_edit.html

@@ -78,26 +78,6 @@
       <label for="bookAuthor">{{_('Author')}}</label>
       <input type="text" class="form-control typeahead" autocomplete="off" name="authors" id="authors" value="{{' & '.join(authors)}}">
     </div>
-
-    <div class="form-group">
-      <label for="comments">{{_('Description')}}</label>
-      <textarea class="form-control" name="comments" id="comments" rows="7">{% if book.comments %}{{book.comments[0].text}}{%endif%}</textarea>
-    </div>
-
-    <div class="form-group">
-      <label>{{_('Identifiers')}}</label>
-      <table class="table" id="identifier-table">
-	{% for identifier in book.identifiers %}
-	<tr>
-      <td><input type="text" class="form-control" name="identifier-type-{{identifier.type}}" value="{{identifier.type}}" required="required" placeholder="{{_('Identifier Type')}}"></td>
-	  <td><input type="text" class="form-control" name="identifier-val-{{identifier.type}}" value="{{identifier.val}}" required="required" placeholder="{{_('Identifier Value')}}"></td>
-	  <td><a class="btn btn-default" onclick="removeIdentifierLine(this)">{{_('Remove')}}</a></td>
-	</tr>
-	{% endfor %}
-      </table>
-      <a id="add-identifier-line" class="btn btn-default">{{_('Add Identifier')}}</a>
-    </div>
-
     <div class="form-group">
       <label for="tags">{{_('Tags')}}</label>
       <input type="text" class="form-control typeahead" autocomplete="off"  name="tags" id="tags" value="{% for tag in book.tags %}{{tag.name.strip()}}{% if not loop.last %}, {% endif %}{% endfor %}">
@@ -110,21 +90,6 @@
       <label for="series_index">{{_('Series ID')}}</label>
       <input type="number" step="0.01" min="0" placeholder="1" class="form-control" name="series_index" id="series_index" value="{{book.series_index|formatfloat(2)}}">
     </div>
-    <div class="form-group">
-      <label for="rating">{{_('Rating')}}</label>
-      <input type="number"  name="rating" id="rating" class="rating input-lg" data-clearable="" value="{% if book.ratings %}{{(book.ratings[0].rating / 2)|int}}{% endif %}">
-    </div>
-    {% if current_user.role_upload() and g.allow_upload %}
-    <div class="form-group">
-      <label for="cover_url">{{_('Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)')}}</label>
-      <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
-    </div>
-      <div class="form-group" aria-label="Upload cover from local drive">
-        <label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from Local Disk') }}</label>
-        <div class="upload-cover-input-text" id="upload-cover"></div>
-        <input id="btn-upload-cover" name="btn-upload-cover" type="file" accept=".jpg, .jpeg, .png, .webp">
-      </div>
-    {% endif %}
     <label for="pubdate">{{_('Published Date')}}</label>
     <div class="form-group input-group">
        <input type="text" class="datepicker form-control" name="pubdate" id="pubdate" value="{% if book.pubdate %}{{book.pubdate|formatdateinput}}{% endif %}">
@@ -141,6 +106,39 @@
       <label for="languages">{{_('Language')}}</label>
       <input type="text" class="form-control typeahead" autocomplete="off" name="languages" id="languages" value="{% for language in book.languages %}{{language.language_name.strip()}}{% if not loop.last %}, {% endif %}{% endfor %}">
     </div>
+    <div class="form-group">
+      <label for="rating">{{_('Rating')}}</label>
+      <input type="number"  name="rating" id="rating" class="rating input-lg" data-clearable="" value="{% if book.ratings %}{{(book.ratings[0].rating / 2)|int}}{% endif %}">
+    </div>
+      <div class="form-group">
+      <label for="comments">{{_('Description')}}</label>
+      <textarea class="form-control" name="comments" id="comments" rows="7">{% if book.comments %}{{book.comments[0].text}}{%endif%}</textarea>
+    </div>
+    <div class="form-group">
+      <label>{{_('Identifiers')}}</label>
+      <table class="table" id="identifier-table"><tbody>
+	{% for identifier in book.identifiers %}
+	<tr>
+      <td><input type="text" class="form-control" name="identifier-type-{{identifier.type}}" value="{{identifier.type}}" required="required" placeholder="{{_('Identifier Type')}}"></td>
+	  <td><input type="text" class="form-control" name="identifier-val-{{identifier.type}}" value="{{identifier.val}}" required="required" placeholder="{{_('Identifier Value')}}"></td>
+	  <td><a class="btn btn-default" onclick="removeIdentifierLine(this)">{{_('Remove')}}</a></td>
+	</tr>
+	{% endfor %}
+      </tbody>
+      </table>
+      <a id="add-identifier-line" class="btn btn-default">{{_('Add Identifier')}}</a>
+    </div>
+    {% if current_user.role_upload() and g.allow_upload %}
+    <div class="form-group">
+      <label for="cover_url">{{_('Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)')}}</label>
+      <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
+    </div>
+      <div class="form-group" aria-label="Upload cover from local drive">
+        <label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from Local Disk') }}</label>
+        <div class="upload-cover-input-text" id="upload-cover"></div>
+        <input id="btn-upload-cover" name="btn-upload-cover" type="file" accept=".jpg, .jpeg, .png, .webp">
+      </div>
+    {% endif %}
       {% if cc|length > 0 %}
         {% for c in cc %}
           <div class="form-group">

cps/templates/book_table.html

@@ -19,6 +19,25 @@
     {% if sort %}data-sortable="true" {% endif %}
     data-visible="{{visiblility.get(parameter)}}"
     data-formatter="bookCheckboxFormatter">
+    {% if parameter == "is_archived" %}
+      <div  class="form-check">
+        <div>
+            <input type="radio" class="check_head" data-set="True" data-val="{{ parameter }}" name="options_archive_selected_books" id="false_archive_selected_books" data-name="archive_books" disabled>{{_('Archive selected books')}}
+        </div>
+        <div>
+            <input type="radio" class="check_head" data-set="False" data-val="{{ parameter }}" name="options_unarchive_selected_books" id="true_archive_selected_books"  data-name="archive_books" disabled>{{_('Unarchive selected books')}}
+        </div>
+      </div>
+    {% elif parameter == "read_status" %}
+      <div  class="form-check">
+        <div>
+            <input type="radio" class="check_head" data-set="True" data-val="{{ parameter }}" name="options_read_selected_books" id="false_read_selected_books" data-name="read_books" disabled>{{_('Mark selected books as read')}}
+        </div>
+        <div>
+            <input type="radio" class="check_head" data-set="False" data-val="{{ parameter }}" name="options_unread_selected_books" id="true_read_selected_books" data-name="read_books" disabled>{{_('Mark selected books as unread')}}</div>
+        </div>
+      </div>
+    {% endif %}
     {{show_text}}
 </th>
 {%- endmacro %}
@@ -34,8 +53,15 @@
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
       <div class="col-xs-12 col-sm-6">
         <div class="row form-group">
-          <div class="btn btn-default disabled" id="merge_books" aria-disabled="true">{{_('Merge selected books')}}</div>
+          <div class="btn btn-default disabled" id="merge_books" aria-disabled="true">
-          <div class="btn btn-default disabled" id="delete_selection" aria-disabled="true">{{_('Remove Selections')}}</div>
+            {{_('Merge selected books')}}
+          </div>
+          <div class="btn btn-default disabled mass_selection" id="book_delete_selection" aria-disabled="true">
+            {{_('Clear selections')}}
+          </div>
+          <div class="btn btn-default disabled" id="edit_selected_books" aria-disabled="true">
+            {{_('Edit selected books')}}
+          </div>
         </div>
         <div class="row form-group">
             <div class="btn btn-default disabled" id="table_xchange" ><span class="glyphicon glyphicon-arrow-up"></span><span class="glyphicon glyphicon-arrow-down"></span>{{_('Exchange author and title')}}</div>
@@ -57,7 +83,7 @@
       <thead>
         <tr>
           {% if current_user.role_edit() %}
-            <th data-field="state" data-checkbox="true" data-sortable="true"></th>
+            <th data-field="state" data-checkbox="true" data-visible="true" data-sortable="true"></th>
           {% endif %}
             <th data-field="id" id="id" data-visible="false" data-switchable="false"></th>
             {{ text_table_row('title', _('Enter Title'),_('Title'), true, true) }}
@@ -97,14 +123,23 @@
               {% endif %}
             {% endfor %}
           {% if current_user.role_delete_books() and current_user.role_edit()%}
-            <th data-align="right" data-formatter="EbookActions" data-switchable="false">{{_('Delete')}}</th>
+            <th data-align="right" data-formatter="EbookActions" data-switchable="false">
+                <div><div class="btn btn-default button_head disabled" aria-disabled="true">
+                    {{_('Delete selected books')}}
+                </div></div>
+                <br>
+                {{_('Delete')}}
+            </th>
           {% endif %}
         </tr>
       </thead>
     </table>
+
 {% endblock %}
 {% block modal %}
 {{ delete_book(current_user.role_delete_books()) }}
+{{ delete_confirm_modal() }}
+{{ change_confirm_modal() }}
 {% if current_user.role_edit() %}
 <div class="modal fade" id="mergeModal" role="dialog" aria-labelledby="metaMergeLabel">
   <div class="modal-dialog">
@@ -123,15 +158,170 @@
             <div class="text-left" id="merge_to"></div>
         </div>
       <div class="modal-footer">
-        <input id="merge_confirm"  type="button" class="btn btn-danger" value="{{_('Merge')}}" name="merge_confirm" id="merge_confirm" data-dismiss="modal">
+        <input id="merge_confirm" type="button" class="btn btn-danger" value="{{_('Merge')}}" name="merge_confirm" data-dismiss="modal">
         <button id="merge_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
 </div>
-{% endif %}
 
+<!--div class="modal fade" id="delete_selected_modal" role="dialog" aria-labelledby="metaDeleteSelectedLabel">
+  <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">
+        <p></p>
+            <div class="text-left">{{_('The following books will be deleted:')}}</div>
+        <p></p>
+            <div class="text-left" id="display-delete-selected-books"></div>
+      <div class="modal-footer">
+        <input id="delete_selected_confirm" type="button" class="btn btn-danger" value="{{_('Delete')}}" name="delete_selected_confirm" data-dismiss="modal">
+        <button id="delete_selected_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+      </div>
+    </div>
+  </div>
+</div-->
+
+<div class="modal fade" id="archive_selected_modal" role="dialog" aria-labelledby="metaArchiveSelectedLabel">
+  <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">
+        <p></p>
+            <div class="text-left">{{_('The following books will be archived:')}}</div>
+        <p></p>
+            <div class="text-left" id="display-archive-selected-books"></div>
+      <div class="modal-footer">
+        <input id="archive_selected_confirm" type="button" class="btn btn-danger" value="{{_('Archive')}}" name="archive_selected_confirm" data-dismiss="modal">
+        <button id="archive_selected_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="unarchive_selected_modal" role="dialog" aria-labelledby="metaUnArchiveSelectedLabel">
+  <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">
+        <p></p>
+            <div class="text-left">{{_('The following books will be unarchived:')}}</div>
+        <p></p>
+            <div class="text-left" id="display-unarchive-selected-books"></div>
+      <div class="modal-footer">
+        <input id="unarchive_selected_confirm" type="button" class="btn btn-danger" value="{{_('Unarchive')}}" name="unarchive_selected_confirm" data-dismiss="modal">
+        <button id="unarchive_selected_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="read_selected_modal" role="dialog" aria-labelledby="metaReadSelectedLabel">
+  <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">
+        <p></p>
+            <div class="text-left">{{_('The following books will be marked read:')}}</div>
+        <p></p>
+            <div class="text-left" id="display-read-selected-books"></div>
+      <div class="modal-footer">
+        <input id="read_selected_confirm" type="button" class="btn btn-danger" value="{{_('Mark as read')}}" name="read_selected_confirm" data-dismiss="modal">
+        <button id="read_selected_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="unread_selected_modal" role="dialog" aria-labelledby="metaReadSelectedLabel">
+  <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">
+        <p></p>
+            <div class="text-left">{{_('The following books will be marked unread:')}}</div>
+        <p></p>
+            <div class="text-left" id="display-unread-selected-books"></div>
+      <div class="modal-footer">
+        <input id="unread_selected_confirm" type="button" class="btn btn-danger" value="{{_('Mark as unread')}}" name="unread_selected_confirm" data-dismiss="modal">
+        <button id="read_selected_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="edit_selected_modal" role="dialog" aria-labelledby="metaEditSelectedLabel">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-info text-center">
+          <span>{{_('Edit Metadata')}}</span>
+      </div>
+      <div class="modal-body">
+        <div class="text-left">{{_('Edit the fields you want changed. Blank fields will be ignored:')}}</div>
+            <br>
+            Title:
+            <input class="form-control" id="title_input">
+            <p></p>
+
+            Title Sort:
+            <input class="form-control" id="title_sort_input">
+            <p></p>
+
+            Author Sort:
+            <input class="form-control" id="author_sort_input">
+            <p></p>
+
+            Authors:
+            <input class="form-control" id="authors_input">
+            <p></p>
+
+            Categories:
+            <input class="form-control" id="categories_input">
+            <p></p>
+
+            Series:
+            <input class="form-control" id="series_input">
+            <p></p>
+
+            Languages:
+            <input class="form-control" id="languages_input">
+            <p></p>
+
+            Publishers:
+            <input class="form-control" id="publishers_input">
+            <p></p>
+
+            Comments:
+            <input class="form-control" id="comments_input">
+            <p></p>
+      </div>
+
+      <div class="modal-footer">
+        <input id="edit_selected_confirm" type="button" class="btn btn-danger" value="{{_('Edit')}}" name="edit_selected_confirm" id="edit_selected_confirm" data-dismiss="modal">
+        <button id="edit_selected_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+      </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/libs/bootstrap-table/bootstrap-table-locale-all.min.js') }}"></script>

cps/templates/config_db.html

@@ -62,7 +62,7 @@
       {% endif %}
     {% endif %}
     <div class="col-sm-12">
-      <div id="db_submit" name="submit" class="btn btn-default">{{_('Save')}}</div>
+      <button id="db_submit" type="submit" class="btn btn-default">{{_('Save')}}</button>
       <a href="{{ url_for('admin.admin') }}" id="config_back" class="btn btn-default">{{_('Cancel')}}</a>
     </div>
   </form>

cps/templates/config_edit.html

@@ -163,6 +163,10 @@
       </div>
     </div>
     {% endif %}
+    <div class="form-group">
+      <label for="config_googlebooks_api_key">{{_('Google Books API Key')}}</label>
+      <input type="text" class="form-control" id="config_googlebooks_api_key" name="config_googlebooks_api_key" value="{% if config.config_googlebooks_api_key != '' %}{{ config.config_googlebooks_api_key }}{% endif %}" autocomplete="off">
+    </div>
     <div class="form-group">
       <input type="checkbox" id="config_allow_reverse_proxy_header_login" name="config_allow_reverse_proxy_header_login" data-control="reverse-proxy-login-settings" {% if config.config_allow_reverse_proxy_header_login %}checked{% endif %}>
       <label for="config_allow_reverse_proxy_header_login">{{_('Allow Reverse Proxy Authentication')}}</label>
@@ -411,7 +415,7 @@
               </div>
               <div class="form-group" style="margin-left:10px;">
                 <input type="checkbox" id="config_password_character" name="config_password_character"  {% if config.config_password_character %}checked{% endif %}>
-                <label for="config_password_lower">{{_('Enforce characters (needed For Chinese/Japanese/Korean Characters)')}}</label>
+                <label for="config_password_character">{{_('Enforce characters (needed For Chinese/Japanese/Korean Characters)')}}</label>
               </div>
               <div class="form-group" style="margin-left:10px;">
                 <input type="checkbox" id="config_password_special" name="config_password_special"  {% if config.config_password_special %}checked{% endif %}>

cps/templates/detail.html

@@ -1,4 +1,12 @@
 {% extends is_xhr|yesno("fragment.html", "layout.html") %}
+{% block header %}
+    <meta property="og:type" content="book" />
+    <meta property="og:title" content="{{ entry.title|truncate(35) }}" />
+    {% if entry.comments|length > 0 and entry.comments[0].text|length > 0 %}
+      <meta property="og:description" content="{{ entry.comments[0].text|striptags|truncate(65) }}" />
+      <meta property="og:image" content="{{url_for('web.get_cover', book_id=entry.id, resolution='og', c=entry|last_modified)}}" />
+    {% endif %}
+{% endblock %}
 {% block body %}
 <div class="single">
     <div class="row">
@@ -224,7 +232,7 @@
                                         {% elif c.datatype == 'datetime' %}
                                             {{ column.value|formatdate }}
                                         {% elif c.datatype == 'comments' %}
-                                            {{ column.value|safe }}
+                                            {{ column.value|clean_string|safe }}
                                         {% elif c.datatype == 'series' %}
                                             {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
                                         {% elif c.datatype == 'text' %}
@@ -276,7 +284,7 @@
             {% if entry.comments|length > 0 and entry.comments[0].text|length > 0 %}
                 <div class="comments">
                     <h3 id="decription">{{ _('Description:') }}</h3>
-                    {{ entry.comments[0].text|safe }}
+                    {{ entry.comments[0].text|clean_string|safe }}
                 </div>
             {% endif %}
 
@@ -286,7 +294,7 @@
                 {% if current_user.is_authenticated %}
                     {% if current_user.shelf.all() or g.shelves_access %}
                         <div id="shelf-actions" class="btn-toolbar" role="toolbar">
-                            <div class="btn-group" role="group" aria-label="Add to shelves">
+                            <div class="btn-group dropup" role="group" aria-label="Add to shelves">
                                 <button id="add-to-shelf" type="button"
                                         class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown"
                                         aria-haspopup="true" aria-expanded="false">

cps/templates/feed.xml

@@ -63,14 +63,64 @@
               term="{{tag.name}}"
               label="{{tag.name}}"/>
     {% endfor %}
-    {% if entry.Books.comments[0] %}<summary>{{entry.Books.comments[0].text|striptags}}</summary>{% endif %}
+    <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml">
+    {% if entry.Books.ratings.__len__() > 0 %}
+      RATING: {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}★{% endfor %}<br/>
+    {% endif %}
+    {% if entry.Books.tags|length > 0 %}
+    TAGS: {% for tag in entry.Books.tags %}{{tag.name}}{{ ", " if not loop.last else "" }}{% endfor %}<br/>
+    {% endif %}
+    {% if entry.Books.series.__len__() > 0 %}
+    SERIES: {{entry.Books.series[0].name}} [{{entry.Books.series_index|formatfloat(2)}}]<br/>
+    {% endif %}
+
+    {% if cc|length > 0 %}
+        {% for c in cc %}
+            {% if entry.Books['custom_column_' ~ c.id]|length > 0 %}
+                {{ c.name }}:
+                {% for column in entry.Books['custom_column_' ~ c.id] %}
+                    {% if c.datatype == 'rating' %}
+                        {{ (column.value / 2)|formatfloat }}
+                    {% else %}
+                        {% if c.datatype == 'bool' %}
+                            {% if column.value == true %}
+                                ✓
+                            {% else %}
+                                ✕
+                            {% endif %}
+                        {% else %}
+                            {% if c.datatype == 'float' %}
+                                {{ column.value|formatfloat(2) }}
+                            {% elif c.datatype == 'datetime' %}
+                                {{ column.value|formatdate }}
+                            {% elif c.datatype == 'comments' %}
+                                {{ column.value|clean_string|safe }}
+                            {% elif c.datatype == 'series' %}
+                                {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
+                            {% elif c.datatype == 'text' %}
+                                {{ column.value.strip() }}{% if not loop.last %}, {% endif %}
+                            {% else %}
+                                {{ column.value }}
+                            {% endif %}
+                        {% endif %}
+                    {% endif %}
+                {% endfor %}
+                <br/>
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+
+    {% if entry.Books.comments[0] %}
+        <p>{{entry.Books.comments[0].text}}</p>
+    {% endif %}
+    </div></content>
     {% if entry.Books.has_cover %}
     <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.Books.id)}}" rel="http://opds-spec.org/image"/>
     <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.Books.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
     {% endif %}
     {% for format in entry.Books.data %}
     <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.Books.id, book_format=format.format|lower)}}"
-          length="{{format.uncompressed_size}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
+          length="{{format.uncompressed_size}}" title="{{format.format}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
     {% endfor %}
   </entry>
   {% endfor %}

cps/templates/http_error.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
       <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}    
@@ -48,7 +48,11 @@
     <div class="row">
       <div class="col errorlink">
       {% if not unconfigured %}
-        <a href="{{url_for('web.index')}}" title="{{ _('Return to Home') }}">{{_('Return to Home')}}</a>
+        {% if goto_admin %}
+           <a href="{{url_for('admin.db_configuration')}}" title="{{ _('Return to Database config') }}">{{_('Return to Database config')}}</a>
+        {%  else %}
+           <a href="{{url_for('web.index')}}" title="{{ _('Return to Home') }}">{{_('Return to Home')}}</a>
+        {% endif %}
       {% else %}
         <a href="{{url_for('web.logout')}}" title="{{ _('Logout User') }}">{{ _('Logout User') }}</a>
       {% endif %}

cps/templates/image.html

@@ -6,6 +6,7 @@
         srcset="{{ srcset }}"
         src="{{ url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified) }}"
         alt="{{ image_alt }}"
+        loading="lazy"
     />
 {%- endmacro %}
 
@@ -16,5 +17,6 @@
         srcset="{{ srcset }}"
         src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='day'|cache_timestamp) }}"
         alt="{{ title }}"
+        loading="lazy"
     />
 {%- endmacro %}

cps/templates/layout.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
       <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}
@@ -37,7 +37,7 @@
           <a class="navbar-brand" href="{{url_for('web.index')}}">{{instance}}</a>
         </div>
         {% if g.current_theme == 1 %}
-            <div class="home-btn"><a class="home-btn-tooltip" href="{{url_for("web.index",page=1)}}" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
+            <div class="home-btn"><a class="home-btn-tooltip" href="{{url_for("web.index", page=1)}}" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
             <div class="plexBack"><a href="{{url_for('web.index')}}"></a></div>
         {% endif %}
         {% if current_user.is_authenticated or g.allow_anonymous %}
@@ -55,6 +55,7 @@
           {% if current_user.is_authenticated or g.allow_anonymous %}
           <ul class="nav navbar-nav ">
             <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>
+            {% if simple==true %} <li><a href="{{url_for('basic.index')}}" id="basic"><span class="glyphicon glyphicon-phone"></span><span>{{_('Simple Theme')}}</span></a><li>{% endif %}
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
@@ -146,13 +147,13 @@
               <li class="nav-head hidden-xs">{{_('Browse')}}</li>
               {% for element in sidebar %}
                 {% if current_user.check_visibility(element['visibility']) and element['public'] %}
-                    <li id="nav_{{element['id']}}" {% if page == element['page'] %}class="active"{% endif %}><a href="{{url_for(element['link'], data=element['page'], sort_param='stored')}}"><span class="glyphicon {{element['glyph']}}"></span> {{_(element['text'])}}</a></li>
+                    <li id="nav_{{element['id']}}" {% if page == element['page'] %}class="active"{% endif %}><a href="{% if element['no_param'] %}{{url_for(element['link'], data=element['page'])}}{%else%}{{url_for(element['link'], data=element['page'], sort_param='stored')}}{% endif %}"><span class="glyphicon {{element['glyph']}}"></span> {{_(element['text'])}}</a></li>
                 {% endif %}
               {% endfor %}
               {% if current_user.is_authenticated or g.allow_anonymous %}
                 <li class="nav-head hidden-xs public-shelves">{{_('Shelves')}}</li>
                 {% for shelf in g.shelves_access %}
-                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list shelf"></span> {{shelf.name|shortentitle(40)}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
+                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list shelf"></span> {{shelf.name|shortentitle(40)}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %} <span class="badge badge-sm">{{shelf.books.all()|length}}</span></a></li>
                 {% endfor %}
               {% if not current_user.is_anonymous %}
                 <li id="nav_createshelf" class="create-shelf"><a href="{{url_for('shelf.create_shelf')}}">{{_('Create a Shelf')}}</a></li>
@@ -169,8 +170,7 @@
           {% if pagination and (pagination.has_next or pagination.has_prev) %}
             <div class="pagination">
               {% if pagination.has_prev %}
-              <li class="page-item page-previous"><a class="page-link" aria-label="next page" href="{{ (pagination.page - 1)|url_for_other_page
+              <li class="page-item page-previous"><a class="page-link" aria-label="next page" href="{{ (pagination.page - 1)|url_for_other_page }}">&laquo; {{_('Previous')}}</a></li>
-                }}">&laquo; {{_('Previous')}}</a></li>
               {% endif %}
             {% for page in pagination.iter_pages() %}
               {% if page %}
@@ -184,8 +184,7 @@
               {% endif %}
             {% endfor %}
             {% if pagination.has_next %}
-              <li class="page-item page-next"><a class="page-link next" aria-label="next page" href="{{ (pagination.page + 1)|url_for_other_page
+              <li class="page-item page-next"><a class="page-link next" aria-label="next page" href="{{ (pagination.page + 1)|url_for_other_page }}">{{_('Next')}} &raquo;</a></li>
-                }}">{{_('Next')}} &raquo;</a></li>
             {% endif %}
             </div>
           {% endif %}

cps/templates/list.html

@@ -22,7 +22,7 @@
       <button class="update-view btn btn-primary" data-target="series_view" id="grid-button" data-view="grid">{{_('Grid')}}</button>
       {% endif %}
     </div>
-  <div class="container">
+  <div class="container1">
     <div id="list" class="col-xs-12 col-sm-6">
     {% for entry in entries %}
       {% if loop.index0 == (loop.length/2+loop.length%2)|int and loop.length > 20 %}

cps/templates/listenmp3.html

@@ -7,7 +7,7 @@
   <title>{{ entry.title }}</title>
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width">
-  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="mobile-web-app-capable" content="yes">
   {% if g.google_site_verification|length > 0 %}
     <meta name="google-site-verification" content="{{g.google_site_verification}}">
   {% endif %}  
@@ -134,7 +134,7 @@
                 {% elif c.datatype == 'datetime' %}
                   {{ column.value|formatdate }}
                 {% elif c.datatype == 'comments' %}
-                  {{column.value|safe}}
+                  {{column.value|clean_string|safe}}
                 {% elif c.datatype == 'series' %}
                   {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
                 {% elif c.datatype == 'text' %}
@@ -175,7 +175,7 @@
       {% if entry.comments|length > 0 and entry.comments[0].text|length > 0%}
         <div class="comments">
             <h3 id="decription">{{_('Description:')}}</h3>
-            {{entry.comments[0].text|safe}}
+            {{entry.comments[0].text|clean_string|safe}}
         </div>
       {% endif %}
 

cps/templates/modal_dialogs.html

@@ -48,8 +48,7 @@
         <div class="modal-body text-center">
           <p>
           <span class="hidden" id="book_format">{{_('This book format will be permanently erased from database')}}</span>
-          <span class="hidden" id="book_complete">{{_('This book will be permanently erased from database')}}</span>
+          <span class="hidden" id="book_complete">{{_('This book will be permanently erased from database and hard disk')}}</span>
-          <span>{{_('and hard disk')}}</span>
 		  </p>
           {% if config.config_kobo_sync %}
           <p>

cps/templates/read.html

@@ -7,7 +7,7 @@
     <title>{{_('epub Reader')}} | {{title}}</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, user-scalable=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
     <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}
@@ -29,6 +29,7 @@
             <!--a id="show-Search" class="show_view icon-search" data-view="Search">Search</a-->
             <a id="show-Toc" class="show_view icon-list-1 active" data-view="Toc">TOC</a>
             <a id="show-Bookmarks" class="show_view icon-bookmark" data-view="Bookmarks">Bookmarks</a>
+            <a id="back-button" data-view="Back to Books" href="{{ url_for('web.index') }}">Books</a>            
             <!--a id="show-Notes" class="show_view icon-edit" data-view="Notes">Notes</a-->
 
         </div>
@@ -49,7 +50,6 @@
         </div-->
     </div>
     <div id="main">
-
         <div id="titlebar">
             <div id="opener">
                 <a id="slider" class="icon-menu">Menu</a>
@@ -70,37 +70,58 @@
 	    <div id="prev" class="arrow">‹</div>
 	    <div id="viewer"></div>
 	    <div id="next" class="arrow">›</div>
-	    <div id="progress">0%</div>
+        <div class="read-footer">
-	    <div id="loader"><img src="{{ url_for('static', filename='img/loader.gif') }}"></div>
+            <div id="pages-count"></div>
-	</div>
+            <div id="progress">0%</div>
+        </div>
+        <div id="loader">
+            <img src="{{ url_for('static', filename='img/loader.gif') }}">
+        </div>
+    </div>
     <div class="modal md-effect-1" id="settings-modal">
         <div class="md-content">
             <h3>{{_('Settings')}}</h3>
             <div class="form-group themes" id="themes">
-                Choose a theme below: <br />
+                {{_('Choose a theme below:')}}<br />
 
-                <!-- Hardcoded a tick in the light theme button because it is the "default" theme. Need to find a way to do this dynamically on startup-->
+          <!-- Hardcoded a tick in the light theme button because it is the "default" theme. Need to find a way to do this dynamically on startup-->
                 <button type="button" id="lightTheme" class="lightTheme" onclick="selectTheme(this.id)"><span
                         id="lightSelected">✓</span>{{_('Light')}}</button>
                 <button type="button" id="darkTheme" class="darkTheme" onclick="selectTheme(this.id)"><span
                         id="darkSelected"> </span>{{_('Dark')}}</button>
                 <button type="button" id="sepiaTheme" class="sepiaTheme" onclick="selectTheme(this.id)"><span
                         id="sepiaSelected"> </span>{{_('Sepia')}}</button>
+                <button type="button" id="amberTheme" class="amberTheme" onclick="selectTheme(this.id)"><span
+                        id="amberSelected"> </span>{{_('Amber')}}</button>
                 <button type="button" id="blackTheme" class="blackTheme" onclick="selectTheme(this.id)"><span
                         id="blackSelected"> </span>{{_('Black')}}</button>
-            </div>
+
+          <!-- Custom theme: color input + pickr -->
+          <div id="customThemeWrapper" style="display: inline-flex; align-items: center;gap: 8px;margin: 5px 8px;">Custom:
+            <!-- Picker-only UI: swatch acts as the picker button, and a small span shows selection tick -->
+            <div id="customThemeSwatch" title="Pick color" style="width: 30px; height: 30px; border: 1px solid #ccc; border-radius: 3px;cursor: pointer;"></div>
+            <span id="customSelected"> </span>
+          </div>
+        </div>
             <div class="form-group">
                 <p>
                     <input type="checkbox" id="sidebarReflow"
                         name="sidebarReflow">{{_('Reflow text when sidebars are open.')}}
                 </p>
             </div>
-            <div class="form-group fontSizeWrapper">
+        <div class="form-group">
-                <div class="slider">
+          <p>
-                    <label for="fader">{{ _('Font Sizes') }}</label>
+            <input type="checkbox" id="showPagesCount" name="showPagesCount"/>{{_('Show pages count')}}
-                    <input type="range" min="75" max="200" value="100" id="fontSizeFader" step="25">
+          </p>
-                </div>            
+        </div>
-            </div>
+        <div class="form-group fontSizeWrapper">
+          <label>{{ _('Font Size') }}</label>
+          <div class="font-size-controls" style="display: flex;align-items: center;gap: 10px;margin-top: 2px;">
+          <button type="button" id="fontSizeDecrease" style="padding: 8px 15px; font-size: 18px; cursor: pointer">−</button>
+            <span id="fontSizeDisplay" style="min-width: 60px;text-align: center;font-size: 14px;font-weight: bold;">100%</span>
+            <button type="button" id="fontSizeIncrease" style="padding: 8px 15px; font-size: 18px; cursor: pointer">+</button>
+          </div>
+        </div>
               <div class="font" id="font">
                 <label class="item">{{_('Font')}}:</label>
                 <button type="button" id="default" onclick="selectFont(this.id)"><span>✓</span>{{_('Default')}}</button> 
@@ -119,19 +140,26 @@
     </div>
     <div class="overlay"></div>
     <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/compress/jszip_epub.min.js') }}">
+    <script src="{{ url_for('static', filename='js/compress/jszip_epub.min.js') }}"></script>
-    </script>
     <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
     <script type="text/javascript">
         window.calibre = {
             filePath: "{{ url_for('static', filename='js/libs/') }}",
             cssPath: "{{ url_for('static', filename='css/') }}",
-            bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format='EPUB') }}",
+            bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format=book_format) }}",
-            bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format='epub', anyname='file.epub') }}",
+            bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format=book_format, anyname='file.epub') }}",
             bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
             useBookmarks: "{{ current_user.is_authenticated | tojson }}"
         };
 
+      // load custom theme color from localStorage (if any)
+      var _savedCustomThemeColor = null;
+      try {
+        _savedCustomThemeColor = localStorage.getItem(
+          "calibre.reader.customTheme"
+        );
+      } catch (e) {}
+
         window.themes = {
             "darkTheme": {
                 "bgColor": "#202124",
@@ -148,6 +176,11 @@
                 "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}",
                 "title-color": "#4f4f4f"
             },
+            "amberTheme": {
+                "bgColor": "#e8bf5e",
+                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}",
+                "title-color": "#2f2f2f"
+            },            
             "blackTheme": {
                 "bgColor": "black",
                 "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}",
@@ -157,51 +190,112 @@
 
         function selectTheme (id) {
             let tickSpans = document.getElementById("themes").querySelectorAll("span");
-
-            // Remove tick mark from all theme buttons
             tickSpans.forEach(function (tickSpan) {
-                document.getElementById(tickSpan.id).textContent = "";
+               try {
+                   tickSpan.textContent = "";
+               } catch (e) {}
             });
 
-            // Add tick mark to the button corresponding to the currently selected theme
+            // If the theme button exists, set its inner span to a tick. Otherwise set any span with the matching id.
-            document.getElementById(id).querySelector("span").textContent = "✓";
+            let el = document.getElementById(id);
+            if (el) {
+                let sp = el.querySelector("span");
+                if (sp) sp.textContent = "✓";
+            } else {
+                let spById = document.getElementById(id + "Selected") || document.getElementById("customSelected");
+                if (spById) spById.textContent = "✓";
+            }
 
             // Saving theme to local storage
             localStorage.setItem("calibre.reader.theme", id);
 
-            // Apply theme to epubjs iframe
+            // If selecting custom theme, ensure epubjs theme is registered with chosen bg color
-            reader.rendition.themes.select(id);
+            if (id === "customTheme") {
+                let customColor = window.themes.customTheme.bgColor || "#ffffff";
+                try {
+                    if (reader && reader.rendition && reader.rendition.themes) {
+                        reader.rendition.themes.register("customTheme", {
+                            body: {
+                               background: customColor,
+                            },
+                        });
+                        reader.rendition.themes.select("customTheme");
+                    }
+                 } catch (e) {
+                     console.error("Failed to register/select customTheme", e);
+                 }
+             } else {
+                // Apply theme to epubjs iframe
+                try {
+                    reader.rendition.themes.select(id);
+                } catch (e) {}
+             }
 
             // Apply theme to rest of the page.
             document.getElementById("main").style.backgroundColor = themes[id]["bgColor"];
             document.getElementById("titlebar").style.color = themes[id]["title-color"] || "#fff";
+            document.getElementById("progress").style.color = themes[id]["title-color"] || "#fff";
         }
 
         // font size settings logic
-        let fontSizeFader = document.getElementById('fontSizeFader');
+        let currentFontSize = 100; // default 100%
-        fontSizeFader.addEventListener("change", function () {
+        const minFontSize = 50;
-            reader.rendition.themes.fontSize(`${this.value}%`);
+        const maxFontSize = 300;
+        const stepSize = 5;
+
+        const fontSizeDisplay = document.getElementById("fontSizeDisplay");
+        const fontSizeDecrease = document.getElementById("fontSizeDecrease");
+        const fontSizeIncrease = document.getElementById("fontSizeIncrease");
+
+        function updateFontSize(newSize) {
+            if (newSize < minFontSize) newSize = minFontSize;
+            if (newSize > maxFontSize) newSize = maxFontSize;
+
+            currentFontSize = newSize;
+            fontSizeDisplay.textContent = newSize + "%";
+            localStorage.setItem("calibre.reader.fontSize", newSize);
+            if (reader && reader.rendition) {
+                reader.rendition.themes.fontSize(`${newSize}%`);
+            }
+        }
+
+        // Restore saved font size on load
+        const savedFontSize = localStorage.getItem("calibre.reader.fontSize");
+        if (savedFontSize) {
+            currentFontSize = parseInt(savedFontSize);
+            fontSizeDisplay.textContent = savedFontSize + "%";
+        }
+
+        fontSizeDecrease.addEventListener("click", function () {
+            updateFontSize(currentFontSize - stepSize);
+        });
+
+        fontSizeIncrease.addEventListener("click", function () {
+            updateFontSize(currentFontSize + stepSize);
         });
 
         let defaultFont;
 
-        function selectFont(id) {
+      window.selectFont = function (id) {
           if (!defaultFont) {
             defaultFont = reader.rendition.getContents()[0]?.css('font-family');
           }
 
           spans = document.getElementById("font").querySelectorAll("span");
           for(var i = 0; i < spans.length; i++) {
-            spans[i].textContent = "";
+              spans[i].textContent = "";
           }
           document.getElementById(id).querySelector("span").textContent = "✓";
 
-          if (id == 'default') {
+          // Save font selection to localStorage
-            reader.rendition.themes.font(defaultFont);
+          localStorage.setItem("calibre.reader.font", id);
-            return;
+
+          if (id == "default") {
+              reader.rendition.themes.font(defaultFont);
+              return;
           }
           reader.rendition.themes.font(id);
-        }
+      };
 
         function spread(id) {
           spans = document.getElementById("layout").querySelectorAll("span");
@@ -209,12 +303,193 @@
             spans[i].textContent = "";
           }
           document.getElementById(id).querySelector("span").textContent = "✓";
-          reader.rendition.spread(id==='spread'?true:'none');
+          reader.rendition.spread(id==="spread" ? true : "none");
         }
+
+        // Pages counter visibility setting
+        (function () {
+            var checkbox = document.getElementById("showPagesCount");
+            var pagesEl = document.getElementById("pages-count");
+            var key = "calibre.reader.showPages";
+            var saved = localStorage.getItem(key);
+            var show = saved === null ? true : saved === "true";
+            if (checkbox) checkbox.checked = show;
+            if (pagesEl) pagesEl.style.display = show ? "" : "none";
+            if (checkbox) {
+                checkbox.addEventListener("change", function () {
+                    var val = checkbox.checked;
+                    localStorage.setItem(key, String(val));
+                    var target = document.getElementById("pages-count");
+                    if (target) target.style.visibility = val ? "visible" : "hidden";
+                });
+            }
+        })();
+    </script>
+    <script type="text/javascript">
+      // Initialize custom theme UI and Pickr once Pickr is available
+      (function () {
+        var swatch = document.getElementById("customThemeSwatch");
+        var saved =
+          window.themes &&
+          window.themes.customTheme &&
+          window.themes.customTheme.bgColor
+            ? window.themes.customTheme.bgColor
+            : "#ffffff";
+        if (swatch) swatch.style.background = saved;
+
+        function _hexToRgb(hex) {
+          hex = hex.replace("#", "");
+          if (hex.length === 3) {
+            hex = hex
+              .split("")
+              .map(function (h) {
+                return h + h;
+              })
+              .join("");
+          }
+          var bigint = parseInt(hex, 16);
+          return {
+            r: (bigint >> 16) & 255,
+            g: (bigint >> 8) & 255,
+            b: bigint & 255,
+          };
+        }
+
+        // Better contrast decision using WCAG relative luminance and contrast ratio
+        // Returns true if black text is the better choice (i.e. background is light)
+        function _isLight(hex) {
+          try {
+            var rgb = _hexToRgb(hex);
+            // convert 0-255 to 0-1
+            var srgb = { r: rgb.r / 255, g: rgb.g / 255, b: rgb.b / 255 };
+            function lin(c) {
+              return c <= 0.03928
+                ? c / 12.92
+                : Math.pow((c + 0.055) / 1.055, 2.4);
+            }
+            var R = lin(srgb.r),
+              G = lin(srgb.g),
+              B = lin(srgb.b);
+            var L = 0.2126 * R + 0.7152 * G + 0.0722 * B; // relative luminance
+
+            // contrast ratios against black (L=0) and white (L=1)
+            var contrastWithBlack = (L + 0.05) / (0.0 + 0.05);
+            var contrastWithWhite = (1.0 + 0.05) / (L + 0.05);
+
+            // pick the text color that gives higher contrast. If black gives >= contrast, treat bg as light
+            return contrastWithBlack >= contrastWithWhite;
+          } catch (e) {
+            return true;
+          }
+        }
+
+        function applyCustomColor(hex) {
+          if (!hex) return;
+          if (hex[0] !== "#") hex = "#" + hex;
+          window.themes.customTheme.bgColor = hex;
+          try {
+            localStorage.setItem("calibre.reader.customTheme", hex);
+          } catch (e) {}
+          if (swatch) swatch.style.background = hex;
+
+          // Mark theme as selected
+          try {
+            localStorage.setItem("calibre.reader.theme", "customTheme");
+          } catch (e) {}
+          // Clear ticks and set custom tick
+          var tickSpans = document
+            .getElementById("themes")
+            .querySelectorAll("span");
+          tickSpans.forEach(function (ts) {
+            ts.textContent = "";
+          });
+          var customTick = document.getElementById("customSelected");
+          if (customTick) customTick.textContent = "✓";
+
+          // Compute title/text color based on contrast (black or white)
+          var titleColor = _isLight(hex) ? "#000000" : "#ffffff";
+          try {
+            document.getElementById("main").style.backgroundColor = hex;
+            document.getElementById("titlebar").style.color = titleColor;
+            document.getElementById("progress").style.color = titleColor;
+          } catch (e) {}
+
+          // Persist title-color in themes map so selectTheme reads a consistent value
+          try {
+            window.themes.customTheme["title-color"] = titleColor;
+          } catch (e) {}
+
+          // Register and select theme in epub rendition (include text color)
+          try {
+            if (reader && reader.rendition && reader.rendition.themes) {
+              reader.rendition.themes.register("customTheme", {
+                body: { background: hex, color: titleColor },
+              });
+              reader.rendition.themes.select("customTheme");
+            }
+          } catch (e) {
+            console.error("Failed to apply custom theme to reader", e);
+          }
+        }
+
+        // Delay init until Pickr is available
+        function ensurePickrAndInit() {
+          if (window.Pickr) {
+            try {
+              var pickr = Pickr.create({
+                el: "#customThemeSwatch",
+                theme: "classic",
+                default: saved,
+                components: {
+                  preview: true,
+                  opacity: false,
+                  hue: true,
+                  interaction: {
+                    hex: true,
+                    input: true,
+                    save: true,
+                  },
+                },
+              });
+
+              // Immediate apply when color changes in the picker
+              pickr.on("change", function (color, instance) {
+                try {
+                  var hex = color.toHEXA().toString();
+                  if (swatch) swatch.style.background = hex;
+                  applyCustomColor(hex);
+                } catch (e) {}
+              });
+
+              // Also respond to save (some pickr configs use save)
+              pickr.on("save", function (color, instance) {
+                try {
+                  var hex = color.toHEXA().toString();
+                  if (swatch) swatch.style.background = hex;
+                  applyCustomColor(hex);
+                  pickr.hide();
+                } catch (e) {}
+              });
+
+              // Clicking swatch opens pickr
+              if (swatch)
+                swatch.addEventListener("click", function () {
+                  pickr.show();
+                });
+            } catch (e) {
+              console.error("Pickr init failed", e);
+            }
+            return;
+          }
+          // wait a bit
+          setTimeout(ensurePickrAndInit, 150);
+        }
+
+        ensurePickrAndInit();
+      })();
       </script>
       <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/reading/epub.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/reading/epub-progress.js') }}"></script>      
     </body>
 </html>

cps/templates/readcbr.html

@@ -7,7 +7,7 @@
   <meta name="description" content="">
   <title>{{_('Comic Reader')}} | {{title}}</title>
   <meta name="viewport" content="width=device-width, user-scalable=no">
-  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="mobile-web-app-capable" content="yes">
   {% if g.google_site_verification|length > 0 %}
     <meta name="google-site-verification" content="{{g.google_site_verification}}">
   {% endif %}    

cps/templates/readdjvu.html

@@ -5,7 +5,7 @@
     <title>{{_('DJVU Reader')}} | {{title}}</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     {% if g.google_site_verification|length > 0 %}
       <meta name="google-site-verification" content="{{g.google_site_verification}}">
     {% endif %}  

cps/templates/readpdf.html

@@ -35,7 +35,7 @@ See https://github.com/adobe-type-tools/cmap-resources
     <link rel="stylesheet" href="{{ url_for('static', filename='css/libs/viewer.css') }}">
 	  <!-- This snippet is used in production (included from viewer.html) -->
 	  <link rel="resource" type="application/l10n" href="{{ url_for('static', filename='locale/locale.json') }}">
-	  <script src="{{ url_for('static', filename='js/libs/pdf.mjs') }}" type="module"></script>
+	  <script src="{{ url_for('static', filename='js/libs/pdf.js') }}" type="module"></script>
 
     <script type="text/javascript">
     window.addEventListener('webviewerloaded', function() {
@@ -46,12 +46,12 @@ See https://github.com/adobe-type-tools/cmap-resources
         PDFViewerApplicationOptions.set('cMapUrl', "{{ url_for('static', filename='cmaps/') }}");
         PDFViewerApplicationOptions.set('sidebarViewOnLoad', 0);
         PDFViewerApplicationOptions.set('imageResourcesPath', "{{ url_for('static', filename='css/images/') }}");
-        PDFViewerApplicationOptions.set('workerSrc', "{{ url_for('static', filename='js/libs/pdf.worker.mjs') }}");
+        PDFViewerApplicationOptions.set('workerSrc', "{{ url_for('static', filename='js/libs/pdf.worker.js') }}");
         PDFViewerApplicationOptions.set('defaultUrl',"{{ url_for('web.serve_book', book_id=pdffile, book_format='pdf') }}")
     });
     </script>
 
-    <script src="{{ url_for('static', filename='js/libs/viewer.mjs') }}" type="module">></script>
+    <script src="{{ url_for('static', filename='js/libs/viewer.js') }}" type="module">></script>
 
   </head>