calibre-web patch requires update

This commit is contained in:
Noah Masur 2023-11-05 21:50:36 +00:00
parent 3fd95643b0
commit ddb5dc39aa

View File

@ -1,8 +1,8 @@
diff --git a/cps/__init__.py b/cps/__init__.py diff --git a/cps/__init__.py b/cps/__init__.py
index 269e4aca..e2b828a9 100644 index f4f8dbf2..7377acdf 100644
--- a/cps/__init__.py --- a/cps/__init__.py
+++ b/cps/__init__.py +++ b/cps/__init__.py
@@ -150,7 +150,6 @@ def create_app(): @@ -151,7 +151,6 @@ def create_app():
lm.login_view = 'web.login' lm.login_view = 'web.login'
lm.anonymous_user = ub.Anonymous lm.anonymous_user = ub.Anonymous
@ -11,15 +11,17 @@ index 269e4aca..e2b828a9 100644
db.CalibreDB.update_config(config) db.CalibreDB.update_config(config)
db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path) db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
diff --git a/cps/admin.py b/cps/admin.py diff --git a/cps/admin.py b/cps/admin.py
index 20c58aac..99d2ad19 100644 index 045a9523..825a28af 100644
--- a/cps/admin.py --- a/cps/admin.py
+++ b/cps/admin.py +++ b/cps/admin.py
@@ -101,8 +101,6 @@ def admin_required(f): @@ -102,10 +102,6 @@ def admin_required(f):
@admi.before_app_request @admi.before_app_request
def before_request(): def before_request():
- if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path: - if not ub.check_user_session(current_user.id,
- flask_session.get('_id')) and 'opds' not in request.path \
- and config.config_session == 1:
- logout_user() - logout_user()
g.constants = constants g.constants = constants
g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','') g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
g.allow_registration = config.config_public_reg g.allow_registration = config.config_public_reg