From 8f5c649d0f746e2a20e7a3cffb238ec6d20b1c5e Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Thu, 18 Mar 2021 18:56:00 +0100 Subject: [PATCH] Updated dependency comicapi (removed pypdf2) Updated dependency pyPDF2 ->pyPDF3 Fixed broken updater in case of http error Bugfixes from testrun Bugfix load cover for BasicMetadata --- cps/updater.py | 1 + cps/uploader.py | 2 +- optional-requirements.txt | 2 +- test/Calibre-Web TestSummary_Linux.html | 1451 +++++------------------ 4 files changed, 316 insertions(+), 1140 deletions(-) diff --git a/cps/updater.py b/cps/updater.py index 52fd2017..837b72be 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -325,6 +325,7 @@ class Updater(threading.Thread): @staticmethod def _load_nightly_data(repository_url, commit, status): + update_data = dict() try: headers = {'Accept': 'application/vnd.github.v3+json'} r = requests.get(repository_url + '/git/commits/' + commit['object']['sha'], diff --git a/cps/uploader.py b/cps/uploader.py index b86ce4dd..a4fe8453 100644 --- a/cps/uploader.py +++ b/cps/uploader.py @@ -102,7 +102,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension): extension=original_file_extension, title=original_file_name, author=_(u'Unknown'), - cover=pdf_preview(tmp_file_path, original_file_name), + cover=None, #pdf_preview(tmp_file_path, original_file_name), description="", tags="", series="", diff --git a/optional-requirements.txt b/optional-requirements.txt index a94bb506..3283777b 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -30,7 +30,7 @@ rarfile>=2.7 # other natsort>=2.2.0,<7.1.0 -comicapi>= 2.1.3,<2.2.0 +comicapi>= 2.2.0,<2.3.0 #Kobo integration jsonschema>=3.2.0,<3.3.0 diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index faa4b57c..c2467a1b 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2021-03-15 10:03:00

+

Start Time: 2021-03-19 06:57:32

-

Stop Time: 2021-03-15 12:18:21

+

Stop Time: 2021-03-19 09:30:30

-

Duration: 1h 47 min

+

Duration: 2h 4 min

@@ -653,11 +653,11 @@ - + TestEditAdditionalBooks 13 - 11 - 1 + 12 + 0 0 1 @@ -676,31 +676,11 @@ - +
TestEditAdditionalBooks - test_delete_book
- -
- FAIL -
- - - - + PASS @@ -822,11 +802,11 @@ AssertionError: False is not true - + TestEditBooks 33 - 31 - 0 + 26 + 5 0 2 @@ -890,47 +870,151 @@ AssertionError: False is not true - +
TestEditBooks - test_edit_custom_float
- PASS + +
+ FAIL +
+ + + + - +
TestEditBooks - test_edit_custom_int
- PASS + +
+ FAIL +
+ + + + - +
TestEditBooks - test_edit_custom_rating
- PASS + +
+ FAIL +
+ + + + - +
TestEditBooks - test_edit_custom_single_select
- PASS + +
+ FAIL +
+ + + + - +
TestEditBooks - test_edit_custom_text
- PASS + +
+ FAIL +
+ + + + @@ -1210,11 +1294,11 @@ AssertionError: False is not true - + TestEditBooksOnGdrive 20 - 19 - 1 + 20 + 0 0 0 @@ -1242,31 +1326,11 @@ AssertionError: False is not true - +
TestEditBooksOnGdrive - test_edit_category
- -
- FAIL -
- - - - + PASS @@ -2358,13 +2422,13 @@ IndexError: list index out of range - - TestEditBooks + + TestUploadPDF + 1 1 0 0 0 - 1 Detail @@ -2372,234 +2436,71 @@ IndexError: list index out of range - + -
TestEditBooks - test_upload_book_pdf
- - -
- SKIP -
- - - +
TestUploadPDF - test_upload_invalid_pdf
+ PASS - - _ErrorHolder - 1 - 0 - 0 - 1 - 0 - - Detail - - - - - - - -
tearDownClass (test_pdf_metadata)
- - -
- ERROR -
- - - - - - - - - - + TestReader 5 - 0 - 0 5 0 + 0 + 0 - Detail + Detail - +
TestReader - test_comic_reader
- -
- ERROR -
- - - - + PASS - +
TestReader - test_epub_reader
- -
- ERROR -
- - - - + PASS - +
TestReader - test_pdf_reader
- -
- ERROR -
- - - - + PASS - +
TestReader - test_sound_listener
- -
- ERROR -
- - - - + PASS - +
TestReader - test_txt_reader
- -
- ERROR -
- - - - + PASS @@ -2613,13 +2514,13 @@ AttributeError: 'bool' object has no attribute 'click' 0 0 - Detail + Detail - +
TestRegister - test_forgot_password
@@ -2628,7 +2529,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestRegister - test_illegal_email
@@ -2637,7 +2538,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestRegister - test_limit_domain
@@ -2646,7 +2547,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestRegister - test_register_no_server
@@ -2655,7 +2556,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestRegister - test_registering_only_email
@@ -2664,7 +2565,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestRegister - test_registering_user
@@ -2673,7 +2574,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestRegister - test_registering_user_fail
@@ -2682,7 +2583,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestRegister - test_user_change_password
@@ -2700,13 +2601,13 @@ AttributeError: 'bool' object has no attribute 'click' 0 1 - Detail + Detail - +
TestShelf - test_add_shelf_from_search
@@ -2715,7 +2616,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_arrange_shelf
@@ -2724,7 +2625,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_delete_book_of_shelf
@@ -2733,7 +2634,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_private_shelf
@@ -2742,7 +2643,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_public_private_shelf
@@ -2751,7 +2652,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_public_shelf
@@ -2760,7 +2661,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_rename_shelf
@@ -2769,7 +2670,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_shelf_action_non_shelf_edit_role
@@ -2778,7 +2679,7 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_shelf_anonymous
@@ -2787,19 +2688,19 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestShelf - test_shelf_database_change
- SKIP + SKIP
-