diff --git a/cps/db.py b/cps/db.py index 003c6d5c3..92e6380ed 100644 --- a/cps/db.py +++ b/cps/db.py @@ -1126,7 +1126,7 @@ class CalibreDB: .filter(self.common_filters()) .count()) if no_lang_count: - tags.append([Category(_("None"), None, "none"), no_lang_count]) + tags.append([Category(_("None"), "None", "none"), no_lang_count]) return sorted(tags, key=lambda x: x[0].name.lower(), reverse=reverse_order) else: if not languages: diff --git a/cps/web.py b/cps/web.py index 6c3f1f76c..fc5288591 100644 --- a/cps/web.py +++ b/cps/web.py @@ -711,7 +711,7 @@ def render_language_books(page, name, order): lang_name = _("None") except KeyError: abort(404) - if name == "none": + if name.lower() == "none": entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, db.Languages.lang_code == None, diff --git a/pyproject.toml b/pyproject.toml index e36643dbe..55fbe7b3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,7 @@ description = "Web app for browsing, reading and downloading eBooks stored in a authors = [{name = "@OzzieIsaacs", email = "Ozzie.Fernandez.Isaacs@googlemail.com"}] maintainers = [{name = "@OzzieIsaacs"}] license = "GPL-3.0-or-later" +license-files = ["LICENSE"] classifiers = [ "Development Status :: 5 - Production/Stable", "Programming Language :: Python :: 3", @@ -41,7 +42,7 @@ dependencies = [ "tornado>=6.4.2,<6.6", "Wand>=0.4.4,<0.8.0", "unidecode>=0.04.19,<1.5.0", - "lxml>=4.9.1,<6.1.0", + "lxml>=4.9.1,<6.2.0", "flask-wtf>=0.14.2,<1.3.0", "chardet>=3.0.0,<5.3.0", "netifaces-plus>=0.12.0,<0.13.0", @@ -119,14 +120,10 @@ kobo = [ ] [project.scripts] -cps = "cps.main:main" +cps = "calibreweb.__main__:main" [tool.setuptools] include-package-data = true -license-files = ["LICENSE"] - -[tool.setuptools.packages.find] -include = ["cps*"] [tool.setuptools.dynamic] -version = {attr = "cps.constants.STABLE_VERSION"} +version = {attr = "calibreweb.cps.constants.STABLE_VERSION"} diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 7a0eb6695..d1e2a406d 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2026-04-25 16:06:06

+

Start Time: 2026-05-16 12:48:02

-

Stop Time: 2026-04-25 23:02:36

+

Stop Time: 2026-05-16 20:11:29

-

Duration: 5h 43 min

+

Duration: 6h 9 min

@@ -102,15 +102,15 @@ - + TestAnonymous - 21 - 5 - 6 - 10 + 13 + 13 + 0 + 0 0 - Detail + Detail @@ -161,476 +161,74 @@ - +
TestAnonymous - test_guest_change_visibility_language
- -
- ERROR -
- - - - + PASS - - -
TestAnonymous - test_guest_change_visibility_language
- - -
- ERROR -
- - - - - - - - - +
TestAnonymous - test_guest_change_visibility_publisher
- -
- FAIL -
- - - - + PASS - - -
TestAnonymous - test_guest_change_visibility_publisher
- - -
- ERROR -
- - - - - - - - - +
TestAnonymous - test_guest_change_visibility_rated
- -
- FAIL -
- - - - + PASS - - -
TestAnonymous - test_guest_change_visibility_rated
- - -
- ERROR -
- - - - - - - - - +
TestAnonymous - test_guest_change_visibility_rating
- -
- FAIL -
- - - - + PASS - - -
TestAnonymous - test_guest_change_visibility_rating
- - -
- ERROR -
- - - - - - - - - +
TestAnonymous - test_guest_change_visibility_series
- -
- FAIL -
- - - - + PASS - - -
TestAnonymous - test_guest_change_visibility_series
- - -
- ERROR -
- - - - - - - - - +
TestAnonymous - test_guest_random_books_available
- -
- FAIL -
- - - - + PASS - - -
TestAnonymous - test_guest_random_books_available
- - -
- ERROR -
- - - - - - - - - +
TestAnonymous - test_guest_restricted_settings_visibility
- -
- ERROR -
- - - - + PASS - - -
TestAnonymous - test_guest_restricted_settings_visibility
- - -
- ERROR -
- - - - - - - - - +
TestAnonymous - test_guest_visibility_sidebar
- -
- FAIL -
- - - - - - - - - - -
TestAnonymous - test_guest_visibility_sidebar
- - -
- ERROR -
- - - - + PASS @@ -1602,12 +1200,12 @@ AttributeError: 'bool' object has no attribute 'click' - + TestEditBooks 38 - 36 + 37 + 0 0 - 1 1 Detail @@ -1733,32 +1331,11 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestEditBooks - test_edit_language
- -
- ERROR -
- - - - + PASS @@ -2267,12 +1844,12 @@ IndexError: list index out of range - + TestEditBooksList 20 - 12 - 3 - 5 + 20 + 0 + 0 0 Detail @@ -2389,234 +1966,114 @@ IndexError: list index out of range - +
TestEditBooksList - test_bookslist_edit_languages
- -
- FAIL -
- - - - + PASS - +
TestEditBooksList - test_bookslist_edit_publisher
- -
- ERROR -
- - - - + PASS - +
TestEditBooksList - test_bookslist_edit_series
- -
- ERROR -
- - - - + PASS - +
TestEditBooksList - test_bookslist_edit_seriesindex
- -
- ERROR -
- - - - + PASS - +
TestEditBooksList - test_bookslist_edit_title
- -
- ERROR -
- - - - + PASS - +
TestEditBooksList - test_list_visibility
- -
- FAIL -
- - - - + PASS - +
TestEditBooksList - test_restricted_rights
- -
- ERROR -
- - - - + PASS - +
TestEditBooksList - test_search_books_list
+ PASS + + + + + + + TestLoadMetadata + 1 + 0 + 0 + 1 + 0 + + Detail + + + + + + + +
TestLoadMetadata - test_load_metadata
+
- FAIL + ERROR
-