From 91e36b2c7e1016de5f6b8d90201685ded51f7e0a Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 9 Aug 2025 11:20:44 +0200 Subject: [PATCH 1/4] Testrun Use getPath more often --- cps/static/js/table.js | 6 +- pyproject.toml | 4 +- test/Calibre-Web TestSummary_Linux.html | 678 +++++++++++++++++++----- 3 files changed, 556 insertions(+), 132 deletions(-) diff --git a/cps/static/js/table.js b/cps/static/js/table.js index 7f210eb1a..2a1bbe8e5 100644 --- a/cps/static/js/table.js +++ b/cps/static/js/table.js @@ -103,7 +103,7 @@ $(function() { method:"post", contentType: "application/json; charset=utf-8", dataType: "json", - url: window.location.pathname + "/../ajax/mergebooks", + url: getPath() + "/ajax/mergebooks", data: JSON.stringify({"Merge_books":selections}), success: function success() { $("#books-table").bootstrapTable("refresh"); @@ -122,7 +122,7 @@ $(function() { method:"post", contentType: "application/json; charset=utf-8", dataType: "json", - url: window.location.pathname + "/../ajax/simulatemerge", + url: getPath() + "/ajax/simulatemerge", data: JSON.stringify({"Merge_books":selections}), success: function success(booTitles) { $('#merge_from').empty(); @@ -140,7 +140,7 @@ $(function() { method:"post", contentType: "application/json; charset=utf-8", dataType: "json", - url: window.location.pathname + "/../ajax/xchange", + url: getPath() + "/ajax/xchange", data: JSON.stringify({"xchange":selections}), success: function success() { $("#books-table").bootstrapTable("refresh"); diff --git a/pyproject.toml b/pyproject.toml index 778e65e92..146ae4fdb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,11 +48,11 @@ dependencies = [ "urllib3>=1.22,<3.0", "Flask-Limiter>=2.3.0,<3.13.0", "regex>=2022.3.2,<2025.3.20", - "bleach>=6.0.0,<6.2.0", + "bleach>=6.0.0,<6.3.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>=43.0.4,<45.0.0", + "cryptography>=39.0.0,<45.0.0", ] dynamic = ["version"] diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index b6085c788..fee912ee9 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2025-03-25 20:17:40

+

Start Time: 2025-08-05 20:14:09

-

Stop Time: 2025-03-26 03:29:00

+

Stop Time: 2025-08-06 03:42:45

-

Duration: 6h 7 min

+

Duration: 6h 15 min

@@ -1023,12 +1023,12 @@ - + TestEditAdditionalBooks 18 - 18 - 0 - 0 + 3 + 1 + 14 0 Detail @@ -1064,137 +1064,501 @@ - +
TestEditAdditionalBooks - test_delete_role
- PASS + +
+ FAIL +
+ + + + - +
TestEditAdditionalBooks - test_details_popup
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_edit_book_identifier
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_edit_book_identifier_capital
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_edit_book_identifier_standard
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_edit_special_book_identifier
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_title_sort
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_cbz_coverformats
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_edit_role
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_metadata_cb7
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_metadata_cbr
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_metadata_cbt
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_xss_author_edit
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_xss_comment_edit
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_xss_custom_comment_edit
- PASS + +
+ ERROR +
+ + + + @@ -1844,11 +2208,11 @@ - + TestEditBooksList 19 - 19 - 0 + 18 + 1 0 0 @@ -1858,11 +2222,31 @@ - +
TestEditBooksList - test_booklist_xss
- PASS + +
+ FAIL +
+ + + + @@ -2030,13 +2414,13 @@ - + TestLoadMetadata 1 - 0 - 0 1 0 + 0 + 0 Detail @@ -2044,31 +2428,11 @@ - +
TestLoadMetadata - test_load_metadata
- -
- ERROR -
- - - - + PASS @@ -2076,13 +2440,13 @@ IndexError: list index out of range TestEditBooksOnGdrive - 18 - 18 + 19 + 19 0 0 0 - Detail + Detail @@ -2234,7 +2598,7 @@ IndexError: list index out of range -
TestEditBooksOnGdrive - test_upload_book_lit
+
TestEditBooksOnGdrive - test_upload_book_epub
PASS @@ -2242,6 +2606,15 @@ IndexError: list index out of range + +
TestEditBooksOnGdrive - test_upload_book_lit
+ + PASS + + + + +
TestEditBooksOnGdrive - test_watch_metadata
@@ -2572,13 +2945,13 @@ IndexError: list index out of range - + TestFilePicker 3 - 2 - 0 + 1 0 1 + 1 Detail @@ -2621,11 +2994,32 @@ IndexError: list index out of range - +
TestFilePicker - test_two_filepickers
- PASS + +
+ ERROR +
+ + + + @@ -3539,12 +3933,12 @@ IndexError: list index out of range - + TestMergeBooksList 2 - 2 - 0 + 1 0 + 1 0 Detail @@ -3553,11 +3947,32 @@ IndexError: list index out of range - +
TestMergeBooksList - test_book_merge
- PASS + +
+ ERROR +
+ + + + @@ -3922,13 +4337,13 @@ IndexError: list index out of range TestReader + 9 8 - 7 0 0 1 - Detail + Detail @@ -3972,7 +4387,7 @@ IndexError: list index out of range -
TestReader - test_pdf_reader
+
TestReader - test_kepub_reader
PASS @@ -3981,7 +4396,7 @@ IndexError: list index out of range -
TestReader - test_single_file_comic
+
TestReader - test_pdf_reader
PASS @@ -3990,7 +4405,7 @@ IndexError: list index out of range -
TestReader - test_sound_listener
+
TestReader - test_single_file_comic
PASS @@ -3998,6 +4413,15 @@ IndexError: list index out of range + +
TestReader - test_sound_listener
+ + PASS + + + + +
TestReader - test_txt_reader
@@ -5800,10 +6224,10 @@ IndexError: list index out of range Total - 523 - 515 - 0 - 1 + 525 + 500 + 2 + 16 7   @@ -5832,13 +6256,13 @@ IndexError: list index out of range Platform - Linux 6.8.0-52-generic #53~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Wed Jan 15 19:18:46 UTC 2 x86_64 x86_64 + Linux 6.8.0-71-generic #71-Ubuntu SMP PREEMPT_DYNAMIC Tue Jul 22 16:52:38 UTC 2025 x86_64 x86_64 Basic Python - 3.10.12 + 3.12.3 Basic @@ -5856,7 +6280,7 @@ IndexError: list index out of range bleach - 6.1.0 + 6.2.0 Basic @@ -5868,13 +6292,13 @@ IndexError: list index out of range cryptography - 44.0.2 + 44.0.3 Basic Flask - 3.1.0 + 3.1.1 Basic @@ -5910,13 +6334,7 @@ IndexError: list index out of range greenlet - 3.1.1 - Basic - - - - iso-639 - 0.4.5 + 3.2.3 Basic @@ -5928,7 +6346,7 @@ IndexError: list index out of range lxml - 5.3.1 + 5.3.2 Basic @@ -5938,6 +6356,12 @@ IndexError: list index out of range Basic + + pycountry + 24.6.1 + Basic + + pypdf 5.4.0 @@ -5964,19 +6388,19 @@ IndexError: list index out of range requests - 2.32.3 + 2.32.4 Basic SQLAlchemy - 2.0.39 + 2.0.42 Basic tornado - 6.4.2 + 6.5.1 Basic @@ -5988,7 +6412,7 @@ IndexError: list index out of range urllib3 - 2.3.0 + 2.5.0 Basic @@ -6006,7 +6430,7 @@ IndexError: list index out of range google-api-python-client - 2.165.0 + 2.177.0 TestBackupMetadataGdrive @@ -6036,7 +6460,7 @@ IndexError: list index out of range google-api-python-client - 2.165.0 + 2.177.0 TestCliGdrivedb @@ -6066,7 +6490,7 @@ IndexError: list index out of range google-api-python-client - 2.165.0 + 2.177.0 TestEbookConvertCalibreGDrive @@ -6096,7 +6520,7 @@ IndexError: list index out of range google-api-python-client - 2.165.0 + 2.177.0 TestEbookConvertGDriveKepubify @@ -6136,15 +6560,9 @@ IndexError: list index out of range TestEditAdditionalBooks - - py7zr - 0.22.0 - TestEditBooks - - google-api-python-client - 2.165.0 + 2.177.0 TestEditAuthorsGdrive @@ -6174,13 +6592,13 @@ IndexError: list index out of range beautifulsoup4 - 4.13.3 + 4.13.4 TestLoadMetadata google-api-python-client - 2.165.0 + 2.177.0 TestEditBooksOnGdrive @@ -6210,7 +6628,7 @@ IndexError: list index out of range beautifulsoup4 - 4.13.3 + 4.13.4 TestLoadMetadataScholar @@ -6222,7 +6640,7 @@ IndexError: list index out of range google-api-python-client - 2.165.0 + 2.177.0 TestEmbedMetadataGdrive @@ -6252,7 +6670,7 @@ IndexError: list index out of range google-api-python-client - 2.165.0 + 2.177.0 TestSetupGdrive @@ -6294,13 +6712,13 @@ IndexError: list index out of range jsonschema - 4.23.0 + 4.25.0 TestKoboSync jsonschema - 4.23.0 + 4.25.0 TestKoboSyncBig @@ -6312,7 +6730,7 @@ IndexError: list index out of range jsonschema - 4.23.0 + 4.25.0 TestLdapLogin @@ -6334,6 +6752,12 @@ IndexError: list index out of range TestOAuthLogin + + comicapi + 3.2.0 + TestReader + + mutagen 1.47.0 @@ -6348,7 +6772,7 @@ IndexError: list index out of range From 776eeccc678a23438f4f1970b4b20fe369ad0fa9 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 24 Aug 2025 09:50:41 +0200 Subject: [PATCH 2/4] Version bump --- cps/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/constants.py b/cps/constants.py index 48b5a1060..1d620fdbb 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -172,7 +172,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d 'series_id, languages, publisher, pubdate, identifiers') # python build process likes to have x.y.zbw -> b for beta and w a counting number -STABLE_VERSION = '0.6.25b' +STABLE_VERSION = '0.6.25' NIGHTLY_VERSION = dict() NIGHTLY_VERSION[0] = '$Format:%H$' From 0bfe6de62a40068424dd566b9571ce79f0a41205 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 24 Aug 2025 11:02:31 +0200 Subject: [PATCH 3/4] Add certifi to requirements for Mac computer (fix for #3385) --- cps/constants.py | 2 +- requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cps/constants.py b/cps/constants.py index 1d620fdbb..ce38e6127 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -172,7 +172,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d 'series_id, languages, publisher, pubdate, identifiers') # python build process likes to have x.y.zbw -> b for beta and w a counting number -STABLE_VERSION = '0.6.25' +STABLE_VERSION = '0.6.26b' NIGHTLY_VERSION = dict() NIGHTLY_VERSION[0] = '$Format:%H$' diff --git a/requirements.txt b/requirements.txt index e6ee645a8..44f016cd8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,3 +24,4 @@ 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>=39.0.0,<45.0.0 +certifi>=2024.7.4,<2025.8.24 From 0ff1feaef0e82544f62a3c666cef0438746c044e Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 25 Aug 2025 14:43:18 +0200 Subject: [PATCH 4/4] Update optional-requirements.txt (#3446) --- optional-requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/optional-requirements.txt b/optional-requirements.txt index 027389d76..493ad7496 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -1,5 +1,5 @@ # GDrive Integration -google-api-python-client>=1.7.11,<2.200.0 +google-api-python-client>=2.73.00,<2.200.0 gevent>20.6.0,<24.12.0 greenlet>=0.4.17,<3.2.0 httplib2>=0.9.2,<0.23.0 @@ -7,13 +7,13 @@ oauth2client>=4.0.0,<4.1.4 uritemplate>=3.0.0,<4.2.0 pyasn1-modules>=0.0.8,<0.7.0 pyasn1>=0.1.9,<0.7.0 -PyDrive2>=1.3.1,<1.22.0 +PyDrive2>=1.15.0,<1.22.0 PyYAML>=3.12,<6.1 rsa>=3.4.2,<4.10.0 # Gmail -google-auth-oauthlib>=0.4.3,<1.3.0 -google-api-python-client>=1.7.11,<2.200.0 +google-auth-oauthlib>=1.0.0,<1.3.0 +google-api-python-client>=2.73.00,<2.200.0 # goodreads goodreads>=0.3.2,<0.4.0