diff --git a/cps/helper.py b/cps/helper.py index 3b0c2a04..4dabcfce 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -738,16 +738,18 @@ def save_cover_from_url(url, book_path): return save_cover(img, book_path) except (socket.gaierror, requests.exceptions.HTTPError, + requests.exceptions.InvalidURL, requests.exceptions.ConnectionError, requests.exceptions.Timeout) as ex: - log.info(u'Cover Download Error %s', ex) + # "Invalid host" can be the result of a redirect response + log.error(u'Cover Download Error %s', ex) return False, _("Error Downloading Cover") except MissingDelegateError as ex: log.info(u'File Format Error %s', ex) return False, _("Cover Format Error") - except UnacceptableAddressException: - log.error("Localhost was accessed for cover upload") - return False, _("You are not allowed to access localhost for cover uploads") + except UnacceptableAddressException as e: + log.error("Localhost or local network was accessed for cover upload") + return False, _("You are not allowed to access localhost or the local network for cover uploads") def save_cover_from_filestorage(filepath, saved_filename, img): diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index b2de4c81..e3b7a3d7 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2022-03-13 21:32:38

+

Start Time: 2022-03-14 21:13:33

-

Stop Time: 2022-03-14 02:20:13

+

Stop Time: 2022-03-15 02:05:20

-

Duration: 3h 59 min

+

Duration: 4h 3 min

@@ -363,11 +363,11 @@ - + TestCoverEditBooks 2 - 1 - 1 + 2 + 0 0 0 @@ -386,31 +386,11 @@ - +
TestCoverEditBooks - test_upload_jpg
- -
- FAIL -
- - - - + PASS @@ -701,11 +681,11 @@ AssertionError: False is not true - + TestEbookConvertGDriveKepubify 3 - 2 - 1 + 3 + 0 0 0 @@ -724,33 +704,11 @@ AssertionError: False is not true - +
TestEbookConvertGDriveKepubify - test_convert_only
- -
- FAIL -
- - - - + PASS @@ -1628,12 +1586,12 @@ AssertionError: 'Failed' != 'Finished' - + TestEditBooksOnGdrive 20 - 16 + 17 3 - 1 + 0 0 Detail @@ -1651,41 +1609,11 @@ AssertionError: 'Failed' != 'Finished' - +
TestEditBooksOnGdrive - test_edit_author
- -
- ERROR -
- - - - + PASS @@ -1833,7 +1761,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16
Traceback (most recent call last):
-  File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 868, in test_upload_book_epub
+  File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 853, in test_upload_book_epub
     self.assertEqual('8936', resp.headers['Content-Length'])
 AssertionError: '8936' != '1103'
 - 8936
@@ -1873,7 +1801,7 @@ AssertionError: '8936' != '1103'
                     
