user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Develop'

Browse Source
This commit is contained in:
Ozzie Isaacs
2026-05-24 10:20:42 +02:00
parent f4ed816f6e e732b3b614
commit e3dd77d34f
11 changed files with 232 additions and 2017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cps/clean_html.py
View File

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

5
cps/db.py
View File

@@ -753,7 +753,8 @@ class CalibreDB:
.filter(self.common_filters(allow_show_archived)).first())
def get_book_by_uuid(self, book_uuid):
return self.session.query(Books).filter(Books.uuid == book_uuid).first()
return self.session.query(Books).filter(Books.uuid == book_uuid). \
filter(self.common_filters()).first()
def get_book_format(self, book_id, file_format):
return self.session.query(Data).filter(Data.book == book_id).filter(Data.format == file_format).first()
@@ -1125,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:

10
cps/server.py
View File

@@ -41,7 +41,7 @@ except ImportError:
VERSION = 'Tornado ' + _version
_GEVENT = False
from . import logger
from . import logger, constants
log = logger.create()
@@ -216,9 +216,10 @@ class WebServer(object):
try:
sock, output = self._make_gevent_listener()
log.info('Starting Gevent server on %s', output)
# Also print to stdout so interactive terminals show a clear success message
try:
print(f"Calibre-Web: server started on {output}")
# Also print to stdout so interactive terminals show a clear success message
if constants.APP_MODE not in ['development', 'test']:
print(f"Calibre-Web: server started on {output}")
except Exception:
print(f"Calibre-Web: error {output}")
pass
@@ -274,7 +275,8 @@ class WebServer(object):
log.info('Starting Tornado server on %s', output)
# Also print to stdout so interactive terminals show a clear success message
try:
print(f"Calibre-Web: server started on {output}")
if constants.APP_MODE not in ['development', 'test']:
print(f"Calibre-Web: server started on {output}")
except Exception:
print(f"Calibre-Web: error {output}")
pass

2
cps/templates/detail.html
View File

@@ -232,7 +232,7 @@
{% elif c.datatype == 'datetime' %}
{{ column.value|formatdate }}
{% elif c.datatype == 'comments' %}
{{ column.value|safe }}
{{ column.value|clean_string|safe }}
{% elif c.datatype == 'series' %}
{{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
{% elif c.datatype == 'text' %}

2
cps/templates/feed.xml
View File

@@ -94,7 +94,7 @@
{% elif c.datatype == 'datetime' %}
{{ column.value|formatdate }}
{% elif c.datatype == 'comments' %}
{{ column.value|safe }}
{{ column.value|clean_string|safe }}
{% elif c.datatype == 'series' %}
{{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
{% elif c.datatype == 'text' %}

2
cps/templates/listenmp3.html
View File

@@ -134,7 +134,7 @@
{% elif c.datatype == 'datetime' %}
{{ column.value|formatdate }}
{% elif c.datatype == 'comments' %}
{{column.value|safe}}
{{column.value|clean_string|safe}}
{% elif c.datatype == 'series' %}
{{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
{% elif c.datatype == 'text' %}

2
cps/ub.py
View File

@@ -537,7 +537,7 @@ class RemoteAuthToken(Base):
def __init__(self):
super().__init__()
self.auth_token = (hexlify(os.urandom(4))).decode('utf-8')
self.auth_token = (hexlify(os.urandom(16))).decode('utf-8')
self.expiration = datetime.now() + timedelta(minutes=10) # 10 min from now
def __repr__(self):

2
cps/web.py
View File

@@ -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,

8
pyproject.toml
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"}]
maintainers = [{name = "@OzzieIsaacs"}]
license = "GPL-3.0-or-later"
license-files = ["LICENSE"]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python :: 3",
@@ -17,6 +18,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Operating System :: OS Independent",
]
keywords = [
@@ -40,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,<5.4.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",
@@ -118,12 +120,10 @@ kobo = [
]
[project.scripts]
cps = "calibreweb:main"
cps = "calibreweb.__main__:main"
[tool.setuptools]
include-package-data = true
license-files = ["LICENSE"]
[tool.setuptools.dynamic]
version = {attr = "calibreweb.cps.constants.STABLE_VERSION"}

2
requirements.txt
View File

@@ -12,7 +12,7 @@ SQLAlchemy>=1.3.0,<2.1.0
tornado>=6.4.2,<6.6
Wand>=0.4.4,<0.8.0
unidecode>=0.04.19,<1.5.0
lxml>=4.9.1,<5.4.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

2207
test/Calibre-Web TestSummary_Linux.html
View File

File diff suppressed because it is too large Load Diff