Fixes from testrun

This commit is contained in:
Ozzie Isaacs
2026-05-17 10:21:19 +02:00
parent 6cbba6d170
commit 69f8767be5
4 changed files with 213 additions and 2009 deletions

View File

@@ -1126,7 +1126,7 @@ class CalibreDB:
.filter(self.common_filters()) .filter(self.common_filters())
.count()) .count())
if no_lang_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) return sorted(tags, key=lambda x: x[0].name.lower(), reverse=reverse_order)
else: else:
if not languages: if not languages:

View File

@@ -711,7 +711,7 @@ def render_language_books(page, name, order):
lang_name = _("None") lang_name = _("None")
except KeyError: except KeyError:
abort(404) abort(404)
if name == "none": if name.lower() == "none":
entries, random, pagination = calibre_db.fill_indexpage(page, 0, entries, random, pagination = calibre_db.fill_indexpage(page, 0,
db.Books, db.Books,
db.Languages.lang_code == None, db.Languages.lang_code == None,

View File

@@ -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"}] authors = [{name = "@OzzieIsaacs", email = "Ozzie.Fernandez.Isaacs@googlemail.com"}]
maintainers = [{name = "@OzzieIsaacs"}] maintainers = [{name = "@OzzieIsaacs"}]
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
license-files = ["LICENSE"]
classifiers = [ classifiers = [
"Development Status :: 5 - Production/Stable", "Development Status :: 5 - Production/Stable",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
@@ -41,7 +42,7 @@ dependencies = [
"tornado>=6.4.2,<6.6", "tornado>=6.4.2,<6.6",
"Wand>=0.4.4,<0.8.0", "Wand>=0.4.4,<0.8.0",
"unidecode>=0.04.19,<1.5.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", "flask-wtf>=0.14.2,<1.3.0",
"chardet>=3.0.0,<5.3.0", "chardet>=3.0.0,<5.3.0",
"netifaces-plus>=0.12.0,<0.13.0", "netifaces-plus>=0.12.0,<0.13.0",
@@ -119,14 +120,10 @@ kobo = [
] ]
[project.scripts] [project.scripts]
cps = "cps.main:main" cps = "calibreweb.__main__:main"
[tool.setuptools] [tool.setuptools]
include-package-data = true include-package-data = true
license-files = ["LICENSE"]
[tool.setuptools.packages.find]
include = ["cps*"]
[tool.setuptools.dynamic] [tool.setuptools.dynamic]
version = {attr = "cps.constants.STABLE_VERSION"} version = {attr = "calibreweb.cps.constants.STABLE_VERSION"}

File diff suppressed because it is too large Load Diff