From 2fff002699da72a2d49f0947d18046e3639508fa Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 11 Nov 2024 18:46:07 +0100 Subject: [PATCH] Fix for stable update version --- cps/admin.py | 2 +- cps/static/js/caliBlur.js | 0 cps/tasks/convert.py | 0 cps/templates/config_edit.html | 0 cps/updater.py | 2 +- pyproject.toml | 1 + test/Calibre-Web TestSummary_Linux.html | 225 +++++++++++++++++------- 7 files changed, 166 insertions(+), 64 deletions(-) mode change 100755 => 100644 cps/static/js/caliBlur.js mode change 100755 => 100644 cps/tasks/convert.py mode change 100755 => 100644 cps/templates/config_edit.html diff --git a/cps/admin.py b/cps/admin.py index 6252b317..6076e86d 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -219,7 +219,7 @@ def admin(): form_date += timedelta(hours=int(commit[20:22]), minutes=int(commit[23:])) commit = format_datetime(form_date - tz, format='short') else: - commit = version.replace("b", " Beta") + commit = version['version'].replace("b", " Beta") all_user = ub.session.query(ub.User).all() # email_settings = mail_config.get_mail_settings() diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js old mode 100755 new mode 100644 diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py old mode 100755 new mode 100644 diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html old mode 100755 new mode 100644 diff --git a/cps/updater.py b/cps/updater.py index ab67e7a6..e33b80f4 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -329,7 +329,7 @@ class Updater(threading.Thread): @classmethod def _stable_version_info(cls): log.debug("Stable version: {}".format(constants.STABLE_VERSION)) - return constants.STABLE_VERSION # Current Version + return {'version': constants.STABLE_VERSION } @classmethod def dry_run(cls): diff --git a/pyproject.toml b/pyproject.toml index 43221289..49f2d915 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,6 +50,7 @@ dependencies = [ "regex>=2022.3.2,<2024.6.25", "bleach>=6.0.0,<6.2.0", "python-magic>=0.4.27,<0.5.0", + "python-magic-bin>=0.4.0,<0.5.0;sys_platform=='win32'", "flask-httpAuth>=4.4.0,<5.0.0", "cryptography>=30.0.0,<44.0.0", ] diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 629d9ce7..f7d5c054 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2024-11-02 20:22:07

+

Start Time: 2024-11-10 20:11:07

-

Stop Time: 2024-11-03 03:38:36

+

Stop Time: 2024-11-11 03:26:27

-

Duration: 6h 9 min

+

Duration: 6h 7 min

@@ -3390,12 +3390,12 @@ AssertionError: 'https://comicvine.gamespot.com/' != 'https://amazon - + TestLogin 19 - 18 + 19 + 0 0 - 1 0 Detail @@ -3530,46 +3530,11 @@ AssertionError: 'https://comicvine.gamespot.com/' != 'https://amazon - +
TestLogin - test_password_policy
- -
- ERROR -
- - - - + PASS @@ -4672,12 +4637,12 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16 - + TestUpdater 9 - 8 - 0 - 0 + 3 + 1 + 4 1 Detail @@ -4704,38 +4669,154 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16 - +
TestUpdater - test_check_update_stable_errors
- PASS + +
+ ERROR +
+ + + + - +
TestUpdater - test_check_update_stable_versions
- PASS + +
+ ERROR +
+ + + + - +
TestUpdater - test_perform_update
- PASS + +
+ ERROR +
+ + + + - +
TestUpdater - test_perform_update_stable_errors
- PASS + +
+ ERROR +
+ + + + @@ -4775,11 +4856,31 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16 - +
TestUpdater - test_update_write_protect
- PASS + +
+ FAIL +
+ + + + @@ -5873,9 +5974,9 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16 Total 525 - 514 - 1 - 1 + 510 + 2 + 4 9   @@ -6072,7 +6173,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16 Werkzeug - 3.1.1 + 3.1.3 Basic @@ -6420,7 +6521,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:136:16