Traceback (most recent call last):
-  File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 781, in test_upload_cover_hdd
+  File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 766, in test_upload_cover_hdd
     self.assertGreater(diff('original.png', 'jpeg.png', delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02
@@ -1902,9 +1830,9 @@ AssertionError: 0.0 not greater than 0.02
Traceback (most recent call last):
-  File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 950, in test_watch_metadata
+  File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 935, in test_watch_metadata
     self.assertNotIn('series', book)
-AssertionError: 'series' unexpectedly found in {'id': 5, 'reader': [], 'title': 'testbook', 'author': ['John Döe'], 'rating': 0, 'languages': ['English'], 'identifier': [], 'cover': '/cover/5?edit=f66a16a8-b9e1-446d-b1ad-21b11df67753', 'tag': [], 'publisher': ['Randomhäus'], 'pubdate': 'Jan 19, 2017', 'comment': 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate', 'add_shelf': [], 'del_shelf': [], 'edit_enable': True, 'kindle': None, 'kindlebtn': None, 'download': ['EPUB (6.7 kB)'], 'read': False, 'archived': False, 'series_all': 'Book 1 of test', 'series_index': '1', 'series': 'test', 'cust_columns': []}
+AssertionError: 'series' unexpectedly found in {'id': 5, 'reader': [], 'title': 'testbook', 'author': ['John Döe'], 'rating': 0, 'languages': ['English'], 'identifier': [], 'cover': '/cover/5?edit=2e081d1c-86d2-461f-a309-e51e1e378161', 'tag': [], 'publisher': ['Randomhäus'], 'pubdate': 'Jan 19, 2017', 'comment': 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate', 'add_shelf': [], 'del_shelf': [], 'edit_enable': True, 'kindle': None, 'kindlebtn': None, 'download': ['EPUB (6.7 kB)'], 'read': False, 'archived': False, 'series_all': 'Book 1 of test', 'series_index': '1', 'series': 'test', 'cust_columns': []}
@@ -2963,12 +2891,12 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're - + TestOPDSFeed 23 - 14 - 4 - 5 + 23 + 0 + 0 0 Detail @@ -2977,62 +2905,20 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're - +
TestOPDSFeed - test_opds
- -
- FAIL -
- - - - + PASS - +
TestOPDSFeed - test_opds_author
- -
- ERROR -
- - - - + PASS @@ -3091,31 +2977,11 @@ UnboundLocalError: local variable 'key' referenced before assignment +
TestOPDSFeed - test_opds_guest_user
- -
- FAIL -
- - - - + PASS @@ -3138,62 +3004,20 @@ AssertionError: 200 != 500 - +
TestOPDSFeed - test_opds_non_admin
- -
- FAIL -
- - - - + PASS - +
TestOPDSFeed - test_opds_publisher
- -
- ERROR -
- - - - + PASS @@ -3207,33 +3031,11 @@ UnboundLocalError: local variable 'key' referenced before assignment +
TestOPDSFeed - test_opds_ratings
- -
- ERROR -
- - - - + PASS @@ -3247,62 +3049,20 @@ UnboundLocalError: local variable 'key' referenced before assignment +
TestOPDSFeed - test_opds_search
- -
- FAIL -
- - - - + PASS - +
TestOPDSFeed - test_opds_series
- -
- ERROR -
- - - - + PASS @@ -3316,33 +3076,11 @@ UnboundLocalError: local variable 'key' referenced before assignment +
TestOPDSFeed - test_opds_tags
- -
- ERROR -
- - - - + PASS @@ -3375,62 +3113,6 @@ UnboundLocalError: local variable 'key' referenced before assignment - _ErrorHolder - 1 - 0 - 0 - 1 - 0 - - Detail - - - - - - - -
tearDownClass (test_opds_feed)
- - -
- ERROR -
- - - - - - - - - TestUploadPDF 1 @@ -3439,13 +3121,13 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:160 0 - Detail + Detail - +
TestUploadPDF - test_upload_invalid_pdf
@@ -3463,13 +3145,13 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:160 0 - Detail + Detail - +
TestReader - test_comic_reader
@@ -3478,7 +3160,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestReader - test_epub_reader
@@ -3487,7 +3169,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestReader - test_pdf_reader
@@ -3496,7 +3178,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestReader - test_sound_listener
@@ -3505,7 +3187,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestReader - test_txt_reader
@@ -3523,13 +3205,13 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:160 0 - Detail + Detail - +
TestReadOnlyDatabase - test_readonly_path
@@ -3547,13 +3229,13 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:160 0 - Detail + Detail - +
TestReconnect - test_reconnect_endpoint
@@ -3571,13 +3253,13 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:160 0 - Detail + Detail - +
TestRegister - test_forgot_password
@@ -3586,7 +3268,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestRegister - test_illegal_email
@@ -3595,7 +3277,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestRegister - test_limit_domain
@@ -3604,7 +3286,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestRegister - test_register_no_server
@@ -3613,7 +3295,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestRegister - test_registering_only_email
@@ -3622,7 +3304,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestRegister - test_registering_user
@@ -3631,7 +3313,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestRegister - test_registering_user_fail
@@ -3640,7 +3322,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestRegister - test_user_change_password
@@ -3658,13 +3340,13 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:160 0 - Detail + Detail - +
TestReverseProxy - test_logout
@@ -3673,7 +3355,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestReverseProxy - test_move_page
@@ -3682,7 +3364,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestReverseProxy - test_reverse_about
@@ -3692,21 +3374,21 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 + TestShelf 16 - 14 - 1 + 15 + 0 0 1 - Detail + Detail - +
TestShelf - test_access_shelf
@@ -3715,7 +3397,7 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestShelf - test_add_shelf_from_search
@@ -3724,36 +3406,16 @@ element.find/</<@chrome://remote/content/marionette/element.js:300:16 +
TestShelf - test_adv_search_shelf
- -
- FAIL -
- - - - + PASS - +
TestShelf - test_arrange_shelf
@@ -3762,7 +3424,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_create_public_shelf
@@ -3771,7 +3433,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_create_public_shelf_no_permission
@@ -3780,7 +3442,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_delete_book_of_shelf
@@ -3789,7 +3451,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_private_shelf
@@ -3798,7 +3460,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_public_private_shelf
@@ -3807,7 +3469,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_public_shelf
@@ -3816,7 +3478,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_rename_shelf
@@ -3825,7 +3487,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_shelf_action_non_shelf_edit_role
@@ -3834,7 +3496,7 @@ AssertionError: 3 != 2 - +
TestShelf - test_shelf_anonymous
@@ -3843,19 +3505,19 @@ AssertionError: 3 != 2 - +
TestShelf - test_shelf_database_change
- SKIP + SKIP
-