From 96b1e8960ba9b2e50aeeed6690ed676a4194aa04 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 9 Jan 2022 12:55:38 +0100 Subject: [PATCH] Bugfix send to kindle with multiple formats --- cps/templates/detail.html | 2 +- optional-requirements.txt | 2 +- setup.cfg | 2 +- test/Calibre-Web TestSummary_Linux.html | 1493 ++++++++++++++++------- 4 files changed, 1065 insertions(+), 434 deletions(-) diff --git a/cps/templates/detail.html b/cps/templates/detail.html index 1fd5f09a..c8d7d527 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -41,7 +41,7 @@
{{kindle_list[0]['text']}}
{% else %}
- diff --git a/optional-requirements.txt b/optional-requirements.txt index b90951aa..2368be10 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -22,7 +22,7 @@ goodreads>=0.3.2,<0.4.0 python-Levenshtein>=0.12.0,<0.13.0 # ldap login -python-ldap>=3.0.0,<3.4.0 +python-ldap>=3.0.0,<3.5.0 Flask-SimpleLDAP>=1.4.0,<1.5.0 #oauth diff --git a/setup.cfg b/setup.cfg index a81102b8..52f1d813 100644 --- a/setup.cfg +++ b/setup.cfg @@ -75,7 +75,7 @@ goodreads = goodreads>=0.3.2,<0.4.0 python-Levenshtein>=0.12.0,<0.13.0 ldap = - python-ldap>=3.0.0,<3.4.0 + python-ldap>=3.0.0,<3.5.0 Flask-SimpleLDAP>=1.4.0,<1.5.0 oauth = Flask-Dance>=2.0.0,<5.2.0 diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 511300be..8b724a93 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2022-01-02 17:11:15

+

Start Time: 2022-01-08 19:04:30

-

Stop Time: 2022-01-02 21:33:59

+

Stop Time: 2022-01-08 22:45:06

-

Duration: 3h 43 min

+

Duration: 3h 0 min

