Merge remote-tracking branch 'origin/simple_view' into simple_view

merge upstream

.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 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.
+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.
 
 ### **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. 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.
+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.
 
 ### **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.

MANIFEST.in

@@ -1,3 +1 @@
 graft src/calibreweb
-global-exclude __pycache__
-global-exclude *.pyc

README.md

@@ -19,13 +19,13 @@ Calibre-Web is a web app that offers a clean and intuitive interface for browsin
    - [Quick start](#quick-start)
    - [Requirements](#requirements)
 4. [Docker Images](#docker-images)
-5. [Troubleshooting](#troubleshooting)
+5. [Contributor Recognition](#contributor-recognition)
-6. [Contributor Recognition](#contributor-recognition)
+6. [Contact](#contact)
-7. [Contact](#contact)
+7. [Contributing to Calibre-Web](#contributing-to-calibre-web)
-8. [Contributing to Calibre-Web](#contributing-to-calibre-web)
 
 </details>
 
+
 *This software is a fork of [library](https://github.com/mutschler/calibreserver) and licensed under the GPL v3 License.*
 
 ![Main screen](https://github.com/janeczku/calibre-web/wiki/images/main_screen.png)
@@ -57,102 +57,52 @@ Calibre-Web is a web app that offers a clean and intuitive interface for browsin
 
 ## Installation
 
-### Installation via pip (recommended)
+#### Installation via pip (recommended)
+1. Create a virtual environment for Calibre-Web to avoid conflicts with existing Python dependencies
+2. Install Calibre-Web via pip: `pip install calibreweb` (or `pip3` depending on your OS/distro)
+3. Install optional features via pip as needed, see [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-and-Windows) for details
+4. Start Calibre-Web by typing `cps`
 
-1. **Create a virtual environment**: It’s essential to isolate your Calibre-Web installation to avoid dependency conflicts. You can create a virtual environment by running:
+*Note: Raspberry Pi OS users may encounter issues during installation. If so, please update pip (`./venv/bin/python3 -m pip install --upgrade pip`) and/or install cargo (`sudo apt install cargo`) before retrying the installation.*
-   ```
-   python3 -m venv calibre-web-env
-   ```
-2. **Activate the virtual environment**:
-   ```
-   source calibre-web-env/bin/activate
-   ```
-3. **Install Calibre-Web**: Use pip to install the application:
-   ```
-   pip install calibreweb
-   ```
-4. **Install optional features**: For additional functionality, you may need to install optional features. Refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-and-Windows) for details on what can be installed.
-5. **Start Calibre-Web**: After installation, you can start the application with:
-   ```
-   cps
-   ```
 
-*Note: Users of Raspberry Pi OS may encounter installation issues. If you do, try upgrading pip and/or installing cargo as follows:*
+Refer to the Wiki for additional installation examples: [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation), [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:-Install-Calibre-Web-in-Linux-Mint-19-or-20), [Cloud Provider](https://github.com/janeczku/calibre-web/wiki/How-To:-Install-Calibre-Web-on-a-Cloud-Provider).
-   ```
-   ./venv/bin/python3 -m pip install --upgrade pip
-   sudo apt install cargo
-   ```
-
-### Important Links
-- For additional installation examples, check the following:
-   - [Manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation)
-   - [Linux Mint installation](https://github.com/janeczku/calibre-web/wiki/How-To:-Install-Calibre-Web-in-Linux-Mint-19-or-20)
-   - [Cloud Provider setup](https://github.com/janeczku/calibre-web/wiki/How-To:-Install-Calibre-Web-on-a-Cloud-Provider)
 
 ## Quick Start
 
-1. **Access Calibre-Web**: Open your browser and navigate to:
+1. Open your browser and navigate to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog
-   ```
+2. Log in with the default admin credentials
-   http://localhost:8083
+3. If you don't have a Calibre database, you can use [this database](https://github.com/janeczku/calibre-web/raw/master/library/metadata.db) (move it out of the Calibre-Web folder to prevent overwriting during updates)
-   ```
+4. Set `Location of Calibre database` to the path of the folder containing your Calibre library (metadata.db) and click "Save"
-   or for the OPDS catalog:
+5. Optionally, use Google Drive to host your Calibre library by following the [Google Drive integration guide](https://github.com/janeczku/calibre-web/wiki/G-Drive-Setup#using-google-drive-integration)
-   ```
+6. Configure your Calibre-Web instance via the admin page, referring to the [Basic Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#basic-configuration) and [UI Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#ui-configuration) guides
-   http://localhost:8083/opds
+
-   ```
+#### Default Admin Login:
-2. **Log in**: Use the default admin credentials:
+- **Username:** admin
-   - **Username:** admin
+- **Password:** admin123
-   - **Password:** admin123
-3. **Database Setup**: If you do not have a Calibre database, download a sample from:
-   ```
-   https://github.com/janeczku/calibre-web/raw/master/library/metadata.db
-   ```
-   Move it out of the Calibre-Web folder to avoid overwriting during updates.
-4. **Configure Calibre Database**: In the admin interface, set the `Location of Calibre database` to the path of the folder containing your Calibre library (where `metadata.db` is located) and click "Save".
-5. **Google Drive Integration**: For hosting your Calibre library on Google Drive, refer to the [Google Drive integration guide](https://github.com/janeczku/calibre-web/wiki/G-Drive-Setup#using-google-drive-integration).
-6. **Admin Configuration**: Configure your instance via the admin page, referring to the [Basic Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#basic-configuration) and [UI Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#ui-configuration) guides.
 
 ## Requirements
 
-- **Python Version**: Ensure you have Python 3.7 or newer.
+- Python 3.7+
-- **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.
+- [Imagemagick](https://imagemagick.org/script/download.php) for cover extraction from EPUBs (Windows users may need to install [Ghostscript](https://ghostscript.com/releases/gsdnld.html) for PDF cover extraction)
-- **Optional Tools**:
+- Windows users need to install [libmagic for 32bit python](https://gnuwin32.sourceforge.net/downlinks/file.php) or [libmagic for 64bit python](https://github.com/nscaife/file-windows/releases/tag/20170108), depending on the python version; The files need to be installed in path (e.g. script folder of your Calibre-Web venv, or in the root folder of Calibre-Web
-   - **Calibre desktop program**: Recommended for on-the-fly conversion and metadata editing. Set the path to Calibre’s converter tool on the setup page.
+- Optional: [Calibre desktop program](https://calibre-ebook.com/download) for on-the-fly conversion and metadata editing (set "calibre's converter tool" path 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.
+- Optional: [Kepubify tool](https://github.com/pgaskin/kepubify/releases/latest) for Kobo device support (place the binary in `/opt/kepubify` on Linux or `C:\Program Files\kepubify` on Windows)
 
 ## Docker Images
 
-Pre-built Docker images are available:
+Pre-built Docker images are available in the following Docker Hub repositories (maintained by the LinuxServer team):
 
-### **LinuxServer - x64, aarch64**
+#### **LinuxServer - x64, aarch64**
-- **Docker Hub**: [linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web)
+- [Docker Hub](https://hub.docker.com/r/linuxserver/calibre-web)
-- **GitHub**: [linuxserver/docker-calibre-web](https://github.com/linuxserver/docker-calibre-web)
+- [GitHub](https://github.com/linuxserver/docker-calibre-web)
-- **Optional Calibre layer**: [linuxserver/docker-mods](https://github.com/linuxserver/docker-mods/tree/universal-calibre)
+- [GitHub - Optional Calibre layer](https://github.com/linuxserver/docker-mods/tree/universal-calibre)
 
-To include the Calibre `ebook-convert` binary (x64 only), add the environment variable:
+  Include the environment variable `DOCKER_MODS=linuxserver/mods:universal-calibre` in your Docker run/compose file to add the Calibre `ebook-convert` binary (x64 only). Omit this variable for a lightweight image.
-``` 
-DOCKER_MODS=linuxserver/mods:universal-calibre
-```
-in your Docker run/compose file. Omit this variable for a lightweight image.
 
-- **Paths Configuration**:
+  Both the Calibre-Web and Calibre-Mod images are automatically rebuilt on new releases and updates.
-   - Set **Path to Calibre Binaries** to `/usr/bin`.
-   - Set **Path to Unrar** to `/usr/bin/unrar`.
 
-## Troubleshooting
+  - Set "Path to Calibre Binaries" to `/usr/bin`
-
+  - Set "Path to Unrar" to `/usr/bin/unrar`
-- **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.
-
-- **Configuration Errors**: Ensure that your Calibre database is compatible and properly formatted. Refer to the Calibre documentation for guidance on maintaining the database.
-
-- **Performance Problems**: 
-   - If the application is slow, consider increasing the allocated resources (CPU/RAM) to your server or optimizing the Calibre database by removing duplicates and unnecessary entries.
-   - Regularly clear the cache in your web browser to improve loading times.
-
-- **User Management Issues**: If users are unable to log in or register, check the user permission settings in the admin interface. Ensure that registration is enabled and that users are being assigned appropriate roles.
-
-- **Support Resources**: For additional help, consider visiting the [FAQ section](https://github.com/janeczku/calibre-web/wiki/FAQ) of the wiki or posting your questions in the [Discord community](https://discord.gg/h2VsJ2NEfB).
 
 ## Contributor Recognition
 
@@ -166,21 +116,4 @@ For more information, How To's, and FAQs, please visit the [Wiki](https://github
 
 ## Contributing to Calibre-Web
 
-To contribute, please check our [Contributing Guidelines](https://github.com/janeczku/calibre-web/blob/master/CONTRIBUTING.md). We welcome issues, feature requests, and pull requests from the community.
+Check out our [Contributing Guidelines](https://github.com/janeczku/calibre-web/blob/master/CONTRIBUTING.md)
-
-### Reporting Bugs
-
-If you encounter bugs or issues, please report them in the [issues section](https://github.com/janeczku/calibre-web/issues) of the repository. Be sure to include detailed information about your setup and the problem encountered.
-
-### Feature Requests
-
-We welcome suggestions for new features. Please create a new issue in the repository to discuss your ideas.
-
-## Additional Resources
-
-- **Documentation**: Comprehensive documentation is available on the [Calibre-Web wiki](https://github.com/janeczku/calibre-web/wiki).
-- **Community Contributions**: Explore the [community contributions](https://github.com/janeczku/calibre-web/pulls) to see ongoing work and how you can get involved.
-
----
-
-Thank you for using Calibre-Web! We hope you enjoy managing your eBook library with our tool.

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/__init__.py

@@ -31,10 +31,12 @@ from flask_principal import Principal
 
 from . import logger
 from .cli import CliParameter
+from .constants import CONFIG_DIR
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
 from .updater import Updater
+from .babel import babel, get_locale
 from . import config_sql
 from . import cache_buster
 from . import ub, db
@@ -55,17 +57,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('application/fb2+zip', '.fb2')
+mimetypes.add_type('text/xml', '.fb2')
-mimetypes.add_type('application/x-mobipocket-ebook', '.mobi')
+mimetypes.add_type('application/octet-stream', '.mobi')
 mimetypes.add_type('application/octet-stream', '.prc')
-mimetypes.add_type('application/x-mobipocket-ebook', '.azw')
+mimetypes.add_type('application/vnd.amazon.ebook', '.azw')
-mimetypes.add_type('application/x-mobipocket-ebook', '.azw3')
+mimetypes.add_type('application/x-mobi8-ebook', '.azw3')
-mimetypes.add_type('application/x-cbr', '.cbr')
+mimetypes.add_type('application/x-rar', '.cbr')
-mimetypes.add_type('application/x-cbz', '.cbz')
+mimetypes.add_type('application/zip', '.cbz')
 mimetypes.add_type('application/x-tar', '.cbt')
 mimetypes.add_type('application/x-7z-compressed', '.cb7')
-mimetypes.add_type('image/vnd.djvu', '.djv')
+mimetypes.add_type('image/vnd.djv', '.djv')
-mimetypes.add_type('image/vnd.djvu', '.djvu')
+mimetypes.add_type('image/vnd.djv', '.djvu')
 mimetypes.add_type('application/mpeg', '.mpeg')
 mimetypes.add_type('audio/mpeg', '.mp3')
 mimetypes.add_type('audio/x-m4a', '.m4a')
@@ -77,15 +79,14 @@ 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', '.js')
+mimetypes.add_type('text/javascript; charset=UTF-8', '.js')
-mimetypes.add_type('text/rtf', '.rtf')
 
 log = logger.create()
 
 app = Flask(__name__)
 app.config.update(
     SESSION_COOKIE_HTTPONLY=True,
-    SESSION_COOKIE_SAMESITE='Lax',
+    SESSION_COOKIE_SAMESITE='Strict',
     REMEMBER_COOKIE_SAMESITE='Strict',
     WTF_CSRF_SSL_STRICT=False,
     SESSION_COOKIE_NAME=os.environ.get('COOKIE_PREFIX', "") + "session",
@@ -103,7 +104,7 @@ if wtf_present:
 else:
     csrf = None
 
-calibre_db = db.CalibreDB(app)
+calibre_db = db.CalibreDB()
 
 web_server = WebServer()
 
@@ -147,7 +148,9 @@ def create_app():
     lm.anonymous_user = ub.Anonymous
     lm.session_protection = 'strong' if config.config_session == 1 else "basic"
 
-    db.CalibreDB.update_config(config, config.config_calibre_dir, cli_param.settings_path)
+    db.CalibreDB.update_config(config)
+    db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
+    calibre_db.init_db()
 
     updater_thread.init_updater(config, web_server)
     # Perform dry run of updater and exit afterward
@@ -180,7 +183,6 @@ def create_app():
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))
 
     web_server.init_app(app, config)
-    from .cw_babel import babel, get_locale
     if hasattr(babel, "localeselector"):
         babel.init_app(app)
         babel.localeselector(get_locale)

cps/about.py

@@ -23,7 +23,7 @@
 import sys
 import platform
 import sqlite3
-from importlib.metadata import metadata
+import importlib
 from collections import OrderedDict
 
 import flask
@@ -41,18 +41,20 @@ req = dep_check.load_dependencies(False)
 opt = dep_check.load_dependencies(True)
 for i in (req + opt):
     modules[i[1]] = i[0]
-modules['Jinja2'] = metadata("jinja2")["Version"]
+modules['Jinja2'] = importlib.metadata.version("jinja2")
-if sys.version_info < (3, 12):
+try:
     modules['pySqlite'] = sqlite3.version
+except Exception:
+    pass
 modules['SQLite'] = sqlite3.sqlite_version
 sorted_modules = OrderedDict((sorted(modules.items(), key=lambda x: x[0].casefold())))
 
 
 def collect_stats():
     if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
-        calibre_web_version = constants.STABLE_VERSION.replace("b", " Beta")
+        calibre_web_version = constants.STABLE_VERSION['version'].replace("b", " Beta")
     else:
-        calibre_web_version = (constants.STABLE_VERSION.replace("b", " Beta") + ' - '
+        calibre_web_version = (constants.STABLE_VERSION['version'].replace("b", " Beta") + ' - '
                                + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
                                + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
 

cps/admin.py

@@ -32,8 +32,7 @@ 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, \
+from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
-    send_from_directory, g, jsonify
 from markupsafe import Markup
 from .cw_login import current_user
 from flask_babel import gettext as _
@@ -53,7 +52,7 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from .services.worker import WorkerThread
 from .usermanagement import user_login_required
-from .cw_babel import get_available_translations, get_available_locale, get_user_locale_language
+from .babel import get_available_translations, get_available_locale, get_user_locale_language
 from . import debug_info
 from .string_helper import strip_whitespaces
 
@@ -119,7 +118,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',
@@ -127,7 +126,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'))
 
 
@@ -145,6 +144,7 @@ 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'])
-@user_login_required
 @admin_required
+@user_login_required
 def update_thumbnails():
     content = config.get_scheduled_task_settings()
     if content['schedule_generate_book_covers']:
@@ -306,15 +306,7 @@ def edit_user_table():
         .group_by(text('books_tags_link.tag')) \
         .order_by(db.Tags.name).all()
     if config.config_restricted_column:
-        try:
         custom_values = calibre_db.session.query(db.cc_classes[config.config_restricted_column]).all()
-        except (KeyError, AttributeError, IndexError):
-            custom_values = []
-            log.error("Custom Column No.{} does not exist in calibre database".format(
-                config.config_restricted_column))
-            flash(_("Custom Column No.%(column)d does not exist in calibre database",
-                    column=config.config_restricted_column),
-                  category="error")
     else:
         custom_values = []
     if not config.config_anonbrowse:
@@ -379,7 +371,10 @@ def list_users():
             user.default = get_user_locale_language(user.default_language)
 
     table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": users}
-    return make_response(json.dumps(table_entries, cls=db.AlchemyEncoder))
+    js_list = 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'])
@@ -398,7 +393,7 @@ def delete_user():
     success = list()
     if not users:
         log.error("User not found")
-        return make_response(jsonify(type="danger", message=_("User not found")))
+        return Response(json.dumps({'type': "danger", 'message': _("User not found")}), mimetype='application/json')
     for user in users:
         try:
             message = _delete_user(user)
@@ -414,7 +409,7 @@ def delete_user():
         log.info("Users {} deleted".format(user_ids))
         success = [{'type': "success", 'message': _("{} users deleted successfully").format(count)}]
     success.extend(errors)
-    return make_response(jsonify(success))
+    return Response(json.dumps(success), mimetype='application/json')
 
 
 @admi.route("/ajax/getlocale")
@@ -426,7 +421,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(sorted(ret, key=lambda x: x['text']))
+    return json.dumps(ret)
 
 
 @admi.route("/ajax/getdefaultlanguage")
@@ -438,7 +433,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(sorted(ret, key=lambda x: x['text']))
+    return json.dumps(ret)
 
 
 @admi.route("/ajax/editlistusers/<param>", methods=['POST'])
@@ -496,10 +491,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 make_response(
+                                    return Response(
-                                        jsonify([{'type': "danger",
+                                        json.dumps([{'type': "danger",
                                                      'message': _("No admin user remaining, can't remove admin role",
-                                                                  nick=user.name)}]))
+                                                                  nick=user.name)}]), mimetype='application/json')
                             user.role &= ~value
                         else:
                             raise Exception(_("Value has to be true or false"))
@@ -945,7 +940,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 make_response(jsonify(type="success", message=message))
+    return Response(json.dumps([{"type": "success", "message": message}]), mimetype='application/json')
 
 
 def check_valid_read_column(column):
@@ -987,14 +982,8 @@ def prepare_tags(user, action, tags_name, id_list):
             raise Exception(_("Tag not found"))
         new_tags_list = [x.name for x in tags]
     else:
-        try:
         tags = calibre_db.session.query(db.cc_classes[config.config_restricted_column]) \
             .filter(db.cc_classes[config.config_restricted_column].id.in_(id_list)).all()
-        except (KeyError, AttributeError, IndexError):
-            log.error("Custom Column No.{} does not exist in calibre database".format(
-                config.config_restricted_column))
-            raise Exception(_("Custom Column No.%(column)d does not exist in calibre database",
-                    column=config.config_restricted_column))
         new_tags_list = [x.value for x in tags]
     saved_tags_list = user.__dict__[tags_name].split(",") if len(user.__dict__[tags_name]) else []
     if action == "remove":
@@ -1262,7 +1251,7 @@ def _configuration_ldap_helper(to_save):
 @admin_required
 def simulatedbchange():
     db_change, db_valid = _db_simulate_change()
-    return make_response(jsonify(change=db_change, valid=db_valid))
+    return Response(json.dumps({"change": db_change, "valid": db_valid}), mimetype='application/json')
 
 
 @admi.route("/admin/user/new", methods=["GET", "POST"])
@@ -1734,12 +1723,14 @@ 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
+
-           or config.config_calibre_dir != to_save["config_calibre_dir"]):
+    if db_change or not db_valid or not config.db_configured \
+      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")
@@ -1753,20 +1744,11 @@ def _db_configuration_update_helper():
             ub.session.query(ub.KoboSyncedBooks).delete()
             helper.delete_thumbnail_cache()
             ub.session_commit()
-            # deleted visibilities based on custom column and tags
-            config.config_restricted_column = 0
-            config.config_denied_tags = ""
-            config.config_allowed_tags = ""
-            config.config_columns_to_ignore = ""
-            config.config_denied_column_value = ""
-            config.config_allowed_column_value = ""
-            config.config_read_column = 0
         _config_string(to_save, "config_calibre_dir")
-        calibre_db.update_config(config, config.config_calibre_dir, ub.app_DB_path)
+        calibre_db.update_config(config)
-        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, config.config_calibre_dir, ub.app_DB_path)
+    calibre_db.update_config(config)
     config.save()
     return _db_configuration_result(None, gdrive_error)
 
@@ -1894,7 +1876,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 make_response(jsonify(resp))
+    return Response(json.dumps(resp), mimetype='application/json')
 
 
 def _db_configuration_result(error_flash=None, gdrive_error=None):
@@ -2099,7 +2081,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
 
 
 def extract_user_data_from_field(user, field):
-    match = re.search(field + r"=(.*?)($|(?<!\\),)", user, re.IGNORECASE | re.UNICODE)    
+    match = re.search(field + r"=([@\.\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
     if match:
         return match.group(1)
     else:
@@ -2107,7 +2089,7 @@ def extract_user_data_from_field(user, field):
 
 
 def extract_dynamic_field_from_filter(user, filtr):
-    match = re.search(r"([a-zA-Z0-9-]+)=%s", filtr, re.IGNORECASE | re.UNICODE)
+    match = re.search("([a-zA-Z0-9-]+)=%s", filtr, re.IGNORECASE | re.UNICODE)
     if match:
         return match.group(1)
     else:

cps/audio.py

@@ -16,6 +16,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
+
 import mutagen
 import base64
 from . import cover, logger
@@ -49,12 +51,13 @@ 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
-            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 [".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
@@ -67,15 +70,17 @@ 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]))
-                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:])
             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 = cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:])
+                tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg')
+                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
@@ -87,7 +92,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 = tmp_file_path + '.jpg'
+            tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.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"]:
@@ -101,7 +106,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 = tmp_file_path + '.jpg'
+            tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.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"]:
@@ -115,6 +120,7 @@ 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:
@@ -126,7 +132,7 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na
                     cover_bin = c
                     break
             if cover_type:
-                tmp_cover_name = cover.cover_processing(tmp_file_path, cover_bin, cover_type)
+                cover.cover_processing(tmp_file_path, cover_bin, cover_type)
             else:
                 logger.error("Unknown covertype in file {} ".format(original_file_name))
 

cps/babel.py

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

cps/cli.py

@@ -29,8 +29,8 @@ from .constants import DEFAULT_SETTINGS_FILE, DEFAULT_GDRIVE_FILE
 
 def version_info():
     if _NIGHTLY_VERSION[1].startswith('$Format'):
-        return "Calibre-Web version: %s - unknown git-clone" % _STABLE_VERSION.replace("b", " Beta")
+        return "Calibre-Web version: %s - unknown git-clone" % _STABLE_VERSION['version'].replace("b", " Beta")
-    return "Calibre-Web version: %s -%s" % (_STABLE_VERSION.replace("b", " Beta"), _NIGHTLY_VERSION[1])
+    return "Calibre-Web version: %s -%s" % (_STABLE_VERSION['version'].replace("b", " Beta"), _NIGHTLY_VERSION[1])
 
 
 class CliParameter(object):

cps/comic.py

@@ -90,7 +90,7 @@ def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_exec
                 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))
@@ -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_path, original_file_extension, rar_executable):
+def _extract_cover(tmp_file_name, original_file_extension, rar_executable):
     cover_data = extension = None
     if use_comic_meta:
         try:
-            archive = ComicArchive(tmp_file_path, rar_exe_path=rar_executable)
+            archive = ComicArchive(tmp_file_name, rar_exe_path=rar_executable)
         except TypeError:
-            archive = ComicArchive(tmp_file_path)
+            archive = ComicArchive(tmp_file_name)
         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_path, original_file_extension, rar_executable):
                     cover_data = get_page(index)
                     break
     else:
-        cover_data, extension = _extract_cover_from_archive(original_file_extension, tmp_file_path, rar_executable)
+        cover_data, extension = _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_executable)
-    return cover.cover_processing(tmp_file_path, cover_data, extension)
+    return cover.cover_processing(tmp_file_name, 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

@@ -405,9 +405,7 @@ class ConfigSQL(object):
         return self.config_calibre_split_dir if self.config_calibre_split_dir else self.config_calibre_dir
 
     def store_calibre_uuid(self, calibre_db, Library_table):
-        from . import app
         try:
-            with app.app_context():
             calibre_uuid = calibre_db.session.query(Library_table).one_or_none()
             if self.config_calibre_uuid != calibre_uuid.uuid:
                 self.config_calibre_uuid = calibre_uuid.uuid
@@ -485,8 +483,6 @@ 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:
@@ -517,8 +513,6 @@ 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:
@@ -531,8 +525,6 @@ 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:

cps/constants.py

@@ -19,6 +19,9 @@
 import sys
 import os
 from collections import namedtuple
+from sqlalchemy import __version__ as sql_version
+
+sqlalchemy_version2 = ([int(x) for x in sql_version.split('.')] >= [2, 0, 0])
 
 # APP_MODE - production, development, or test
 APP_MODE             = os.environ.get('APP_MODE', 'production')
@@ -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.25'
+STABLE_VERSION = {'version': '0.6.24b'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'

cps/cover.py

@@ -29,14 +29,13 @@ NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
 COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
 
 
-def cover_processing(tmp_file_path, img, extension):
+def cover_processing(tmp_file_name, 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('srgb')
+                imgc.transform_colorspace('rgb')
                 imgc.save(filename=tmp_cover_name)
                 return tmp_cover_name
         else:

cps/cw_advocate/__init__.py

@@ -1,22 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-
-from .adapters import ValidatingHTTPAdapter
-from .api import *
-from .addrvalidator import AddrValidator
-from .exceptions import UnacceptableAddressException

cps/cw_advocate/adapters.py

@@ -1,48 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-from requests.adapters import HTTPAdapter, DEFAULT_POOLBLOCK
-
-from .addrvalidator import AddrValidator
-from .exceptions import ProxyDisabledException
-from .poolmanager import ValidatingPoolManager
-
-
-class ValidatingHTTPAdapter(HTTPAdapter):
-    __attrs__ = HTTPAdapter.__attrs__ + ['_validator']
-
-    def __init__(self, *args, **kwargs):
-        self._validator = kwargs.pop('validator', None)
-        if not self._validator:
-            self._validator = AddrValidator()
-        super().__init__(*args, **kwargs)
-
-    def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK,
-                         **pool_kwargs):
-        self._pool_connections = connections
-        self._pool_maxsize = maxsize
-        self._pool_block = block
-        self.poolmanager = ValidatingPoolManager(
-            num_pools=connections,
-            maxsize=maxsize,
-            block=block,
-            validator=self._validator,
-            **pool_kwargs
-        )
-
-    def proxy_manager_for(self, proxy, **proxy_kwargs):
-        raise ProxyDisabledException("Proxies cannot be used with Advocate")

cps/cw_advocate/addrvalidator.py

@@ -1,281 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-import functools
-import fnmatch
-import ipaddress
-import re
-
-try:
-    import netifaces
-    HAVE_NETIFACES = True
-except ImportError:
-    netifaces = None
-    HAVE_NETIFACES = False
-
-from .exceptions import NameserverException, ConfigException
-
-
-def canonicalize_hostname(hostname):
-    """Lowercase and punycodify a hostname"""
-    # We do the lowercasing after IDNA encoding because we only want to
-    # lowercase the *ASCII* chars.
-    # TODO: The differences between IDNA2003 and IDNA2008 might be relevant
-    # to us, but both specs are damn confusing.
-    return str(hostname.encode("idna").lower(), 'utf-8')
-
-
-def determine_local_addresses():
-    """Get all IPs that refer to this machine according to netifaces"""
-    if not HAVE_NETIFACES:
-        raise ConfigException("Tried to determine local addresses, "
-                              "but netifaces module was not importable")
-    ips = []
-    for interface in netifaces.interfaces():
-        if_families = netifaces.ifaddresses(interface)
-        for family_kind in {netifaces.AF_INET, netifaces.AF_INET6}:
-            addrs = if_families.get(family_kind, [])
-            for addr in (x.get("addr", "") for x in addrs):
-                if family_kind == netifaces.AF_INET6:
-                    # We can't do anything sensible with the scope here
-                    addr = addr.split("%")[0]
-                ips.append(ipaddress.ip_network(addr))
-    return ips
-
-
-def add_local_address_arg(func):
-    """Add the "_local_addresses" kwarg if it's missing
-
-    IMO this information shouldn't be cached between calls (what if one of the
-    adapters got a new IP at runtime?,) and we don't want each function to
-    recalculate it. Just recalculate it if the caller didn't provide it for us.
-    """
-    @functools.wraps(func)
-    def wrapper(self, *args, **kwargs):
-        if "_local_addresses" not in kwargs:
-            if self.autodetect_local_addresses:
-                kwargs["_local_addresses"] = determine_local_addresses()
-            else:
-                kwargs["_local_addresses"] = []
-        return func(self, *args, **kwargs)
-    return wrapper
-
-
-class AddrValidator:
-    _6TO4_RELAY_NET = ipaddress.ip_network("192.88.99.0/24")
-    # Just the well known prefix, DNS64 servers can set their own
-    # prefix, but in practice most probably don't.
-    _DNS64_WK_PREFIX = ipaddress.ip_network("64:ff9b::/96")
-    DEFAULT_PORT_WHITELIST = {80, 8080, 443, 8443, 8000}
-
-    def __init__(
-            self,
-            ip_blacklist=None,
-            ip_whitelist=None,
-            port_whitelist=None,
-            port_blacklist=None,
-            hostname_blacklist=None,
-            allow_ipv6=False,
-            allow_teredo=False,
-            allow_6to4=False,
-            allow_dns64=False,
-            # Must be explicitly set to "False" if you don't want to try
-            # detecting local interface addresses with netifaces.
-            autodetect_local_addresses=True,
-    ):
-        if not port_blacklist and not port_whitelist:
-            # An assortment of common HTTPS? ports.
-            port_whitelist = self.DEFAULT_PORT_WHITELIST.copy()
-        self.ip_blacklist = ip_blacklist or set()
-        self.ip_whitelist = ip_whitelist or set()
-        self.port_blacklist = port_blacklist or set()
-        self.port_whitelist = port_whitelist or set()
-        # TODO: ATM this can contain either regexes or globs that are converted
-        # to regexes upon every check. Create a collection that automagically
-        # converts them to regexes on insert?
-        self.hostname_blacklist = hostname_blacklist or set()
-        self.allow_ipv6 = allow_ipv6
-        self.allow_teredo = allow_teredo
-        self.allow_6to4 = allow_6to4
-        self.allow_dns64 = allow_dns64
-        self.autodetect_local_addresses = autodetect_local_addresses
-
-    @add_local_address_arg
-    def is_ip_allowed(self, addr_ip, _local_addresses=None):
-        if not isinstance(addr_ip,
-                          (ipaddress.IPv4Address, ipaddress.IPv6Address)):
-            addr_ip = ipaddress.ip_address(addr_ip)
-
-        # The whitelist should take precedence over the blacklist so we can
-        # punch holes in blacklisted ranges
-        if any(addr_ip in net for net in self.ip_whitelist):
-            return True
-
-        if any(addr_ip in net for net in self.ip_blacklist):
-            return False
-
-        if any(addr_ip in net for net in _local_addresses):
-            return False
-
-        if addr_ip.version == 4:
-            if not addr_ip.is_private:
-                # IPs for carrier-grade NAT. Seems weird that it doesn't set
-                # `is_private`, but we need to check `not is_global`
-                if not ipaddress.ip_network(addr_ip).is_global:
-                    return False
-        elif addr_ip.version == 6:
-            # You'd better have a good reason for enabling IPv6
-            # because Advocate's techniques don't work well without NAT.
-            if not self.allow_ipv6:
-                return False
-
-            # v6 addresses can also map to IPv4 addresses! Tricky!
-            v4_nested = []
-            if addr_ip.ipv4_mapped:
-                v4_nested.append(addr_ip.ipv4_mapped)
-            # WTF IPv6? Why you gotta have a billion tunneling mechanisms?
-            # XXX: Do we even really care about these? If we're tunneling
-            # through public servers we shouldn't be able to access
-            # addresses on our private network, right?
-            if addr_ip.sixtofour:
-                if not self.allow_6to4:
-                    return False
-                v4_nested.append(addr_ip.sixtofour)
-            if addr_ip.teredo:
-                if not self.allow_teredo:
-                    return False
-                # Check both the client *and* server IPs
-                v4_nested.extend(addr_ip.teredo)
-            if addr_ip in self._DNS64_WK_PREFIX:
-                if not self.allow_dns64:
-                    return False
-                # When using the well-known prefix the last 4 bytes
-                # are the IPv4 addr
-                v4_nested.append(ipaddress.ip_address(addr_ip.packed[-4:]))
-
-            if not all(self.is_ip_allowed(addr_v4) for addr_v4 in v4_nested):
-                return False
-
-            # fec0::*, apparently deprecated?
-            if addr_ip.is_site_local:
-                return False
-        else:
-            raise ValueError("Unsupported IP version(?): %r" % addr_ip)
-
-        # 169.254.XXX.XXX, AWS uses these for autoconfiguration
-        if addr_ip.is_link_local:
-            return False
-        # 127.0.0.1, ::1, etc.
-        if addr_ip.is_loopback:
-            return False
-        if addr_ip.is_multicast:
-            return False
-        # 192.168.XXX.XXX, 10.XXX.XXX.XXX
-        if addr_ip.is_private:
-            return False
-        # 255.255.255.255, ::ffff:XXXX:XXXX (v6->v4) mapping
-        if addr_ip.is_reserved:
-            return False
-        # There's no reason to connect directly to a 6to4 relay
-        if addr_ip in self._6TO4_RELAY_NET:
-            return False
-        # 0.0.0.0
-        if addr_ip.is_unspecified:
-            return False
-
-        # It doesn't look bad, so... it's must be ok!
-        return True
-
-    def _hostname_matches_pattern(self, hostname, pattern):
-        # If they specified a string, just assume they only want basic globbing.
-        # This stops people from not realizing they're dealing in REs and
-        # not escaping their periods unless they specifically pass in an RE.
-        # This has the added benefit of letting us sanely handle globbed
-        # IDNs by default.
-        if isinstance(pattern, str):
-            # convert the glob to a punycode glob, then a regex
-            pattern = fnmatch.translate(canonicalize_hostname(pattern))
-
-        hostname = canonicalize_hostname(hostname)
-        # Down the line the hostname may get treated as a null-terminated string
-        # (as with `socket.getaddrinfo`.) Try to account for that.
-        #
-        #    >>> socket.getaddrinfo("example.com\x00aaaa", 80)
-        #    [(2, 1, 6, '', ('93.184.216.34', 80)), [...]
-        no_null_hostname = hostname.split("\x00")[0]
-
-        return any(re.match(pattern, x.strip(".")) for x
-                   in (no_null_hostname, hostname))
-
-    def is_hostname_allowed(self, hostname):
-        # Sometimes (like with "external" services that your IP has privileged
-        # access to) you might not always know the IP range to blacklist access
-        # to, or the `A` record might change without you noticing.
-        # For e.x.: `foocorp.external.org`.
-        #
-        # Another option is doing something like:
-        #
-        #     for addrinfo in socket.getaddrinfo("foocorp.external.org", 80):
-        #         global_validator.ip_blacklist.add(ip_address(addrinfo[4][0]))
-        #
-        # but that's not always a good idea if they're behind a third-party lb.
-        for pattern in self.hostname_blacklist:
-            if self._hostname_matches_pattern(hostname, pattern):
-                return False
-        return True
-
-    @add_local_address_arg
-    def is_addrinfo_allowed(self, addrinfo, _local_addresses=None):
-        assert(len(addrinfo) == 5)
-        # XXX: Do we care about any of the other elements? Guessing not.
-        family, socktype, proto, canonname, sockaddr = addrinfo
-
-        # The 4th elem inaddrinfo may either be a touple of two or four items,
-        # depending on whether we're dealing with IPv4 or v6
-        if len(sockaddr) == 2:
-            # v4
-            ip, port = sockaddr
-        elif len(sockaddr) == 4:
-            # v6
-            # XXX: what *are* `flow_info` and `scope_id`? Anything useful?
-            # Seems like we can figure out all we need about the scope from
-            # the `is_<x>` properties.
-            ip, port, flow_info, scope_id = sockaddr
-        else:
-            raise ValueError("Unexpected addrinfo format %r" % sockaddr)
-
-        # Probably won't help protect against SSRF, but might prevent our being
-        # used to attack others' non-HTTP services. See
-        # http://www.remote.org/jochen/sec/hfpa/
-        if self.port_whitelist and port not in self.port_whitelist:
-            return False
-        if port in self.port_blacklist:
-            return False
-
-        if self.hostname_blacklist:
-            if not canonname:
-                raise NameserverException(
-                    "addrinfo must contain the canon name to do blacklisting "
-                    "based on hostname. Make sure you use the "
-                    "`socket.AI_CANONNAME` flag, and that each record contains "
-                    "the canon name. Your DNS server might also be garbage."
-                )
-
-            if not self.is_hostname_allowed(canonname):
-                return False
-
-        return self.is_ip_allowed(ip, _local_addresses=_local_addresses)

cps/cw_advocate/api.py

@@ -1,202 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-"""
-advocate.api
-~~~~~~~~~~~~
-
-This module implements the Requests API, largely a copy/paste from `requests`
-itself.
-
-:copyright: (c) 2015 by Jordan Milne.
-:license: Apache2, see LICENSE for more details.
-
-"""
-from collections import OrderedDict
-import hashlib
-import pickle
-
-from requests import Session as RequestsSession
-
-# import cw_advocate
-from .adapters import ValidatingHTTPAdapter
-from .exceptions import MountDisabledException
-
-
-class Session(RequestsSession):
-    """Convenience wrapper around `requests.Session` set up for `advocate`ing"""
-
-    __attrs__ = RequestsSession.__attrs__ + ["validator"]
-    DEFAULT_VALIDATOR = None
-    """
-    User-replaceable default validator to use for all Advocate sessions,
-    includes sessions created by advocate.get()
-    """
-
-    def __init__(self, *args, **kwargs):
-        self.validator = kwargs.pop("validator", None) or self.DEFAULT_VALIDATOR
-        adapter_kwargs = kwargs.pop("_adapter_kwargs", {})
-
-        # `Session.__init__()` calls `mount()` internally, so we need to allow
-        # it temporarily
-        self.__mount_allowed = True
-        RequestsSession.__init__(self, *args, **kwargs)
-
-        # Drop any existing adapters
-        self.adapters = OrderedDict()
-
-        self.mount("http://", ValidatingHTTPAdapter(validator=self.validator, **adapter_kwargs))
-        self.mount("https://", ValidatingHTTPAdapter(validator=self.validator, **adapter_kwargs))
-        self.__mount_allowed = False
-
-    def mount(self, *args, **kwargs):
-        """Wrapper around `mount()` to prevent a protection bypass"""
-        if self.__mount_allowed:
-            super().mount(*args, **kwargs)
-        else:
-            raise MountDisabledException(
-                "mount() is disabled to prevent protection bypasses"
-            )
-
-
-def session(*args, **kwargs):
-    return Session(*args, **kwargs)
-
-
-def request(method, url, **kwargs):
-    """Constructs and sends a :class:`Request <Request>`.
-
-    :param method: method for the new :class:`Request` object.
-    :param url: URL for the new :class:`Request` object.
-    :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
-    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
-    :param json: (optional) json data to send in the body of the :class:`Request`.
-    :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
-    :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
-    :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': ('filename', fileobj)}``) for multipart encoding upload.
-    :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
-    :param timeout: (optional) How long to wait for the server to send data
-        before giving up, as a float, or a (`connect timeout, read timeout
-        <user/advanced.html#timeouts>`_) tuple.
-    :type timeout: float or tuple
-    :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed.
-    :type allow_redirects: bool
-    :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
-    :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided.
-    :param stream: (optional) if ``False``, the response content will be immediately downloaded.
-    :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    validator = kwargs.pop("validator", None)
-    with Session(validator=validator) as sess:
-        response = sess.request(method=method, url=url, **kwargs)
-    return response
-
-
-def get(url, **kwargs):
-    """Sends a GET request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param **kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    kwargs.setdefault('allow_redirects', True)
-    return request('get', url, **kwargs)
-
-
-class RequestsAPIWrapper:
-    """Provides a `requests.api`-like interface with a specific validator"""
-
-    # Due to how the classes are dynamically constructed pickling may not work
-    # correctly unless loaded within the same interpreter instance.
-    # Enable at your peril.
-    SUPPORT_WRAPPER_PICKLING = False
-
-    def __init__(self, validator):
-        # Do this here to avoid circular import issues
-        try:
-            from .futures import FuturesSession
-            have_requests_futures = True
-        except ImportError as e:
-            have_requests_futures = False
-
-        self.validator = validator
-        outer_self = self
-
-        class _WrappedSession(Session):
-            """An `advocate.Session` that uses the wrapper's blacklist
-
-            the wrapper is meant to be a transparent replacement for `requests`,
-            so people should be able to subclass `wrapper.Session` and still
-            get the desired validation behaviour
-            """
-            DEFAULT_VALIDATOR = outer_self.validator
-
-        self._make_wrapper_cls_global(_WrappedSession)
-
-        if have_requests_futures:
-
-            class _WrappedFuturesSession(FuturesSession):
-                """Like _WrappedSession, but for `FuturesSession`s"""
-                DEFAULT_VALIDATOR = outer_self.validator
-            self._make_wrapper_cls_global(_WrappedFuturesSession)
-
-            self.FuturesSession = _WrappedFuturesSession
-
-        self.request = self._default_arg_wrapper(request)
-        self.get = self._default_arg_wrapper(get)
-        self.Session = _WrappedSession
-
-    def __getattr__(self, item):
-        # This class is meant to mimic the requests base module, so if we don't
-        # have this attribute, it might be on the base module (like the Request
-        # class, etc.)
-        try:
-            return object.__getattribute__(self, item)
-        except AttributeError:
-            from . import cw_advocate
-            return getattr(cw_advocate, item)
-
-    def _default_arg_wrapper(self, fun):
-        def wrapped_func(*args, **kwargs):
-            kwargs.setdefault("validator", self.validator)
-            return fun(*args, **kwargs)
-        return wrapped_func
-
-    def _make_wrapper_cls_global(self, cls):
-        if not self.SUPPORT_WRAPPER_PICKLING:
-            return
-        # Gnarly, but necessary to give pickle a consistent module-level
-        # reference for each wrapper.
-        wrapper_hash = hashlib.sha256(pickle.dumps(self)).hexdigest()
-        cls.__name__ = "_".join((cls.__name__, wrapper_hash))
-        cls.__qualname__ = ".".join((__name__, cls.__name__))
-        if not globals().get(cls.__name__):
-            globals()[cls.__name__] = cls
-
-
-__all__ = (
-    "get",
-    "request",
-    "session",
-    "Session",
-    "RequestsAPIWrapper",
-)

cps/cw_advocate/connection.py

@@ -1,201 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-import ipaddress
-import socket
-from socket import timeout as SocketTimeout
-
-from urllib3.connection import HTTPSConnection, HTTPConnection
-from urllib3.exceptions import ConnectTimeoutError
-from urllib3.util.connection import _set_socket_options
-from urllib3.util.connection import create_connection as old_create_connection
-
-from . import addrvalidator
-from .exceptions import UnacceptableAddressException
-
-
-def advocate_getaddrinfo(host, port, get_canonname=False):
-    addrinfo = socket.getaddrinfo(
-        host,
-        port,
-        0,
-        socket.SOCK_STREAM,
-        0,
-        # We need what the DNS client sees the hostname as, correctly handles
-        # IDNs and tricky things like `private.foocorp.org\x00.google.com`.
-        # All IDNs will be converted to punycode.
-        socket.AI_CANONNAME if get_canonname else 0,
-    )
-    return fix_addrinfo(addrinfo)
-
-
-def fix_addrinfo(records):
-    """
-    Propagate the canonname across records and parse IPs
-
-    I'm not sure if this is just the behaviour of `getaddrinfo` on Linux, but
-    it seems like only the first record in the set has the canonname field
-    populated.
-    """
-    def fix_record(record, canonname):
-        sa = record[4]
-        sa = (ipaddress.ip_address(sa[0]),) + sa[1:]
-        return record[0], record[1], record[2], canonname, sa
-
-    canonname = None
-    if records:
-        # Apparently the canonical name is only included in the first record?
-        # Add it to all of them.
-        assert(len(records[0]) == 5)
-        canonname = records[0][3]
-    return tuple(fix_record(x, canonname) for x in records)
-
-
-# Lifted from requests' urllib3, which in turn lifted it from `socket.py`. Oy!
-def validating_create_connection(address,
-                       timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-                       source_address=None, socket_options=None,
-                       validator=None):
-    """Connect to *address* and return the socket object.
-
-    Convenience function.  Connect to *address* (a 2-tuple ``(host,
-    port)``) and return the socket object.  Passing the optional
-    *timeout* parameter will set the timeout on the socket instance
-    before attempting to connect.  If no *timeout* is supplied, the
-    global default timeout setting returned by :func:`getdefaulttimeout`
-    is used.  If *source_address* is set it must be a tuple of (host, port)
-    for the socket to bind as a source address before making the connection.
-    An host of '' or port 0 tells the OS to use the default.
-    """
-
-    host, port = address
-    # We can skip asking for the canon name if we're not doing hostname-based
-    # blacklisting.
-    need_canonname = False
-    if validator.hostname_blacklist:
-        need_canonname = True
-        # We check both the non-canonical and canonical hostnames so we can
-        # catch both of these:
-        # CNAME from nonblacklisted.com -> blacklisted.com
-        # CNAME from blacklisted.com -> nonblacklisted.com
-        if not validator.is_hostname_allowed(host):
-            raise UnacceptableAddressException(host)
-
-    err = None
-    addrinfo = advocate_getaddrinfo(host, port, get_canonname=need_canonname)
-    if addrinfo:
-        if validator.autodetect_local_addresses:
-            local_addresses = addrvalidator.determine_local_addresses()
-        else:
-            local_addresses = []
-        for res in addrinfo:
-            # Are we allowed to connect with this result?
-            if not validator.is_addrinfo_allowed(
-                res,
-                _local_addresses=local_addresses,
-            ):
-                continue
-            af, socktype, proto, canonname, sa = res
-            # Unparse the validated IP
-            sa = (sa[0].exploded,) + sa[1:]
-            sock = None
-            try:
-                sock = socket.socket(af, socktype, proto)
-
-                # If provided, set socket level options before connecting.
-                # This is the only addition urllib3 makes to this function.
-                _set_socket_options(sock, socket_options)
-
-                if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
-                    sock.settimeout(timeout)
-                if source_address:
-                    sock.bind(source_address)
-                sock.connect(sa)
-                return sock
-
-            except socket.error as _:
-                err = _
-                if sock is not None:
-                    sock.close()
-                    sock = None
-
-        if err is None:
-            # If we got here, none of the results were acceptable
-            err = UnacceptableAddressException(address)
-    if err is not None:
-        raise err
-    else:
-        raise socket.error("getaddrinfo returns an empty list")
-
-
-# TODO: Is there a better way to add this to multiple classes with different
-# base classes? I tried a mixin, but it used the base method instead.
-def _validating_new_conn(self):
-    """ Establish a socket connection and set nodelay settings on it.
-
-    :return: New socket connection.
-    """
-    extra_kw = {}
-    if self.source_address:
-        extra_kw['source_address'] = self.source_address
-
-    if self.socket_options:
-        extra_kw['socket_options'] = self.socket_options
-
-    try:
-        # Hack around HTTPretty's patched sockets
-        # TODO: some better method of hacking around it that checks if we
-        # _would have_ connected to a private addr?
-        conn_func = validating_create_connection
-        if socket.getaddrinfo.__module__.startswith("httpretty"):
-            conn_func = old_create_connection
-        else:
-            extra_kw["validator"] = self._validator
-
-        conn = conn_func(
-            (self.host, self.port),
-            self.timeout,
-            **extra_kw
-        )
-
-    except SocketTimeout:
-        raise ConnectTimeoutError(
-            self, "Connection to %s timed out. (connect timeout=%s)" %
-            (self.host, self.timeout))
-
-    return conn
-
-
-# Don't silently break if the private API changes across urllib3 versions
-assert(hasattr(HTTPConnection, '_new_conn'))
-assert(hasattr(HTTPSConnection, '_new_conn'))
-
-
-class ValidatingHTTPConnection(HTTPConnection):
-    _new_conn = _validating_new_conn
-
-    def __init__(self, *args, **kwargs):
-        self._validator = kwargs.pop("validator")
-        HTTPConnection.__init__(self, *args, **kwargs)
-
-
-class ValidatingHTTPSConnection(HTTPSConnection):
-    _new_conn = _validating_new_conn
-
-    def __init__(self, *args, **kwargs):
-        self._validator = kwargs.pop("validator")
-        HTTPSConnection.__init__(self, *args, **kwargs)

cps/cw_advocate/connectionpool.py

@@ -1,39 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-from urllib3 import HTTPConnectionPool, HTTPSConnectionPool
-
-from .connection import (
-    ValidatingHTTPConnection,
-    ValidatingHTTPSConnection,
-)
-
-# Don't silently break if the private API changes across urllib3 versions
-assert(hasattr(HTTPConnectionPool, 'ConnectionCls'))
-assert(hasattr(HTTPSConnectionPool, 'ConnectionCls'))
-assert(hasattr(HTTPConnectionPool, 'scheme'))
-assert(hasattr(HTTPSConnectionPool, 'scheme'))
-
-
-class ValidatingHTTPConnectionPool(HTTPConnectionPool):
-    scheme = 'http'
-    ConnectionCls = ValidatingHTTPConnection
-
-
-class ValidatingHTTPSConnectionPool(HTTPSConnectionPool):
-    scheme = 'https'
-    ConnectionCls = ValidatingHTTPSConnection

cps/cw_advocate/exceptions.py

@@ -1,39 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-class AdvocateException(Exception):
-    pass
-
-
-class UnacceptableAddressException(AdvocateException):
-    pass
-
-
-class NameserverException(AdvocateException):
-    pass
-
-
-class MountDisabledException(AdvocateException):
-    pass
-
-
-class ProxyDisabledException(NotImplementedError, AdvocateException):
-    pass
-
-
-class ConfigException(AdvocateException):
-    pass

cps/cw_advocate/poolmanager.py

@@ -1,61 +0,0 @@
-#
-# Copyright 2015 Jordan Milne
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Source: https://github.com/JordanMilne/Advocate
-
-import collections
-import functools
-
-from urllib3 import PoolManager
-from urllib3.poolmanager import _default_key_normalizer, PoolKey
-
-from .connectionpool import (
-    ValidatingHTTPSConnectionPool,
-    ValidatingHTTPConnectionPool,
-)
-
-pool_classes_by_scheme = {
-    "http": ValidatingHTTPConnectionPool,
-    "https": ValidatingHTTPSConnectionPool,
-}
-
-AdvocatePoolKey = collections.namedtuple('AdvocatePoolKey',
-                                         PoolKey._fields + ('key_validator',))
-
-
-def key_normalizer(key_class, request_context):
-    request_context = request_context.copy()
-    # TODO: add ability to serialize validator rules to dict,
-    # allowing pool to be shared between sessions with the same
-    # rules.
-    request_context["validator"] = id(request_context["validator"])
-    return _default_key_normalizer(key_class, request_context)
-
-
-key_fn_by_scheme = {
-    'http': functools.partial(key_normalizer, AdvocatePoolKey),
-    'https': functools.partial(key_normalizer, AdvocatePoolKey),
-}
-
-
-class ValidatingPoolManager(PoolManager):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Make sure the API hasn't changed
-        assert (hasattr(self, 'pool_classes_by_scheme'))
-
-        self.pool_classes_by_scheme = pool_classes_by_scheme
-        self.key_fn_by_scheme = key_fn_by_scheme.copy()

cps/db.py

@@ -23,7 +23,7 @@ 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
@@ -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, g, Flask
+from flask import flash
 
 from . import logger, ub, isoLanguages
 from .pagination import Pagination
@@ -102,16 +102,6 @@ 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__()
@@ -124,11 +114,7 @@ class Identifiers(Base):
         if format_type == 'amazon':
             return "Amazon"
         elif format_type.startswith("amazon_"):
-            label_amazon = "Amazon.{0}"
+            return "Amazon.{0}".format(format_type[7:])
-            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":
@@ -151,12 +137,6 @@ 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":
@@ -169,11 +149,7 @@ 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_'):
-            link_amazon = "https://amazon.{0}/dp/{1}"
+            return "https://amazon.{0}/dp/{1}".format(format_type[7:], self.val)
-            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":
@@ -197,15 +173,9 @@ class Identifiers(Base):
         elif format_type == "issn":
             return "https://portal.issn.org/resource/ISSN/{0}".format(self.val)
         elif format_type == "isfdb":
-            return "https://www.isfdb.org/cgi-bin/pl.cgi?{0}".format(self.val)
+            return "http://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:"):
@@ -540,25 +510,34 @@ class AlchemyEncoder(json.JSONEncoder):
 
 
 class CalibreDB:
+    _init = False
+    engine = None
     config = None
-    config_calibre_dir = None
+    session_factory = None
-    app_db_path = None
+    # This is a WeakSet so that references here don't keep other CalibreDB
+    # instances alive once they reach the end of their respective scopes
+    instances = WeakSet()
 
-    def __init__(self, _app: Flask=None):  # , expire_on_commit=True, init=False):
+    def __init__(self, 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_app(self, _app):
+    def init_db(self, expire_on_commit=True):
-        _app.teardown_appcontext(self.teardown)
+        if self._init:
+            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:
@@ -626,6 +605,8 @@ 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:
@@ -645,6 +626,7 @@ class CalibreDB:
                 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
@@ -652,30 +634,13 @@ 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, config_calibre_dir, app_db_path):
+    def update_config(cls, config):
         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()
@@ -687,17 +652,16 @@ class CalibreDB:
             return None
 
         try:
-            engine = create_engine('sqlite://',
+            cls.engine = create_engine('sqlite://',
                                        echo=False,
                                        isolation_level="SERIALIZABLE",
                                        connect_args={'check_same_thread': False},
                                        poolclass=StaticPool)
-            with engine.begin() as connection:
+            with cls.engine.begin() as connection:
-                connection.execute(text('PRAGMA cache_size = 10000;'))
                 connection.execute(text("attach database '{}' as calibre;".format(dbpath)))
                 connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
 
-            conn = engine.connect()
+            conn = cls.engine.connect()
             # conn.text_factory = lambda b: b.decode(errors = 'ignore') possible fix for #1302
         except Exception as ex:
             cls.config.invalidate(ex)
@@ -713,10 +677,13 @@ class CalibreDB:
                 log.error_or_exception(e)
                 return None
 
-        return scoped_session(sessionmaker(autocommit=False,
+        cls.session_factory = scoped_session(sessionmaker(autocommit=False,
-                                           autoflush=False,
+                                                          autoflush=True,
-                                           bind=engine, future=True))
+                                                          bind=cls.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()
@@ -913,8 +880,7 @@ class CalibreDB:
                 results = self.session.query(Authors).filter(Authors.sort == auth).all()
                 # ToDo: How to handle not found author name
                 if not len(results):
-                    book_id = entry.id if isinstance(entry, Books) else entry[0].id
+                    log.error("Author {} not found to display name in right order".format(auth))
-                    log.error("Author '{}' of book {} not found to display name in right order".format(auth, book_id))
                     # error = True
                     break
                 for r in results:
@@ -1081,11 +1047,43 @@ 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, config.config_calibre_dir, app_db_path)
+        self.update_config(config)
 
 
 def lcase(s):

cps/debug_info.py

@@ -23,10 +23,11 @@ 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
@@ -49,7 +50,7 @@ def assemble_logfiles(file_name):
         with open(f, 'rb') as fd:
             shutil.copyfileobj(fd, wfd)
     wfd.seek(0)
-    version = metadata("flask")["Version"]
+    version = importlib.metadata.version("flask")
     if int(version.split('.')[0]) < 2:
         return send_file(wfd,
                          as_attachment=True,
@@ -73,7 +74,7 @@ def send_debug():
         for fp in file_list:
             zf.write(fp, os.path.basename(fp))
     memory_zip.seek(0)
-    version = metadata("flask")["Version"]
+    version = importlib.metadata.version("flask")
     if int(version.split('.')[0]) < 2:
         return send_file(memory_zip,
                          as_attachment=True,

cps/dep_check.py

@@ -39,24 +39,8 @@ def load_dependencies(optional=False):
             with open(req_path, 'r') as f:
                 for line in f:
                     if not line.startswith('#') and not line == '\n' and not line.startswith('git'):
-                        res = re.match(r'(.*?)([<=>\s]+)([\d\.]+),?\s?([<=>\s]+)?([\d\.]+)?(?:\s?;\s?'
+                        res = re.match(r'(.*?)([<=>\s]+)([\d\.]+),?\s?([<=>\s]+)?([\d\.]+)?', line.strip())
-                                       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:
@@ -79,7 +63,7 @@ def dependency_check(optional=False):
     deps = load_dependencies(optional)
     for dep in deps:
         try:
-            dep_version_int = [int(x) if x.isnumeric() else 0 for x in dep[0].split('.')[:3]]
+            dep_version_int = [int(x) if x.isnumeric() else 0 for x in dep[0].split('.')]
             low_check = [int(x) for x in dep[3].split('.')]
             high_check = [int(x) for x in dep[5].split('.')]
         except AttributeError:

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, jsonify, make_response, Response
+from flask import Blueprint, request, flash, redirect, url_for, abort, 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
+from .cw_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError, InterfaceError
 from sqlalchemy.orm.exc import StaleDataError
 from sqlalchemy.sql.expression import func
@@ -76,7 +76,7 @@ def edit_required(f):
 @editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @user_login_required
 def delete_book_from_details(book_id):
-    return delete_book_from_table(book_id, "", True)
+    return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
 
 
 @editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
@@ -158,16 +158,16 @@ 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 make_response(jsonify(resp))
+                        return Response(json.dumps(resp), mimetype='application/json')
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
-                        return make_response(jsonify(resp))
+                        return Response(json.dumps(resp), mimetype='application/json')
             except (OperationalError, IntegrityError, StaleDataError) as e:
                 calibre_db.session.rollback()
                 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 make_response(jsonify(location=url_for("web.index")))
+        return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
     abort(404)
 
 
@@ -206,7 +206,7 @@ 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 make_response(jsonify(ret))
+    return json.dumps(ret)
 
 
 @editbook.route("/ajax/editbooks/<param>", methods=['POST'])
@@ -215,60 +215,73 @@ def table_get_custom_enum(c_id):
 def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
-    calibre_db.create_functions(config)
     sort_param = ""
     ret = ""
     try:
         if param == 'series_index':
             edit_book_series_index(vals['value'], book)
-            ret = make_response(jsonify(success=True, newValue=book.series_index))
+            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
         elif param == 'tags':
             edit_book_tags(vals['value'], book)
-            ret = make_response(jsonify(success=True, newValue=', '.join([tag.name for tag in book.tags])))
+            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
+                           mimetype='application/json')
         elif param == 'series':
             edit_book_series(vals['value'], book)
-            ret = make_response(jsonify(success=True, newValue=', '.join([serie.name for serie in book.series])))
+            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
+                           mimetype='application/json')
         elif param == 'publishers':
             edit_book_publisher(vals['value'], book)
-            ret = make_response(jsonify(success=True,
+            ret = Response(json.dumps({'success': True,
-                                       newValue=', '.join([publisher.name for publisher in book.publishers])))
+                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+                           mimetype='application/json')
         elif param == 'languages':
             invalid = list()
             edit_book_languages(vals['value'], book, invalid=invalid)
             if invalid:
-                ret = make_response(jsonify(success=False,
+                ret = Response(json.dumps({'success': False,
-                                           msg='Invalid languages in request: {}'.format(','.join(invalid))))
+                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
+                               mimetype='application/json')
             else:
                 lang_names = list()
                 for lang in book.languages:
                     lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
-                ret = make_response(jsonify(success=True, newValue=', '.join(lang_names)))
+                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+                               mimetype='application/json')
         elif param == 'author_sort':
             book.author_sort = vals['value']
-            ret = make_response(jsonify(success=True, newValue=book.author_sort))
+            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
+                           mimetype='application/json')
         elif param == 'title':
             sort_param = book.sort
             if handle_title_on_edit(book, vals.get('value', "")):
                 rename_error = helper.update_dir_structure(book.id, config.get_book_path())
                 if not rename_error:
-                    ret = make_response(jsonify(success=True, newValue=book.title))
+                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+                                   mimetype='application/json')
                 else:
-                    ret = make_response(jsonify(success=False, msg=rename_error))
+                    ret = Response(json.dumps({'success': False,
+                                               'msg': rename_error}),
+                                   mimetype='application/json')
         elif param == 'sort':
             book.sort = vals['value']
-            ret = make_response(jsonify(success=True,newValue=book.sort))
+            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
+                           mimetype='application/json')
         elif param == 'comments':
             edit_book_comments(vals['value'], book)
-            ret = make_response(jsonify(success=True, newValue=book.comments[0].text))
+            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
+                           mimetype='application/json')
         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:
-                ret = make_response(jsonify(
+                ret = Response(json.dumps({
-                    success=True,
+                    'success': True,
-                    newValue=' & '.join([author.replace('|', ',') for author in input_authors])))
+                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+                    mimetype='application/json')
             else:
-                ret = make_response(jsonify(success=False, msg=rename_error))
+                ret = Response(json.dumps({'success': False,
+                                           'msg': rename_error}),
+                               mimetype='application/json')
         elif param == 'is_archived':
             is_archived = change_archived_books(book.id, vals['value'] == "True",
                                                 message="Book {} archive bit set to: {}".format(book.id, vals['value']))
@@ -287,7 +300,8 @@ def edit_list_book(param):
             if vals['value'] in ["True", "False"]:
                 ret = ""
             else:
-                ret = make_response(jsonify(success=True, newValue=vals['value']))
+                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                               mimetype='application/json')
         else:
             return _("Parameter not found"), 400
         book.last_modified = datetime.now(timezone.utc)
@@ -300,8 +314,9 @@ def edit_list_book(param):
     except (OperationalError, IntegrityError, StaleDataError) as e:
         calibre_db.session.rollback()
         log.error_or_exception("Database error: {}".format(e))
-        ret = make_response(jsonify(success=False,
+        ret = Response(json.dumps({'success': False,
-                                   msg='Database error: {}'.format(e.orig if hasattr(e, "orig") else e)))
+                                   'msg': 'Database error: {}'.format(e.orig if hasattr(e, "orig") else e)}),
+                       mimetype='application/json')
     return ret
 
 
@@ -312,13 +327,13 @@ def get_sorted_entry(field, bookid):
         book = calibre_db.get_filtered_book(bookid)
         if book:
             if field == 'title':
-                return make_response(jsonify(sort=book.sort))
+                return json.dumps({'sort': book.sort})
             elif field == 'authors':
-                return make_response(jsonify(author_sort=book.author_sort))
+                return json.dumps({'author_sort': book.author_sort})
             if field == 'sort':
-                return make_response(jsonify(sort=book.title))
+                return json.dumps({'sort': book.title})
             if field == 'author_sort':
-                return make_response(jsonify(authors=" & ".join([a.name for a in calibre_db.order_authors([book])])))
+                return json.dumps({'authors': " & ".join([a.name for a in calibre_db.order_authors([book])])})
     return ""
 
 
@@ -334,7 +349,7 @@ def simulate_merge_list_book():
             from_book = []
             for book_id in vals:
                 from_book.append(calibre_db.get_book(book_id).title)
-            return make_response(jsonify({'to': to_book, 'from': from_book}))
+            return json.dumps({'to': to_book, 'from': from_book})
     return ""
 
 
@@ -372,7 +387,7 @@ def merge_list_book():
                                                         element.uncompressed_size,
                                                         to_name))
                     delete_book_from_table(from_book.id, "", True)
-                    return make_response(jsonify(success=True))
+                    return json.dumps({'success': True})
     return ""
 
 
@@ -412,11 +427,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 make_response(jsonify(success=False))
+                return json.dumps({'success': False})
 
             if config.config_use_google_drive:
                 gdriveutils.updateGdriveCalibreFromLocal()
-        return make_response(jsonify(success=True))
+        return json.dumps({'success': True})
     return ""
 
 
@@ -486,7 +501,6 @@ def do_edit_book(book_id, upload_formats=None):
                     modify_date = True
                     helper.replace_cover_thumbnail_cache(book.id)
                 else:
-                    edit_error = True
                     flash(error, category="error")
 
         # Add default series_index to book
@@ -544,7 +558,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 make_response(jsonify(resp))
+            return Response(json.dumps(resp), mimetype='application/json')
 
         if "detail_view" in to_save:
             return redirect(url_for('web.show_book', book_id=book.id))
@@ -753,17 +767,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, make_response(jsonify(location=url_for("web.index")))
+                return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
     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, make_response(jsonify(location=url_for("web.index")))
+            return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
     else:
         flash(_('File to be uploaded must have an extension'), category="error")
-        return None, make_response(jsonify(location=url_for("web.index")))
+        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
     # extract metadata from file
     try:
@@ -772,7 +786,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, make_response(jsonify(location=url_for("web.index")))
+        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
     return meta, None
 
 
@@ -844,7 +858,7 @@ def delete_whole_book(book_id, book):
 def render_delete_book_result(book_format, json_response, warning, book_id, location=""):
     if book_format:
         if json_response:
-            return jsonify([warning, {"location": url_for("edit-book.show_edit_book", book_id=book_id),
+            return json.dumps([warning, {"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                          "type": "success",
                                          "format": book_format,
                                          "message": _('Book Format Successfully Deleted')}])
@@ -853,7 +867,7 @@ def render_delete_book_result(book_format, json_response, warning, book_id, loca
             return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
     else:
         if json_response:
-            return jsonify([warning, {"location": get_redirect_location(location, "web.index"),
+            return json.dumps([warning, {"location": get_redirect_location(location, "web.index"),
                                          "type": "success",
                                          "format": book_format,
                                          "message": _('Book Successfully Deleted')}])
@@ -871,7 +885,7 @@ def delete_book_from_table(book_id, book_format, json_response, location=""):
                 result, error = helper.delete_book(book, config.get_book_path(), book_format=book_format.upper())
                 if not result:
                     if json_response:
-                        return jsonify([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
+                        return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                             "type": "danger",
                                             "format": "",
                                             "message": error}])
@@ -898,7 +912,7 @@ def delete_book_from_table(book_id, book_format, json_response, location=""):
                 log.error_or_exception(ex)
                 calibre_db.session.rollback()
                 if json_response:
-                    return jsonify([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
+                    return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                         "type": "danger",
                                         "format": "",
                                         "message": ex}])
@@ -912,7 +926,7 @@ def delete_book_from_table(book_id, book_format, json_response, location=""):
         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 jsonify({"location": url_for("edit-book.show_edit_book", book_id=book_id),
+        return json.dumps({"location": url_for("edit-book.show_edit_book", book_id=book_id),
                            "type": "danger",
                            "format": "",
                            "message": message})

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, UnicodeDecodeError) as e:
+    except (etree.XMLSyntaxError, KeyError, IndexError, OSError) as e:
         log.error("Could not parse epub metadata of book {} during kobo sync: {}".format(book.id, e))
         layout = []
 

cps/error_handler.py

@@ -37,31 +37,17 @@ def error_http(error):
                            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
 
 
 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
     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"),
                            instance=config.config_calibre_web_title

cps/file_helper.py

@@ -34,15 +34,6 @@ 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):
@@ -63,7 +54,7 @@ def validate_mime_type(file_buffer, allowed_extensions):
     allowed_mimetypes = list()
     for x in allowed_extensions:
         try:
-            allowed_mimetypes.append(get_mimetype("." + x))
+            allowed_mimetypes.append(mimetypes.types_map["." + x])
         except KeyError:
             log.error("Unkown mimetype for Extension: {}".format(x))
     tmp_mime_type = mime.from_buffer(file_buffer.read())

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, request
+from flask import send_from_directory, make_response, abort, url_for, Response
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
 from flask_babel import get_locale
@@ -43,10 +43,10 @@ from markupsafe import escape
 from urllib.parse import quote
 
 try:
-    from . import cw_advocate
+    import advocate
-    from .cw_advocate.exceptions import UnacceptableAddressException
+    from advocate.exceptions import UnacceptableAddressException
     use_advocate = True
-except ImportError as e:
+except ImportError:
     use_advocate = False
     advocate = requests
     UnacceptableAddressException = MissingSchema = BaseException
@@ -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', 'KEPUB', 'CBZ', 'CBT', 'CBR', 'DJVU', 'DJV'}
+    extensions_reader = {'TXT', 'PDF', 'EPUB', '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, force_unidecode=False):
+def get_valid_filename(value, replace_whitespace=True, chars=128):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
@@ -245,7 +245,7 @@ def get_valid_filename(value, replace_whitespace=True, chars=128, force_unidecod
     if value[-1:] == '.':
         value = value[:-1]+'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
-    if config.config_unicode_filename or force_unidecode:
+    if config.config_unicode_filename:
         value = (unidecode.unidecode(value))
     if replace_whitespace:
         #  *+:\"/<>? are replaced by _
@@ -418,6 +418,8 @@ def rename_author_path(first_author, old_author_dir, renamed_author, calibre_pat
     # Create new_author_dir from parameter or from database
     # Create new title_dir from database and add id
     new_authordir = get_valid_filename(first_author, chars=96)
+    # new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == renamed_author).first()
+    # old_author_dir = get_valid_filename(old_author_name, chars=96)
     new_author_rename_dir = get_valid_filename(renamed_author, chars=96)
     if gdrive:
         g_file = gd.getFileFromEbooksFolder(None, old_author_dir)
@@ -466,6 +468,7 @@ def update_dir_structure_file(book_id, calibre_path, original_filepath, new_auth
                                      db_filename,
                                      original_filepath,
                                      path)
+        # old_path = os.path.join(calibre_path, author_dir, new_title_dir).replace('\\', '/')
         new_path = os.path.join(calibre_path, new_author_dir, new_title_dir).replace('\\', '/')
         all_new_name = get_valid_filename(local_book.title, chars=42) + ' - ' \
                        + get_valid_filename(new_author, chars=42)
@@ -474,6 +477,8 @@ def update_dir_structure_file(book_id, calibre_path, original_filepath, new_auth
 
         if error:
             return error
+
+    # Rename all files from old names to new names
     return False
 
 
@@ -485,7 +490,7 @@ def upload_new_file_gdrive(book_id, first_author, title, title_dir, original_fil
                                title_dir + " (" + str(book_id) + ")")
     book.path = gdrive_path.replace("\\", "/")
     gd.uploadFileToEbooksFolder(os.path.join(gdrive_path, file_name).replace("\\", "/"), original_filepath)
-    return False
+    return False # rename_files_on_change(first_author, renamed_author, local_book=book, gdrive=True)
 
 
 def update_dir_structure_gdrive(book_id, first_author):
@@ -513,26 +518,24 @@ 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
+    # change location in database to new author/title path
+    # book.path = os.path.join(authordir, new_titledir).replace('\\', '/')
     return False
 
 
 def move_files_on_change(calibre_path, new_author_dir, new_titledir, localbook, db_filename, original_filepath, path):
     new_path = os.path.join(calibre_path, new_author_dir, new_titledir)
+    # new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_author_dir
     try:
         if original_filepath:
             if not os.path.isdir(new_path):
                 os.makedirs(new_path)
-            try:
             shutil.move(original_filepath, os.path.join(new_path, db_filename))
-            except OSError:
-                log.error("Rename title from {} to {} failed with error, trying to "
-                          "move without metadata".format(path, new_path))
-                shutil.move(original_filepath, os.path.join(new_path, db_filename), copy_function=shutil.copy)
             log.debug("Moving title: %s to %s", original_filepath, new_path)
         else:
             # Check new path is not valid path
@@ -841,7 +844,7 @@ def save_cover_from_url(url, book_path):
         if cli_param.allow_localhost:
             img = requests.get(url, timeout=(10, 200), allow_redirects=False)  # ToDo: Error Handling
         elif use_advocate:
-            img = cw_advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
+            img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
         else:
             log.error("python module advocate is not installed but is needed")
             return False, _("Python module 'advocate' is not installed but is needed for cover uploads")
@@ -905,7 +908,7 @@ def save_cover(img, book_path):
             else:
                 imgc = Image(blob=io.BytesIO(img.content))
             imgc.format = 'jpeg'
-            imgc.transform_colorspace("srgb")
+            imgc.transform_colorspace("rgb")
             img = imgc
         except (BlobError, MissingDelegateError):
             log.error("Invalid cover file content")
@@ -974,8 +977,7 @@ def do_download_file(book, book_format, client, data, headers):
     # ToDo Check headers parameter
     for element in headers:
         response.headers[element[0]] = element[1]
-    log.info('Downloading file: \'%s\' by %s - %s', format(os.path.join(filename, book_name + "." + book_format)),
+    log.info('Downloading file: {}'.format(os.path.join(filename, book_name + "." + book_format)))
-             current_user.name, request.headers.get('X-Forwarded-For', request.remote_addr))
     return response
 
 
@@ -1105,14 +1107,11 @@ 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
-            if client == "kindle":
+            file_name = get_valid_filename(file_name, replace_whitespace=False)
-                file_name = get_valid_filename(file_name, replace_whitespace=False, force_unidecode=True)
-            else:
-                file_name = quote(get_valid_filename(file_name, replace_whitespace=False))
             headers = Headers()
             headers["Content-Type"] = mimetypes.types_map.get('.' + book_format, "application/octet-stream")
-            headers["Content-Disposition"] = ('attachment; filename="{}.{}"; filename*=UTF-8\'\'{}.{}').format(
+            headers["Content-Disposition"] = "attachment; filename=%s.%s; filename*=UTF-8''%s.%s" % (
-                file_name, book_format, file_name, book_format)
+                quote(file_name), book_format, quote(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/isoLanguages.py

@@ -25,7 +25,20 @@ log = logger.create()
 
 
 try:
+    from iso639 import languages
+    # iso_version = importlib.metadata.version("iso639")
+    get = languages.get
+    try:
+        if sys.version_info >= (3, 12):
+            import pkg_resources
+    except ImportError:
+        print("Python 3.12 isn't compatible with iso-639. Please install pycountry.")
+except ImportError as ex:
     from pycountry import languages as pyc_languages
+    #try:
+    #    iso_version = importlib.metadata.version("pycountry") + ' (PyCountry)'
+    #except (ImportError, Exception):
+    #    iso_version = "?" + ' (PyCountry)'
 
     def _copy_fields(l):
         l.part1 = getattr(l, 'alpha_2', None)
@@ -39,11 +52,6 @@ try:
             return _copy_fields(pyc_languages.get(alpha_2=part1))
         if name is not None:
             return _copy_fields(pyc_languages.get(name=name))
-except ImportError as ex:
-    if sys.version_info >= (3, 12):
-        print("Python 3.12 isn't compatible with iso-639. Please install pycountry.")
-    from iso639 import languages
-    get = languages.get
 
 
 def get_language_names(locale):
@@ -101,6 +109,6 @@ def get_lang3(lang):
             ret_value = lang
         else:
             ret_value = ""
-    except (KeyError, AttributeError):
+    except KeyError:
         ret_value = lang
     return ret_value

cps/iso_language_names.py

@@ -12,384 +12,6 @@
 # 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",
@@ -8516,384 +8138,6 @@ LANGUAGE_NAMES = {
         "zul": "Zulu",
         "zun": "Zuni"
     },
-    "sl": {
-        "abk": "abhazijski",
-        "ace": "achinese",
-        "ach": "Acoli",
-        "ada": "Adangme",
-        "ady": "Adyghe",
-        "aar": "afarski",
-        "afh": "Afrihili",
-        "afr": "afrikanski",
-        "ain": "Ainu (Japan)",
-        "aka": "Akan",
-        "akk": "akadski",
-        "sqi": "albanščina",
-        "ale": "aleutski",
-        "amh": "amharski",
-        "anp": "Angika",
-        "ara": "arabski",
-        "arg": "aragonski",
-        "arp": "Arapaho",
-        "arw": "araukanski",
-        "hye": "armenščina",
-        "asm": "asamski",
-        "ast": "Asturian",
-        "ava": "avarski",
-        "ave": "avestijski jeziki",
-        "awa": "Awadhi",
-        "aym": "Aymara",
-        "aze": "azerbajdžanski",
-        "ban": "balijščina",
-        "bal": "belučijski",
-        "bam": "bambarski",
-        "bas": "Basa (Cameroon)",
-        "bak": "baškirski",
-        "eus": "baskovščina",
-        "bej": "Beja",
-        "bel": "beloruščina",
-        "bem": "Bemba (Zambia)",
-        "ben": "bengalščina",
-        "bit": "Berinomo",
-        "bho": "Bhojpuri",
-        "bik": "bikolščina",
-        "byn": "Bilin",
-        "bin": "Bini",
-        "bis": "bislama",
-        "zbl": "Blissymbols",
-        "bos": "bošnjaščina",
-        "bra": "Braj",
-        "bre": "bretonščina",
-        "bug": "buginščina",
-        "bul": "bolgarščina",
-        "bua": "burjatščina",
-        "mya": "burmanščina",
-        "cad": "kadajščina?",
-        "cat": "katalonščina",
-        "ceb": "cebuanščina",
-        "chg": "Chagatai",
-        "cha": "čamorščina",
-        "che": "čečenščina",
-        "chr": "čerokeščina",
-        "chy": "čejenščina",
-        "chb": "čibčevščina",
-        "zho": "kitajščina",
-        "chn": "Chinook jargon",
-        "chp": "čipevščina",
-        "cho": "Choctaw",
-        "cht": "Cholón",
-        "chk": "Chuukese",
-        "chv": "čuvaščina",
-        "cop": "koptščina",
-        "cor": "kornijščina",
-        "cos": "korzijščina",
-        "cre": "krijščina",
-        "mus": "Creek",
-        "hrv": "hrvaščina",
-        "ces": "češčina",
-        "dak": "Dakota",
-        "dan": "danski",
-        "dar": "Dargwa",
-        "del": "Delaware",
-        "div": "Dhivehi",
-        "din": "Dinka",
-        "doi": "Dogri (macrolanguage)",
-        "dgr": "Dogrib",
-        "dua": "Duala",
-        "nld": "nizozemščina",
-        "dse": "Dutch Sign Language",
-        "dyu": "Dyula",
-        "dzo": "dzongkha",
-        "efi": "Efik",
-        "egy": "egipčanski",
-        "eka": "Ekajuk",
-        "elx": "elamščina",
-        "eng": "angleščina",
-        "enu": "Enu",
-        "myv": "Erzya",
-        "epo": "esperanto",
-        "est": "estonščina",
-        "ewe": "evenščina",
-        "ewo": "Ewondo",
-        "fan": "Fang (Equatorial Guinea)",
-        "fat": "Fanti",
-        "fao": "ferščina",
-        "fij": "fidžijščina",
-        "fil": "Filipino",
-        "fin": "finščina",
-        "fon": "Fon",
-        "fra": "francoščina",
-        "fur": "furlanščina",
-        "ful": "fulščina",
-        "gaa": "Ga",
-        "glg": "Galician",
-        "lug": "Ganda",
-        "gay": "gajščina?",
-        "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
-        "gez": "etiopščina?",
-        "kat": "gruzinščina",
-        "deu": "nemški",
-        "gil": "gilbertščina",
-        "gon": "Gondi",
-        "gor": "Gorontalo",
-        "got": "gotščina",
-        "grb": "Grebo",
-        "grn": "gvaranijščina",
-        "guj": "gudžaratščina",
-        "gwi": "Gwichʼin",
-        "hai": "haidščina",
-        "hau": "havščina",
-        "haw": "havajščina",
-        "heb": "hebrejščina",
-        "her": "Herero",
-        "hil": "hilingajnonščina",
-        "hin": "hindijščina",
-        "hmo": "hiri motu",
-        "hit": "hetitščina",
-        "hmn": "hmonščina; miaojščina",
-        "hun": "madžarščina",
-        "hup": "hupščina",
-        "iba": "ibanščina",
-        "isl": "islandščina",
-        "ido": "Ido",
-        "ibo": "Igbo",
-        "ilo": "Iloko",
-        "ind": "indonezijščina",
-        "inh": "inguščina",
-        "ina": "interlingva",
-        "ile": "Interlingue",
-        "iku": "inuktituščina",
-        "ipk": "Inupiaq",
-        "gle": "irščina",
-        "ita": "italijanščina",
-        "jpn": "japonščina",
-        "jav": "javanščina",
-        "jrb": "Judeo-Arabic",
-        "jpr": "Judeo-Persian",
-        "kbd": "kabardinščina",
-        "kab": "Kabyle",
-        "kac": "Kachin",
-        "kal": "Kalaallisut",
-        "xal": "Kalmyk",
-        "kam": "Kamba (Kenya)",
-        "kan": "kanareščina",
-        "kau": "Kanuri",
-        "kaa": "Kara-Kalpak",
-        "krc": "Karachay-Balkar",
-        "krl": "Karelian",
-        "kas": "kašmirščina",
-        "csb": "Kashubian",
-        "kaw": "kavi",
-        "kaz": "kazaščina",
-        "kha": "Khasi",
-        "kho": "Khotanese",
-        "kik": "kikujščina",
-        "kmb": "Kimbundu",
-        "kin": "Kinyarwanda",
-        "kir": "kirgiščina",
-        "tlh": "Klingon",
-        "kom": "komijščina",
-        "kon": "Kongo",
-        "kok": "Konkani (macrolanguage)",
-        "kor": "korejščina",
-        "kos": "Kosraean",
-        "kpe": "Kpelle",
-        "kua": "Kuanyama",
-        "kum": "kumiščina",
-        "kur": "kurdščina",
-        "kru": "Kurukh",
-        "kut": "kutenajščina",
-        "lad": "ladinščina",
-        "lah": "Lahnda",
-        "lam": "Lamba",
-        "lao": "laoščina",
-        "lat": "latinščina",
-        "lav": "latvijščina",
-        "lez": "lezginščina",
-        "lim": "Limburgan",
-        "lin": "lingala",
-        "lit": "litvanščina",
-        "jbo": "Lojban",
-        "loz": "Lozi",
-        "lub": "Luba-Katanga",
-        "lua": "lubalulujščina",
-        "lui": "Luiseno",
-        "smj": "Lule Sami",
-        "lun": "Lunda",
-        "luo": "Luo (Kenya and Tanzania)",
-        "lus": "Lushai",
-        "ltz": "Luxembourgish",
-        "mkd": "makedonščina",
-        "mad": "madurščina",
-        "mag": "Magahi",
-        "mai": "Maithili",
-        "mak": "makasarščina",
-        "mlg": "malgaščina",
-        "msa": "Malay (macrolanguage)",
-        "mal": "malajalščina",
-        "mlt": "malteščina",
-        "mnc": "Manchu",
-        "mdr": "Mandar",
-        "man": "Mandingo",
-        "mni": "manipurščina",
-        "glv": "manska gelščina",
-        "mri": "maorščina",
-        "arn": "Mapudungun",
-        "mar": "maratščina",
-        "chm": "Mari (Russia)",
-        "mah": "Marshallese",
-        "mwr": "Marwari",
-        "mas": "masajščina",
-        "men": "Mende (Sierra Leone)",
-        "mic": "Mi'kmaq",
-        "min": "Minangkabau",
-        "mwl": "Mirandese",
-        "moh": "mohoščina",
-        "mdf": "Moksha",
-        "lol": "Mongo",
-        "mon": "mongolščina",
-        "mos": "mosanščina",
-        "mul": "Več jezikov",
-        "nqo": "N'Ko",
-        "nau": "Nauru",
-        "nav": "navaščina",
-        "ndo": "Ndonga",
-        "nap": "napolitanščina",
-        "nia": "niaščina",
-        "niu": "niuejščina",
-        "zxx": "No linguistic content",
-        "nog": "Nogai",
-        "nor": "norveščina",
-        "nob": "Norwegian Bokmål",
-        "nno": "norveščina; 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": "palavanščina",
-        "pli": "Pali",
-        "pam": "Pampanga",
-        "pag": "pangasinanščina",
-        "pan": "Panjabi",
-        "pap": "papiamentu",
-        "fas": "perzijščina",
-        "phn": "feničanščina",
-        "pon": "Pohnpeian",
-        "pol": "poljščina",
-        "por": "portugalđščina",
-        "pus": "paštu",
-        "que": "Quechua",
-        "raj": "radžastanščina",
-        "rap": "rapanujščina",
-        "ron": "romunščina",
-        "roh": "Romansh",
-        "rom": "romščina",
-        "run": "rundščina",
-        "rus": "ruščina",
-        "smo": "samoanščina",
-        "sad": "Sandawe",
-        "sag": "Sango",
-        "san": "sanskrt",
-        "sat": "santalščina",
-        "srd": "sardinščina",
-        "sas": "Sasak",
-        "sco": "škotščina",
-        "sel": "selkupščina",
-        "srp": "srbščina",
-        "srr": "Serer",
-        "shn": "šanščina",
-        "sna": "šonščina",
-        "scn": "sicilijanščina",
-        "sid": "Sidamo",
-        "bla": "Siksika",
-        "snd": "sindščina",
-        "sin": "Sinhala",
-        "den": "Slave (Athapascan)",
-        "slk": "slovaščina",
-        "slv": "slovenščina",
-        "sog": "Sogdian",
-        "som": "Somali",
-        "snk": "Soninke",
-        "spa": "španščina",
-        "srn": "Sranan Tongo",
-        "suk": "Sukuma",
-        "sux": "sumerščina",
-        "sun": "sundščina",
-        "sus": "susuamijščina?",
-        "swa": "Swahili (macrolanguage)",
-        "ssw": "svazijščina?",
-        "swe": "švedščina",
-        "syr": "sirščina",
-        "tgl": "tagaloščina",
-        "tah": "tahitijščina",
-        "tgk": "tadžiščina",
-        "tmh": "Tamashek",
-        "tam": "tamilščina",
-        "tat": "tatarščina",
-        "tel": "Telugu",
-        "ter": "Tereno",
-        "tet": "Tetum",
-        "tha": "tajščina",
-        "bod": "tibetanščina",
-        "tig": "Tigre",
-        "tir": "Tigrinya",
-        "tem": "Timne",
-        "tiv": "Tiv",
-        "tli": "Tlingit",
-        "tpi": "tok pisin",
-        "tkl": "Tokelau",
-        "tog": "Tonga (Nyasa)",
-        "ton": "tonganščina",
-        "tsi": "tsimšijščina",
-        "tso": "Tsonga",
-        "tsn": "Tswana",
-        "tum": "Tumbuka",
-        "tur": "turščina",
-        "tuk": "turkmenščina",
-        "tvl": "tuvalujščina",
-        "tyv": "Tuvinian",
-        "twi": "Twi",
-        "udm": "Udmurt",
-        "uga": "ugaritščina",
-        "uig": "ujgurščina",
-        "ukr": "ukrajinščina",
-        "umb": "Umbundu",
-        "mis": "Uncoded languages",
-        "und": "nedoločen",
-        "urd": "urdujščina",
-        "uzb": "uzbeščina",
-        "vai": "vajščina",
-        "ven": "Venda",
-        "vie": "vietnamščina",
-        "vol": "Volapük",
-        "vot": "votjaščina",
-        "wln": "valonščina",
-        "war": "Waray (Philippines)",
-        "was": "Washo",
-        "cym": "valižanščina",
-        "wal": "Wolaytta",
-        "wol": "Wolof",
-        "xho": "koščina",
-        "sah": "jakutščina",
-        "yao": "jaojščina",
-        "yap": "Yapese",
-        "yid": "jidiš",
-        "yor": "jorubščina",
-        "zap": "Zapotec",
-        "zza": "Zaza",
-        "zen": "Zenaga",
-        "zha": "Zhuang",
-        "zul": "zulujščina",
-        "zun": "Zuni"
-    },
     "sv": {
         "aar": "Afar",
         "abk": "Abchaziska",

cps/jinjia.py

@@ -113,14 +113,26 @@ def yesno(value, yes, no):
 
 @jinjia.app_template_filter('formatfloat')
 def formatfloat(value, decimals=1):
-    if not value or (isinstance(value, str) and not value.is_numeric()):
+    value = 0 if not value else value
-        return value
     formated_value = ('{0:.' + str(decimals) + 'f}').format(value)
     if formated_value.endswith('.' + "0" * decimals):
         formated_value = formated_value.rstrip('0').rstrip('.')
     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))

cps/kobo.py

@@ -106,12 +106,10 @@ def make_request_to_kobo_store(sync_token=None):
     return store_response
 
 
-def redirect_or_proxy_request(auth=False):
+def redirect_or_proxy_request():
     if config.config_kobo_proxy:
-        try:
         if request.method == "GET":
-                alfa = redirect(get_store_url_for_current_request(), 307)
+            return redirect(get_store_url_for_current_request(), 307)
-                return alfa
         else:
             # The Kobo device turns other request types into GET requests on redirects,
             # so we instead proxy to the Kobo store ourselves.
@@ -124,10 +122,7 @@ def redirect_or_proxy_request(auth=False):
             return make_response(
                 store_response.content, store_response.status_code, response_headers.items()
             )
-        except Exception as e:
+    else:
-            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({}))
 
 
@@ -328,7 +323,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
@@ -428,7 +423,7 @@ def get_series(book):
 
 
 def get_seriesindex(book):
-    return book.series_index if isinstance(book.series_index, float) else 1
+    return book.series_index or 1
 
 
 def get_language(book):
@@ -491,7 +486,6 @@ def get_metadata(book):
 
     if get_series(book):
         name = get_series(book)
-        try:
         metadata["Series"] = {
             "Name": get_series(book),
             "Number": get_seriesindex(book),        # ToDo Check int() ?
@@ -499,8 +493,7 @@ def get_metadata(book):
             # Get a deterministic id based on the series name.
             "Id": str(uuid.uuid3(uuid.NAMESPACE_DNS, name)),
         }
-        except Exception as e:
+
-            print(e)
     return metadata
 
 
@@ -732,7 +725,7 @@ def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
     ub.session_commit()
 
 
-# Creates a Kobo "Tag" object from an ub.Shelf object
+# Creates a Kobo "Tag" object from a ub.Shelf object
 def create_kobo_tag(shelf):
     tag = {
         "Created": convert_to_kobo_timestamp_string(shelf.created),
@@ -960,8 +953,7 @@ def HandleBookDeletionRequest(book_uuid):
 
 # TODO: Implement the following routes
 @csrf.exempt
-@kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET", "POST"])
+@kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET"])
-@kobo.route("/v1/library/<dummy>/preview", methods=["POST"])
 def HandleUnimplementedRequest(dummy=None):
     log.debug("Unimplemented Library Request received: %s (request is forwarded to kobo if configured)",
               request.base_url)
@@ -1048,7 +1040,7 @@ def HandleAuthRequest():
     log.debug('Kobo Auth request')
     if config.config_kobo_proxy:
         try:
-            return redirect_or_proxy_request(auth=True)
+            return redirect_or_proxy_request()
         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()
@@ -1132,37 +1124,25 @@ def download_book(book_id, book_format):
 
 def NATIVE_KOBO_RESOURCES():
     return {
-        "account_page": "https://www.kobo.com/account/settings",
+        "account_page": "https://secure.kobobooks.com/profile",
         "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": {
+        "blackstone_header": {"key": "x-amz-request-payer", "value": "requester"},
-            "key": "x-amz-request-payer",
-            "value": "requester"
-        },
         "book": "https://storeapi.kobo.com/v1/products/books/{ProductId}",
-        "book_detail_page": "https://www.kobo.com/{region}/{language}/ebook/{slug}",
+        "book_detail_page": "https://store.kobobooks.com/{culture}/ebook/{slug}",
-        "book_detail_page_rakuten": "http://books.rakuten.co.jp/rk/{crossrevisionid}",
+        "book_detail_page_rakuten": "https://books.rakuten.co.jp/rk/{crossrevisionid}",
-        "book_landing_page": "https://www.kobo.com/ebooks",
+        "book_landing_page": "https://store.kobobooks.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://www.kobo.com/ebooks/categories",
+        "categories_page": "https://store.kobobooks.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",
@@ -1173,109 +1153,92 @@ 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://ereaderfiles.kobo.com",
+        "dictionary_host": "https://kbdownload1-a.akamaihd.net",
         "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": "https://authorize.kobo.com/signin/provider/Facebook/login?returnUrl=http://kobo.com/",
+        "facebook_sso_page":
+            "https://authorize.kobo.com/signin/provider/Facebook/login?returnUrl=http://store.kobobooks.com/",
         "featured_list": "https://storeapi.kobo.com/v1/products/featured/{FeaturedListId}",
         "featured_lists": "https://storeapi.kobo.com/v1/products/featured",
         "free_books_page": {
             "EN": "https://www.kobo.com/{region}/{language}/p/free-ebooks",
             "FR": "https://www.kobo.com/{region}/{language}/p/livres-gratuits",
             "IT": "https://www.kobo.com/{region}/{language}/p/libri-gratuiti",
-            "NL": "https://www.kobo.com/{region}/{language}/List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
+            "NL": "https://www.kobo.com/{region}/{language}/"
-            "PT": "https://www.kobo.com/{region}/{language}/p/livros-gratis"
+                  "List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
+            "PT": "https://www.kobo.com/{region}/{language}/p/livros-gratis",
         },
         "fte_feedback": "https://storeapi.kobo.com/v1/products/ftefeedback",
-        "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",
-        "gpb_flow_enabled": "False",
+        "help_page": "https://www.kobo.com/help",
-        "help_page": "http://www.kobo.com/help",
+        "kobo_audiobooks_enabled": "False",
-        "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",
-        "kobo_audiobooks_credit_redemption": "False",
-        "kobo_audiobooks_enabled": "True",
         "kobo_audiobooks_orange_deal_enabled": "False",
         "kobo_audiobooks_subscriptions_enabled": "False",
-        "kobo_display_price": "True",
+        "kobo_nativeborrow_enabled": "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": "True",
+        "kobo_subscriptions_enabled": "False",
-        "kobo_superpoints_enabled": "True",
+        "kobo_superpoints_enabled": "False",
         "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_search": "https://storeapi.kobo.com/v1/library/search",
+        "library_stack": "https://storeapi.kobo.com/v1/user/library/stacks/{LibraryItemId}",
         "library_sync": "https://storeapi.kobo.com/v1/library/sync",
-        "love_dashboard_page": "https://www.kobo.com/{region}/{language}/kobosuperpoints",
+        "love_dashboard_page": "https://store.kobobooks.com/{culture}/kobosuperpoints",
-        "love_points_redemption_page": "https://www.kobo.com/{region}/{language}/KoboSuperPointsRedemption?productId={ProductId}",
+        "love_points_redemption_page":
-        "magazine_landing_page": "https://www.kobo.com/emagazines",
+            "https://store.kobobooks.com/{culture}/KoboSuperPointsRedemption?productId={ProductId}",
-        "more_sign_in_options": "https://authorize.kobo.com/signin?returnUrl=http://kobo.com/#allProviders",
+        "magazine_landing_page": "https://store.kobobooks.com/emagazines",
-        "notebooks": "https://storeapi.kobo.com/api/internal/notebooks",
         "notifications_registration_issue": "https://storeapi.kobo.com/v1/notifications/registration",
         "oauth_host": "https://oauth.kobo.com",
-        "password_retrieval_page": "https://www.kobo.com/passwordretrieval.html",
+        "overdrive_account": "https://auth.overdrive.com/account",
-        "personalizedrecommendations": "https://storeapi.kobo.com/v2/users/personalizedrecommendations",
+        "overdrive_library": "https://{libraryKey}.auth.overdrive.com/library",
-        "pocket_link_account_start": "https://authorize.kobo.com/{region}/{language}/linkpocket",
+        "overdrive_library_finder_host": "https://libraryfinder.api.overdrive.com",
+        "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",
-        "productsv2": "https://storeapi.kobo.com/v2/products",
+        "provider_external_sign_in_page":
-        "provider_external_sign_in_page": "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://kobo.com/",
+            "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://store.kobobooks.com/",
+        "purchase_buy": "https://www.kobo.com/checkout/createpurchase/",
+        "purchase_buy_templated": "https://www.kobo.com/{culture}/checkout/createpurchase/{ProductId}",
         "quickbuy_checkout": "https://storeapi.kobo.com/v1/store/quickbuy/{PurchaseId}/checkout",
         "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://www.kobo.com",
+        "redeem_interstitial_page": "https://store.kobobooks.com",
-        "registration_page": "https://authorize.kobo.com/signup?returnUrl=http://kobo.com/",
+        "registration_page": "https://authorize.kobo.com/signup?returnUrl=http://store.kobobooks.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://kobo.com/",
+        "sign_in_page": "https://authorize.kobo.com/signin?returnUrl=http://store.kobobooks.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": "www.kobo.com",
+        "store_host": "store.kobobooks.com",
-        "store_newreleases": "https://www.kobo.com/{region}/{language}/List/new-releases/961XUjtsU0qxkFItWOutGA",
+        "store_newreleases": "https://store.kobobooks.com/{culture}/List/new-releases/961XUjtsU0qxkFItWOutGA",
-        "store_search": "https://www.kobo.com/{region}/{language}/Search?Query={query}",
+        "store_search": "https://store.kobobooks.com/{culture}/Search?Query={query}",
-        "store_top50": "https://www.kobo.com/{region}/{language}/ebooks/Top",
+        "store_top50": "https://store.kobobooks.com/{culture}/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": "True",
+        "use_one_store": "False",
         "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",
@@ -1283,6 +1246,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://ereaderfiles.kobo.com",
+        "userguide_host": "https://kbdownload1-a.akamaihd.net",
-        "wishlist_page": "https://www.kobo.com/{region}/{language}/account/wishlist"
+        "wishlist_page": "https://store.kobobooks.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 log in to a Kobo (or affiliate) account.
+When first booting a Kobo device the user must sign into 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

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 {%(filename)s:%(lineno)d} %(message)s")
+FORMATTER           = Formatter("[%(asctime)s] %(levelname)5s {%(name)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,12 +42,18 @@ logging.addLevelName(logging.CRITICAL, "CRIT")
 
 class _Logger(logging.Logger):
 
-    def error_or_exception(self, message, stacklevel=1, *args, **kwargs):
+    def error_or_exception(self, message, stacklevel=2, *args, **kwargs):
         is_debug = self.getEffectiveLevel() <= logging.DEBUG
-        if not is_debug:
+        if sys.version_info > (3, 7):
+            if is_debug:
                 self.exception(message, stacklevel=stacklevel, *args, **kwargs)
             else:
                 self.error(message, stacklevel=stacklevel, *args, **kwargs)
+        else:
+            if is_debug:
+                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/metadata_provider/amazon.py

@@ -38,16 +38,14 @@ class Amazon(Metadata):
     __name__ = "Amazon"
     __id__ = "amazon"
     headers = {'upgrade-insecure-requests': '1',
-               'user-agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:130.0) Gecko/20100101 Firefox/130.0',
+               'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36',
-               'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8',
+               'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
-               'Sec-Fetch-Site': 'same-origin',
+               'sec-gpc': '1',
-               'Sec-Fetch-Mode': 'navigate',
+               'sec-fetch-site': 'none',
-               'Sec-Fetch-User': '?1',
+               'sec-fetch-mode': 'navigate',
-               'Sec-Fetch-Dest': 'document',
+               'sec-fetch-user': '?1',
-               'Upgrade-Insecure-Requests': '1',
+               'sec-fetch-dest': 'document',
-               'Alt-Used' : 'www.amazon.com',
+               'accept-encoding': 'gzip, deflate, br',
-               'Priority' : 'u=0, i',
-               'accept-encoding': 'gzip, deflate, br, zstd',
                'accept-language': 'en-US,en;q=0.9'}
     session = requests.Session()
     session.headers=headers
@@ -64,7 +62,7 @@ class Amazon(Metadata):
                     log.warning(ex)
                     return []
                 long_soup = BS(r.text, "lxml")  #~4sec :/
-                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-ppd_csm_instrumentation_wrapper"})
+                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
                 if soup2 is None:
                     return []
                 try:
@@ -108,7 +106,7 @@ class Amazon(Metadata):
                     except (AttributeError, ValueError):
                         match.rating = 0
                     try:
-                        match.cover = soup2.find("img", attrs={"class": "a-dynamic-image"})["src"]
+                        match.cover = soup2.find("img", attrs={"class": "a-dynamic-image frontImage"})["src"]
                     except (AttributeError, TypeError):
                         match.cover = ""
                     return match, index
@@ -134,7 +132,7 @@ class Amazon(Metadata):
             links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
                           soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
             with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:3])}
+                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
                 val = list(map(lambda x : x.result(), concurrent.futures.as_completed(fut)))
         result = list(filter(lambda x: x, val))
         return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance

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/opds.py

@@ -21,10 +21,10 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
-# import json
+import json
 from urllib.parse import unquote_plus
 
-from flask import Blueprint, request, render_template, make_response, abort, g, jsonify
+from flask import Blueprint, request, render_template, make_response, abort, Response, g
 from flask_babel import get_locale
 from flask_babel import gettext as _
 
@@ -424,8 +424,11 @@ def feed_shelf(book_id):
 @requires_basic_auth_if_no_ano
 def opds_download_link(book_id, book_format):
     if not auth.current_user().role_download():
-        return abort(401)
+        return abort(403)
-    client = "kobo" if "Kobo" in request.headers.get('User-Agent') else ""
+    if "Kobo" in request.headers.get('User-Agent'):
+        client = "kobo"
+    else:
+        client = ""
     return get_download_link(book_id, book_format.lower(), client)
 
 
@@ -451,7 +454,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 make_response(jsonify(stat))
+    return Response(json.dumps(stat), mimetype="application/json")
 
 
 @opds.route("/opds/thumb_240_240/<book_id>")

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 from what is used locally.
+    different than what is used locally.
 
-    Code courtesy of: https://flask.pocoo.org/snippets/35/
+    Code courtesy of: http://flask.pocoo.org/snippets/35/
 
     In nginx:
     location /myprefix {

cps/search.py

@@ -265,7 +265,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     pub_end = term.get("publishend")
     rating_low = term.get("ratinghigh")
     rating_high = term.get("ratinglow")
-    description = term.get("comments")
+    description = term.get("comment")
     read_status = term.get("read_status")
     if author_name:
         author_name = strip_whitespaces(author_name).lower().replace(',', '|')

cps/search_metadata.py

@@ -23,7 +23,7 @@ import json
 import os
 import sys
 
-from flask import Blueprint, request, url_for, make_response, jsonify
+from flask import Blueprint, Response, request, url_for
 from .cw_login import current_user
 from flask_babel import get_locale
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -33,6 +33,7 @@ from cps.services.Metadata import Metadata
 from . import constants, logger, ub, web_server
 from .usermanagement import user_login_required
 
+# current_milli_time = lambda: int(round(time() * 1000))
 
 meta = Blueprint("metadata", __name__)
 
@@ -89,7 +90,7 @@ def metadata_provider():
         provider.append(
             {"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__}
         )
-    return make_response(jsonify(provider))
+    return Response(json.dumps(provider), mimetype="application/json")
 
 
 @meta.route("/metadata/provider", methods=["POST"])
@@ -114,7 +115,9 @@ 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 make_response(jsonify([asdict(x) for x in data]))
+        return Response(
+            json.dumps([asdict(x) for x in data]), mimetype="application/json"
+        )
     return ""
 
 
@@ -127,7 +130,7 @@ def metadata_search():
     locale = get_locale()
     if query:
         static_cover = url_for("static", filename="generic_cover.jpg")
-        # ret = cl[0].search(query, static_cover, locale)
+        # start = current_milli_time()
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
             meta = {
                 executor.submit(c.search, query, static_cover, locale): c
@@ -136,4 +139,5 @@ def metadata_search():
             }
             for future in concurrent.futures.as_completed(meta):
                 data.extend([asdict(x) for x in future.result() if x])
-    return  make_response(jsonify(data))
+    # log.info({'Time elapsed {}'.format(current_milli_time()-start)})
+    return Response(json.dumps(data), mimetype="application/json")

cps/services/background_scheduler.py

@@ -42,7 +42,6 @@ class BackgroundScheduler:
         if cls._instance is None:
             cls._instance = super(BackgroundScheduler, cls).__new__(cls)
             cls.log = logger.create()
-            logger.logging.getLogger('tzlocal').setLevel(logger.logging.WARNING)
             cls.scheduler = BScheduler()
             cls.scheduler.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 be converted from string to bytes.
+    message_as_bytes = msg.as_bytes()  # the message should 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

@@ -117,7 +117,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/worker.py

@@ -199,7 +199,7 @@ class CalibreTask:
             self.run(*args)
         except Exception as ex:
             self._handleError(str(ex))
-            log.exception(ex)
+            log.error_or_exception(ex)
 
         self.end_time = datetime.now()
 
@@ -235,7 +235,7 @@ class CalibreTask:
 
     @property
     def dead(self):
-        """Determines whether this task can be garbage collected
+        """Determines whether or not this task can be garbage collected
 
         We have a separate dictating this because there may be certain tasks that want to override this
         """

cps/static/css/basic.css

@@ -1,108 +0,0 @@
-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

@@ -3268,10 +3268,6 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div.
     left: auto !important
 }
 
-ul.dropdown-menu.offscreen {
-    margin: 2px -160px 0
-}
-
 div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropdown-menu.offscreen {
     position: fixed;
     top: 120px;
@@ -4337,7 +4333,6 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div
 
 .navbar-right > li > ul.dropdown-menu.offscreen {
     right: -10px
-
 }
 
 .login .plexBack, body.login > div.container-fluid > div.row-fluid > div.col-sm-2, body.login > div.navbar.navbar-default.navbar-static-top > div > form {
@@ -7153,11 +7148,12 @@ 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 {
-        position: relative;
+        max-width: 130px;
-        max-width: unset;
+        width: 130px;
-        width: 100%;
+        height: 180px;
-        height: unset;
+        margin: 0;
         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 {
@@ -7166,6 +7162,10 @@ 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
@@ -7951,5 +7951,3 @@ div.comments[data-readmore] {
     transition: height 300ms;
     overflow: hidden
 }
-
-.dropdown-menu > .offscreen

cps/static/css/epub_themes.css

@@ -15,5 +15,5 @@
 
 .blackTheme {
 	background: #000;
-	color: #fff;
+	color: #fff
 }

cps/static/css/libs/typeahead.css

@@ -157,6 +157,7 @@ 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

@@ -77,6 +77,7 @@ body {
 }
 
 #panels a {
+  visibility: hidden;
   width: 18px;
   height: 20px;
   overflow: hidden;
@@ -511,12 +512,12 @@ input:-moz-placeholder { color: #454545; }
   position: fixed;
   top: 50%;
   left: 50%;
-  transform: translate(-50%, -50%);
+  width: 630px;
-  width: 100vw;
   height: auto;
-  max-width: 630px;
   z-index: 2000;
   visibility: hidden;
+  margin-left: -320px;
+  margin-top: -160px;
 }
 
 .overlay {

cps/static/js/edit_books.js

@@ -3,7 +3,7 @@
  */
 /* global Bloodhound, language, Modernizr, tinymce, getPath */
 
-if ($("#comments").length && typeof tinymce !== "undefined") {
+if ($("#comments").length) {
     tinymce.init({
         selector: "#comments",
         plugins: 'code',

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

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

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

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.sl={days:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"],daysShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],daysMin:["Ne","Po","To","Sr","Če","Pe","So"],months:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danes",weekStart:1}}(jQuery);

cps/static/js/libs/pdf.mjs

@@ -16667,7 +16667,7 @@ const PDFWorkerUtil = {
 {
   if (isNodeJS) {
     PDFWorkerUtil.isWorkerDisabled = true;
-    GlobalWorkerOptions.workerSrc ||= "./pdf.worker.js";
+    GlobalWorkerOptions.workerSrc ||= "./pdf.worker.mjs";
   }
   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 through a sliding window of size 3:
+                        // iterate the word trough a sliding window of size 3:
                         if (
                             sequence.indexOf(
                                 word.toLowerCase().substring(j, j + 3)

cps/static/js/libs/viewer.mjs

@@ -828,7 +828,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "../build/pdf.worker.js",
+    value: "../build/pdf.worker.mjs",
     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);
@@ -726,22 +726,22 @@ $(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.valid ) {
-                    $("#InvalidDialog").modal('show');
-                }
-                else{
                 if ( data.change ) {
+                    if ( data.valid ) {
                         confirmDialog(
                             "db_submit",
                             "GeneralChangeModal",
                             0,
                             changeDbSettings
                         );
+                    }
+                    else {
+                        $("#InvalidDialog").modal('show');
+                    }
                 } else {
                     changeDbSettings();
                 }
             }
-            }
         });
     });
 

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

@@ -0,0 +1,54 @@
+/**
+ * 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

@@ -52,32 +52,6 @@ var reader;
         }
     });
 
-    // Update progress percentage
-    let progressDiv = document.getElementById("progress");
-    reader.book.ready.then((()=>{
-        let locations_key = reader.book.key()+'-locations';
-        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(()=>{
-            reader.rendition.on('relocated', (location)=>{
-                let percentage = Math.round(location.end.percentage*100);
-                progressDiv.textContent=percentage+"%";
-            });
-            reader.rendition.reportLocation();
-            progressDiv.style.visibility = "visible";
-        }).then(save_locations);
-    }));
-
     /**
      * @param {string} action - Add or remove bookmark
      * @param {string|int} location - Location or zero

cps/static/js/reading/locationchange-polyfill.js

@@ -1,21 +0,0 @@
-// 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'));
-    });
-})();

cps/static/js/table.js

@@ -103,7 +103,7 @@ $(function() {
             method:"post",
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: getPath() + "/ajax/mergebooks",
+            url: window.location.pathname + "/../ajax/mergebooks",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success() {
                 $("#books-table").bootstrapTable("refresh");
@@ -122,7 +122,7 @@ $(function() {
             method:"post",
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: getPath() + "/ajax/simulatemerge",
+            url: window.location.pathname + "/../ajax/simulatemerge",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success(booTitles) {
                 $('#merge_from').empty();
@@ -140,7 +140,7 @@ $(function() {
             method:"post",
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: getPath() + "/ajax/xchange",
+            url: window.location.pathname + "/../ajax/xchange",
             data: JSON.stringify({"xchange":selections}),
             success: function success() {
                 $("#books-table").bootstrapTable("refresh");
@@ -685,17 +685,6 @@ function ratingFormatter(value, row) {
     return (value/2);
 }
 
-function seriesIndexFormatter(value, row) {
-    if (!value) {
-        return value;
-    }
-    formated_value = Number(value).toFixed(2);
-    if (formated_value.endsWith(".00")) {
-        formated_value = parseInt(formated_value).toString();
-    }
-    return formated_value;
-}
-
 
 /* Do some hiding disabling after user list is loaded */
 function loadSuccess() {
@@ -860,7 +849,6 @@ function BookCheckboxChange(checkbox, userId, field) {
         },
         success: handleListServerResponse
     });
-    console.log("test");
 }
 
 

cps/string_helper.py

@@ -19,5 +19,5 @@ import re
 
 
 def strip_whitespaces(text):
-    return re.sub(r"(^[\s\u200B-\u200D\ufeff]+)|([\s\u200B-\u200D\ufeff]+$)","", text)
+    return re.sub("(^[\s\u200B-\u200D\ufeff]+)|([\s\u200B-\u200D\ufeff]+$)","", text)
 

cps/tasks/convert.py

@@ -18,7 +18,7 @@
 
 import os
 import re
-import glob
+from glob import glob
 from shutil import copyfile, copyfileobj
 from markupsafe import escape
 from time import time
@@ -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, app
+from cps import db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
@@ -60,12 +60,9 @@ 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:
-            with app.app_context():
+            worker_db = db.CalibreDB(expire_on_commit=False, init=True)
-                worker_db = db.CalibreDB(app)
             cur_book = worker_db.get_book(self.book_id)
             self.title = cur_book.title
             data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
@@ -85,13 +82,13 @@ class TaskConvert(CalibreTask):
                 df.GetContentFile(datafile)
                 if df_cover:
                     df_cover.GetContentFile(datafile_cover)
-                    # worker_db.session.close()
+                worker_db.session.close()
             else:
                 # ToDo Include cover in error handling
                 error_message = _("%(format)s not found on Google Drive: %(fn)s",
                                   format=self.settings['old_book_format'],
                                   fn=data.name + "." + self.settings['old_book_format'].lower())
-                    # worker_db.session.close()
+                worker_db.session.close()
                 return self._handleError(error_message)
 
         filename = self._convert_ebook_format()
@@ -127,8 +124,7 @@ class TaskConvert(CalibreTask):
 
     def _convert_ebook_format(self):
         error_message = None
-        with app.app_context():
+        local_db = db.CalibreDB(expire_on_commit=False, init=True)
-            local_db = db.CalibreDB(app)
         file_path = self.file_path
         book_id = self.book_id
         format_old_ext = '.' + self.settings['old_book_format'].lower()
@@ -246,7 +242,7 @@ class TaskConvert(CalibreTask):
 
         # move file
         if check == 0:
-            converted_file = glob.glob(glob.escape(os.path.splitext(filename)[0]) + "*.kepub.epub")
+            converted_file = glob(os.path.splitext(filename)[0] + "*.kepub.epub")
             if len(converted_file) == 1:
                 copyfile(converted_file[0], (file_path + format_new_ext))
                 os.unlink(converted_file[0])
@@ -272,48 +268,35 @@ class TaskConvert(CalibreTask):
 
                 opf_command = [calibredb_binarypath, 'show_metadata', '--as-opf', str(self.book_id),
                                '--with-library', library_path]
-                p = process_open(opf_command, quotes, my_env, newlines=False)
+                p = process_open(opf_command, quotes, my_env)
-                lines = list()
+                p.wait()
-                while p.poll() is None:
-                    lines.append(p.stdout.readline())
                 check = p.returncode
                 calibre_traceback = p.stderr.readlines()
                 if check == 0:
                     path_tmp_opf = os.path.join(tmp_dir, "metadata_" + str(uuid4()) + ".opf")
-                    with open(path_tmp_opf, 'wb') as fd:
+                    with open(path_tmp_opf, 'w') as fd:
-                        fd.write(b''.join(lines))
+                        copyfileobj(p.stdout, fd)
                 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
-            quotes = [1, 2]
+            quotes = [1, 2, 4, 6]
-            quotes_index = 3
             command = [config.config_converterpath, (file_path + format_old_ext),
                        (file_path + format_new_ext)]
             if config.config_embed_metadata:
-                quotes.append(4)
-                quotes_index = 5
                 command.extend(['--from-opf', path_tmp_opf])
             if has_cover:
-                    quotes.append(6)
                 command.extend(['--cover', os.path.join(os.path.dirname(file_path), 'cover.jpg')])
-                    quotes_index = 7
+            quotes_index = 3
             if config.config_calibre:
-                parameters = re.findall(r"(--[\w-]+)(?:(\s(?:(\".+\")|(?:.+?)))(?:\s|$))?",
+                parameters = config.config_calibre.split(" ")
-                                        config.config_calibre, re.IGNORECASE | re.UNICODE)
-                if parameters:
                 for param in parameters:
-                        command.append(strip_whitespaces(param[0]))
+                    command.append(param)
-                        quotes_index += 1
-                        if param[1] != "":
-                            parsed = strip_whitespaces(param[1]).strip("\"")
-                            command.append(parsed)
                     quotes.append(quotes_index)
                     quotes_index += 1
+
             p = process_open(command, quotes, newlines=False)
         except OSError as e:
             return 1, N_("Ebook-converter failed: %(error)s", error=e)

cps/tasks/database.py

@@ -18,7 +18,7 @@
 
 from flask_babel import lazy_gettext as N_
 
-from cps import config, logger, db, ub, app
+from cps import config, logger, db, ub
 from cps.services.worker import CalibreTask
 
 
@@ -26,13 +26,11 @@ 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):
-        with app.app_context():
+        self.calibre_db.reconnect_db(config, ub.app_DB_path)
-            calibre_db = db.CalibreDB(app)
+        self.calibre_db.session.close()
-            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, make_msgid
+from email.utils import formatdate, parseaddr
 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]), stacklevel=2)
+        log.debug_no_auth('send: {}'.format(strg[:300]))
         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'] = make_msgid(domain=self.get_msgid_domain())
+        message['Message-Id'] = "{}@{}".format(uuid.uuid4(), 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,14 +169,10 @@ class TaskEmail(CalibreTask):
             else:
                 self.send_gmail_email(msg)
         except MemoryError as e:
-            log.error_or_exception(e, stacklevel=2)
+            log.error_or_exception(e, stacklevel=3)
             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=2)
+            log.error_or_exception(e, stacklevel=3)
             if hasattr(e, "smtp_error"):
                 text = e.smtp_error.decode('utf-8').replace("\n", '. ')
             elif hasattr(e, "message"):
@@ -187,10 +183,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=2)
+            log.error_or_exception(e, stacklevel=3)
             self._handleError('Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
-            log.error_or_exception(ex, stacklevel=2)
+            log.error_or_exception(ex, stacklevel=3)
             self._handleError('Error sending e-mail: {}'.format(ex))
 
     def send_standard_email(self, msg):
@@ -273,7 +269,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=2)
+                log.error_or_exception(e, stacklevel=3)
                 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, app
+from cps import config, db, gdriveutils, logger
 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,36 +46,32 @@ class TaskBackupMetadata(CalibreTask):
             self.backup_metadata()
 
     def set_all_books_dirty(self):
-        with app.app_context():
-            calibre_dbb = db.CalibreDB(app)
         try:
-                books = calibre_dbb.session.query(db.Books).all()
+            books = self.calibre_db.session.query(db.Books).all()
             for book in books:
-                    calibre_dbb.set_metadata_dirty(book.id)
+                self.calibre_db.set_metadata_dirty(book.id)
-                calibre_dbb.session.commit()
+            self.calibre_db.session.commit()
             self._handleSuccess()
         except Exception as ex:
             self.log.debug('Error adding book for backup: ' + str(ex))
             self._handleError('Error adding book for backup: ' + str(ex))
-                calibre_dbb.session.rollback()
+            self.calibre_db.session.rollback()
-        # self.calibre_db.session.close()
+        self.calibre_db.session.close()
 
     def backup_metadata(self):
-        with app.app_context():
         try:
-                calibre_dbb = db.CalibreDB(app)
+            metadata_backup = self.calibre_db.session.query(db.Metadata_Dirtied).all()
-                metadata_backup = calibre_dbb.session.query(db.Metadata_Dirtied).all()
+            custom_columns = (self.calibre_db.session.query(db.CustomColumns)
-                custom_columns = (calibre_dbb.session.query(db.CustomColumns)
                               .filter(db.CustomColumns.mark_for_delete == 0)
                               .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions))
                               .order_by(db.CustomColumns.label).all())
             count = len(metadata_backup)
             i = 0
             for backup in metadata_backup:
-                    book = calibre_dbb.session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
+                book = self.calibre_db.session.query(db.Books).filter(db.Books.id == backup.book).one_or_none()
-                    calibre_dbb.session.query(db.Metadata_Dirtied).filter(
+                self.calibre_db.session.query(db.Metadata_Dirtied).filter(
                     db.Metadata_Dirtied.book == backup.book).delete()
-                    calibre_dbb.session.commit()
+                self.calibre_db.session.commit()
                 if book:
                     self.open_metadata(book, custom_columns)
                 else:
@@ -83,14 +79,14 @@ class TaskBackupMetadata(CalibreTask):
                 i += 1
                 self.progress = (1.0 / count) * i
             self._handleSuccess()
-                # self.calibre_db.session.close()
+            self.calibre_db.session.close()
 
         except Exception as ex:
             b = "NaN" if not hasattr(book, 'id') else book.id
             self.log.debug('Error creating metadata backup for book {}: '.format(b) + str(ex))
             self._handleError('Error creating metadata backup: ' + str(ex))
-                calibre_dbb.session.rollback()
+            self.calibre_db.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,11 +23,10 @@ from io import BytesIO
 from datetime import datetime, timezone
 
 from .. import constants
-from cps import config, db, fs, gdriveutils, logger, ub, app
+from cps import config, db, fs, gdriveutils, logger, ub
 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
@@ -114,10 +113,9 @@ 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
-        with app.app_context():
+        calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
-            calibre_db = db.CalibreDB(app) #, expire_on_commit=False, init=True)
         books_cover = calibre_db.session.query(db.Books).filter(db.Books.has_cover == 1).filter(filter_exp).all()
-            # calibre_db.session.close()
+        calibre_db.session.close()
         return books_cover
 
     def get_book_cover_thumbnails(self, book_id):
@@ -248,7 +246,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,
@@ -256,18 +254,16 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         ]
 
     def run(self, worker_thread):
-        with app.app_context():
+        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
-            calibre_db = db.CalibreDB(app)
-            if calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
             self.message = 'Scanning Series'
-                all_series = self.get_series_with_four_plus_books(calibre_db)
+            all_series = self.get_series_with_four_plus_books()
             count = len(all_series)
 
             total_generated = 0
             for i, series in enumerate(all_series):
                 generated = 0
                 series_thumbnails = self.get_series_thumbnails(series.id)
-                    series_books = self.get_series_books(series.id, calibre_db)
+                series_books = self.get_series_books(series.id)
 
                 # Generate new thumbnails for missing covers
                 resolutions = list(map(lambda t: t.resolution, series_thumbnails))
@@ -308,8 +304,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         self._handleSuccess()
         self.app_db_session.remove()
 
-    def get_series_with_four_plus_books(self, calibre_db):
+    def get_series_with_four_plus_books(self):
-        return calibre_db.session \
+        return self.calibre_db.session \
             .query(db.Series) \
             .join(db.books_series_link) \
             .join(db.Books) \
@@ -318,8 +314,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             .having(func.count('book_series_link') > 3) \
             .all()
 
-    def get_series_books(self, series_id, calibre_db):
+    def get_series_books(self, series_id):
-        return calibre_db.session \
+        return self.calibre_db.session \
             .query(db.Books) \
             .join(db.books_series_link) \
             .join(db.Series) \
@@ -465,15 +461,13 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     def run(self, worker_thread):
         if self.app_db_session:
-            # delete superfluous thumbnails
+            if self.book_id == 0:  # delete superfluous thumbnails
-            if self.book_id == 0:
+                calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
-                with app.app_context():
-                    calibre_db = db.CalibreDB(app)
                 thumbnails = (calibre_db.session.query(ub.Thumbnail)
                               .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
                               .filter(db.Books.id==None)
                               .all())
-                    # calibre_db.session.close()
+                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/author.html

@@ -71,7 +71,7 @@
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
             {{entry.Books.series[0].name}}
           </a>
-          ({{entry.Books.series_index|formatfloat(2)}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
         {% if entry.Books.ratings.__len__() > 0 %}
@@ -122,7 +122,7 @@
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
-          ({{entry.series_index|formatfloat(2)}})
+          ({{entry.series_index|formatseriesindex}})
         </p>
         {% endif %}
         <div class="rating">

cps/templates/basic_layout.html

@@ -5,7 +5,112 @@
 <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">
+<style>
+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%;
+}
+
+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;
+}
+</style>
 </head>
 
 <body>
@@ -13,12 +118,12 @@
     <div>
       {% if current_user.is_authenticated or g.allow_anonymous %}
         <nav>
-          <a href="{{url_for('basic.index')}}">
+          <a href="/basic">
             <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 }}">
+              <input type="text" id="query" name="query" placeholder="{{_('Search Library')}}" value="{{searchterm}}">
               <span>
                 <button type="submit" id="query_submit">{{_('Search')}}</button>
               </span>
@@ -30,11 +135,6 @@
             </a>
           {% endif %}
         </nav>
-        <div class="theme">
-                  <a href="{{url_for('web.index')}}">
-            <span>{{_('Normal Theme')}}</span>
-          </a>
-        </div>
       {% endif %}
     </div>
   </div>

cps/templates/book_edit.html

@@ -78,6 +78,26 @@
       <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 %}">
@@ -88,8 +108,23 @@
     </div>
     <div class="form-group">
       <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)}}">
+      <input type="number" step="0.01" min="0" placeholder="1" class="form-control" name="series_index" id="series_index" value="{{book.series_index}}">
     </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 %}">
@@ -106,39 +141,6 @@
       <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

@@ -66,7 +66,7 @@
             {{ text_table_row('authors', _('Enter Authors'),_('Authors'), true, true) }}
             {{ text_table_row('tags', _('Enter Categories'),_('Categories'), false, true) }}
             {{ text_table_row('series', _('Enter Series'),_('Series'), false, true) }}
-            <th data-field="series_index" id="series_index" data-visible="{{visiblility.get('series_index')}}"  data-formatter="seriesIndexFormatter" data-edit-validate="{{ _('This Field is Required') }}" data-sortable="true" {% if current_user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-min="0" data-editable-url="{{ url_for('edit-book.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter Title')}}"{% endif %}>{{_('Series Index')}}</th>
+            <th data-field="series_index" id="series_index" data-visible="{{visiblility.get('series_index')}}" data-edit-validate="{{ _('This Field is Required') }}" data-sortable="true" {% if current_user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-min="0" data-editable-url="{{ url_for('edit-book.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter Title')}}"{% endif %}>{{_('Series Index')}}</th>
             {{ text_table_row('languages', _('Enter Languages'),_('Languages'), false, true) }}
             <!--th data-field="pubdate" data-type="date" data-visible="{{visiblility.get('pubdate')}}" data-viewformat="dd.mm.yyyy" id="pubdate" data-sortable="true">{{_('Publishing Date')}}</th-->
             {{ text_table_row('publishers', _('Enter Publishers'),_('Publishers'), false, true) }}

cps/templates/config_db.html

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

cps/templates/config_edit.html

@@ -411,7 +411,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_character">{{_('Enforce characters (needed For Chinese/Japanese/Korean Characters)')}}</label>
+                <label for="config_password_lower">{{_('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,12 +1,4 @@
 {% 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">
@@ -155,7 +147,7 @@
                 </div>
             {% endif %}
             {% if entry.series|length > 0 %}
-                <p>{{ _("Book %(index)s of %(range)s", index=entry.series_index|formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe) }}</p>
+                <p>{{ _("Book %(index)s of %(range)s", index=entry.series_index | formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe) }}</p>
 
             {% endif %}
 

cps/templates/feed.xml

@@ -70,7 +70,7 @@
     {% 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}}" title="{{format.format}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
+          length="{{format.uncompressed_size}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
     {% endfor %}
   </entry>
   {% endfor %}

cps/templates/http_error.html

@@ -48,11 +48,7 @@
     <div class="row">
       <div class="col errorlink">
       {% if not unconfigured %}
-        {% 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,7 +6,6 @@
         srcset="{{ srcset }}"
         src="{{ url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified) }}"
         alt="{{ image_alt }}"
-        loading="lazy"
     />
 {%- endmacro %}
 
@@ -17,6 +16,5 @@
         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/index.html

@@ -42,7 +42,7 @@
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
             {{entry.Books.series[0].name}}
           </a>
-          ({{entry.Books.series_index|formatfloat(2)}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
         {% if entry.Books.ratings.__len__() > 0 %}
@@ -132,7 +132,7 @@
         {% else %}
             <span>{{entry.Books.series[0].name}}</span>
         {% endif %}
-          ({{entry.Books.series_index|formatfloat(2)}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
         {% if entry.Books.ratings.__len__() > 0 %}

cps/templates/layout.html

@@ -41,6 +41,7 @@
             <div class="plexBack"><a href="{{url_for('web.index')}}"></a></div>
         {% endif %}
         {% if current_user.is_authenticated or g.allow_anonymous %}
+          <a href="{{url_for('basic.index')}}" class="navbar-form navbar-left btn btn-default" id="basic"><span class="glyphicon glyphicon-phone"></span><span>{{_('Simple view')}}</span></a>
           <!--# margin 0, padding 15, background color-->
            <form class="navbar-form navbar-left" role="search" action="{{url_for('search.simple_search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
@@ -56,7 +57,6 @@
           {% 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">

cps/templates/listenmp3.html

@@ -59,7 +59,7 @@
         </div>
       {% endif %}
       {% if entry.series|length > 0 %}
-          <p>{{_("Book %(index)s of %(range)s", index=entry.series_index|formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe)}}</p>
+          <p>{{_("Book %(index)s of %(range)s", index=entry.series_index | formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe)}}</p>
 
       {% endif %}
 

cps/templates/read.html

@@ -77,7 +77,7 @@
         <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-->
                 <button type="button" id="lightTheme" class="lightTheme" onclick="selectTheme(this.id)"><span
@@ -126,8 +126,8 @@
         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=book_format) }}",
+            bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format='EPUB') }}",
-            bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format=book_format, anyname='file.epub') }}",
+            bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format='epub', anyname='file.epub') }}",
             bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
             useBookmarks: "{{ current_user.is_authenticated | tojson }}"
         };
@@ -135,23 +135,19 @@
         window.themes = {
             "darkTheme": {
                 "bgColor": "#202124",
-                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}",
+                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
-                "title-color": "#fff"
             },
             "lightTheme": {
                 "bgColor": "white",
-                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}",
+                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
-                "title-color": "#4f4f4f"
             },
             "sepiaTheme": {
                 "bgColor": "#ece1ca",
-                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}",
+                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
-                "title-color": "#4f4f4f"
             },
             "blackTheme": {
                 "bgColor": "black",
-                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}",
+                "css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
-                "title-color": "#fff"
             },
         };
 
@@ -174,8 +170,6 @@
 
             // 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
@@ -216,6 +210,6 @@
       <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/locationchange-polyfill.js') }}"></script-->
+      <script src="{{ url_for('static', filename='js/reading/epub-progress.js') }}"></script>      
     </body>
 </html>

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.js') }}" type="module"></script>
+	  <script src="{{ url_for('static', filename='js/libs/pdf.mjs') }}" 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.js') }}");
+        PDFViewerApplicationOptions.set('workerSrc', "{{ url_for('static', filename='js/libs/pdf.worker.mjs') }}");
         PDFViewerApplicationOptions.set('defaultUrl',"{{ url_for('web.serve_book', book_id=pdffile, book_format='pdf') }}")
     });
     </script>
 
-    <script src="{{ url_for('static', filename='js/libs/viewer.js') }}" type="module">></script>
+    <script src="{{ url_for('static', filename='js/libs/viewer.mjs') }}" type="module">></script>
 
   </head>
 

cps/templates/search.html

@@ -82,7 +82,7 @@
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
             {{entry.Books.series[0].name}}
           </a>
-          ({{entry.Books.series_index|formatfloat(2)}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
 

cps/templates/shelf.html

@@ -70,7 +70,7 @@
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
             {{entry.Books.series[0].name}}
           </a>
-          ({{entry.Books.series_index|formatfloat(2)}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
         {% if entry.Books.ratings.__len__() > 0 %}

cps/templates/shelf_order.html

@@ -20,7 +20,7 @@
                   {{entry['Books']['title']}}
                   {% if entry['Books']['series']|length > 0 %}
                     <br>
-                    {{entry['Books']['series_index']|formatfloat(2)}} - {{entry['Books']['series'][0].name}}
+                    {{entry['Books']['series_index']}} - {{entry['Books']['series'][0].name}}
                   {% endif %}
                   <br>
                   {% for author in entry['Books']['author'] %}

cps/templates/shelfdown.html

@@ -45,7 +45,7 @@
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
             {{entry.Books.series[0].name}}
           </a>
-          ({{entry.Books.series_index|formatfloat(2)}})
+          ({{entry.Books.series_index}})
         </p>
         {% endif %}
       </div>