@@ -411,45 +411,25 @@ - + TestEbookConvertCalibre - 15 - 14 + 18 + 12 1 - 0 + 5 0 - Detail + Detail - +
TestEbookConvertCalibre - test_calibre_log
- -
- FAIL -
- - - - + PASS @@ -553,29 +533,210 @@ AssertionError: False is not true - +
TestEbookConvertCalibre - test_ssl_smtp_setup_error
- PASS + +
+ FAIL +
+ + + + + + + + + + +
TestEbookConvertCalibre - test_ssl_smtp_setup_error
+ + +
+ ERROR +
+ + + + - +
TestEbookConvertCalibre - test_starttls_smtp_setup_error
- PASS + +
+ ERROR +
+ + + + + + + + + + +
TestEbookConvertCalibre - test_starttls_smtp_setup_error
+ + +
+ ERROR +
+ + + + - +
TestEbookConvertCalibre - test_user_convert_xss
- PASS + +
+ ERROR +
+ + + + + + + + + + +
TestEbookConvertCalibre - test_user_convert_xss
+ + +
+ ERROR +
+ + + + @@ -734,11 +895,11 @@ AssertionError: False is not true - + TestEditAdditionalBooks 16 - 13 - 1 + 14 + 0 0 2 @@ -811,31 +972,11 @@ AssertionError: False is not true - +
TestEditAdditionalBooks - test_title_sort
- -
- FAIL -
- - - - + PASS @@ -1277,12 +1418,12 @@ AssertionError: 7 != 6 - + TestEditBooksList 18 - 18 - 0 + 17 0 + 1 0 Detail @@ -1408,11 +1549,33 @@ AssertionError: 7 != 6 - +
TestEditBooksList - test_bookslist_edit_seriesindex
- PASS + +
+ ERROR +
+ + + + @@ -1454,13 +1617,13 @@ AssertionError: 7 != 6 - - TestEditMetadata + + TestLoadMetadata 1 - 0 1 0 0 + 0 Detail @@ -1468,31 +1631,11 @@ AssertionError: 7 != 6 - + -
TestEditMetadata - test_upload_book_lit
- - -
- FAIL -
- - - +
TestLoadMetadata - test_load_metadata
+ PASS @@ -1694,14 +1837,14 @@ AssertionError: '' != False - TestSTARTTLS - 3 - 3 + TestLoadMetadataScholar + 1 + 1 0 0 0 - Detail + Detail @@ -1709,25 +1852,7 @@ AssertionError: '' != False -
TestSTARTTLS - test_STARTTLS
- - PASS - - - - - - -
TestSTARTTLS - test_STARTTLS_SSL_setup_error
- - PASS - - - - - - -
TestSTARTTLS - test_STARTTLS_resend_password
+
TestLoadMetadataScholar - test_load_metadata
PASS @@ -1735,79 +1860,391 @@ AssertionError: '' != False - - TestSSL - 7 - 7 - 0 + + TestSTARTTLS + 3 0 + 1 + 2 0 - Detail + Detail - + -
TestSSL - test_SSL_None_setup_error
+
TestSTARTTLS - test_STARTTLS
- PASS - - - - - - -
TestSSL - test_SSL_STARTTLS_setup_error
+ +
+ FAIL +
+ + + - PASS - + + +
TestSTARTTLS - test_STARTTLS_SSL_setup_error
+ + +
+ ERROR +
+ + + + + + + + + + +
TestSTARTTLS - test_STARTTLS_resend_password
+ + +
+ ERROR +
+ + + + + + + + + + + TestSSL + 7 + 0 + 1 + 6 + 0 + + Detail + + + + + + + +
TestSSL - test_SSL_None_setup_error
+ + +
+ FAIL +
+ + + + + + + + + + +
TestSSL - test_SSL_STARTTLS_setup_error
+ + +
+ ERROR +
+ + + + + + + + +
TestSSL - test_SSL_logging_email
- PASS + +
+ ERROR +
+ + + + - +
TestSSL - test_SSL_non_admin_user
- PASS + +
+ ERROR +
+ + + + - +
TestSSL - test_SSL_only
- PASS + +
+ ERROR +
+ + + + - +
TestSSL - test_email_limit
- PASS + +
+ ERROR +
+ + + + - +
TestSSL - test_filepicker_two_file
- PASS + +
+ ERROR +
+ + + + @@ -1821,13 +2258,13 @@ AssertionError: '' != False 0 0 - Detail + Detail - +
TestBookDatabase - test_invalid_book_path
@@ -1845,13 +2282,13 @@ AssertionError: '' != False 0 0 - Detail + Detail - +
TestErrorReadColumn - test_invalid_custom_column
@@ -1869,13 +2306,13 @@ AssertionError: '' != False 0 0 - Detail + Detail - +
TestFilePicker - test_filepicker_limited_file
@@ -1893,13 +2330,13 @@ AssertionError: '' != False 0 0 - Detail + Detail - +
TestSetupGdrive - test_config_gdrive
@@ -1917,13 +2354,13 @@ AssertionError: '' != False 0 0 - Detail + Detail - +
TestGoodreads - test_author_page
@@ -1932,7 +2369,7 @@ AssertionError: '' != False - +
TestGoodreads - test_author_page_invalid
@@ -1941,7 +2378,7 @@ AssertionError: '' != False - +
TestGoodreads - test_goodreads_about
@@ -1959,13 +2396,13 @@ AssertionError: '' != False 0 0 - Detail + Detail - +
TestKoboSync - test_book_download
@@ -1974,7 +2411,7 @@ AssertionError: '' != False - +
TestKoboSync - test_kobo_about
@@ -1983,7 +2420,7 @@ AssertionError: '' != False - +
TestKoboSync - test_kobo_sync_selected_shelfs
@@ -1992,7 +2429,7 @@ AssertionError: '' != False - +
TestKoboSync - test_kobo_upload_book
@@ -2001,7 +2438,7 @@ AssertionError: '' != False - +
TestKoboSync - test_shelves_add_remove_books
@@ -2010,7 +2447,7 @@ AssertionError: '' != False - +
TestKoboSync - test_sync_changed_book
@@ -2019,7 +2456,7 @@ AssertionError: '' != False - +
TestKoboSync - test_sync_invalid
@@ -2028,7 +2465,7 @@ AssertionError: '' != False - +
TestKoboSync - test_sync_reading_state
@@ -2037,7 +2474,7 @@ AssertionError: '' != False - +
TestKoboSync - test_sync_shelf
@@ -2046,7 +2483,7 @@ AssertionError: '' != False - +
TestKoboSync - test_sync_unchanged
@@ -2055,7 +2492,7 @@ AssertionError: '' != False - +
TestKoboSync - test_sync_upload
@@ -2065,21 +2502,21 @@ AssertionError: '' != False - + TestKoboSyncBig 5 - 5 - 0 + 3 + 2 0 0 - Detail + Detail - +
TestKoboSyncBig - test_kobo_sync_multi_user
@@ -2088,16 +2525,38 @@ AssertionError: '' != False - +
TestKoboSyncBig - test_kobo_sync_selected_shelfs
- PASS + +
+ FAIL +
+ + + + - +
TestKoboSyncBig - test_sync_changed_book
@@ -2106,16 +2565,36 @@ AssertionError: '' != False - +
TestKoboSyncBig - test_sync_reading_state
- PASS + +
+ FAIL +
+ + + + - +
TestKoboSyncBig - test_sync_shelf
@@ -2125,21 +2604,21 @@ AssertionError: '' != False - + TestLdapLogin 13 - 13 - 0 - 0 + 6 + 6 + 1 0 - Detail + Detail - +
TestLdapLogin - test_LDAP_SSL
@@ -2148,25 +2627,71 @@ AssertionError: '' != False - +
TestLdapLogin - test_LDAP_SSL_CERTIFICATE
- PASS + +
+ FAIL +
+ + + + - +
TestLdapLogin - test_LDAP_STARTTLS
- PASS + +
+ ERROR +
+ + + + - +
TestLdapLogin - test_LDAP_fallback_Login
@@ -2175,16 +2700,36 @@ AssertionError: '' != False - +
TestLdapLogin - test_LDAP_import
- PASS + +
+ FAIL +
+ + + + - +
TestLdapLogin - test_LDAP_import_memberfield
@@ -2193,16 +2738,36 @@ AssertionError: '' != False - +
TestLdapLogin - test_LDAP_login
- PASS + +
+ FAIL +
+ + + + - +
TestLdapLogin - test_invalid_LDAP
@@ -2211,7 +2776,7 @@ AssertionError: '' != False - +
TestLdapLogin - test_ldap_about
@@ -2220,25 +2785,65 @@ AssertionError: '' != False - +
TestLdapLogin - test_ldap_authentication
- PASS + +
+ FAIL +
+ + + + - +
TestLdapLogin - test_ldap_kobo_sync
- PASS + +
+ FAIL +
+ + + + - +
TestLdapLogin - test_ldap_opds_anonymous
@@ -2247,11 +2852,31 @@ AssertionError: '' != False - +
TestLdapLogin - test_ldap_opds_download_book
- PASS + +
+ FAIL +
+ + + + @@ -2265,13 +2890,13 @@ AssertionError: '' != False 0 0 - Detail + Detail - +
TestCalibreWebListOrders - test_author_sort
@@ -2280,7 +2905,7 @@ AssertionError: '' != False - +
TestCalibreWebListOrders - test_download_sort
@@ -2289,7 +2914,7 @@ AssertionError: '' != False - +
TestCalibreWebListOrders - test_format_sort
@@ -2298,7 +2923,7 @@ AssertionError: '' != False - +
TestCalibreWebListOrders - test_lang_sort
@@ -2307,7 +2932,7 @@ AssertionError: '' != False - +
TestCalibreWebListOrders - test_publisher_sort
@@ -2316,7 +2941,7 @@ AssertionError: '' != False - +
TestCalibreWebListOrders - test_ratings_sort
@@ -2325,7 +2950,7 @@ AssertionError: '' != False - +
TestCalibreWebListOrders - test_series_sort
@@ -2334,7 +2959,7 @@ AssertionError: '' != False - +
TestCalibreWebListOrders - test_tags_sort
@@ -2352,13 +2977,13 @@ AssertionError: '' != False 0 1 - Detail + Detail - +
TestLogging - test_access_log_recover
@@ -2367,7 +2992,7 @@ AssertionError: '' != False - +
TestLogging - test_debug_log
@@ -2376,7 +3001,7 @@ AssertionError: '' != False - +
TestLogging - test_debuginfo_download
@@ -2385,7 +3010,7 @@ AssertionError: '' != False - +
TestLogging - test_failed_login
@@ -2394,19 +3019,19 @@ AssertionError: '' != False - +
TestLogging - test_failed_register
- SKIP + SKIP
-