From f96b20717deef44a6c81746129234cda88651b06 Mon Sep 17 00:00:00 2001 From: Angel Docampo Date: Thu, 4 Mar 2021 00:01:03 +0100 Subject: [PATCH 1/3] Updated spanish messages.po Corrected a grammatical error --- cps/translations/es/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po index 85861e65..bae0a86b 100644 --- a/cps/translations/es/LC_MESSAGES/messages.po +++ b/cps/translations/es/LC_MESSAGES/messages.po @@ -428,7 +428,7 @@ msgstr "Fallo al mover el archivo de cubierta %(file)s: %(error)s" #: cps/editbooks.py:923 #, python-format msgid "File %(file)s uploaded" -msgstr "El fichero %(file)s a sido subido" +msgstr "El fichero %(file)s ha sido subido" #: cps/editbooks.py:949 msgid "Source or destination format for conversion missing" From d31b26ae7dbb76beb61bd875cc8023fba2f8b450 Mon Sep 17 00:00:00 2001 From: ElQuimm <50202052+ElQuimm@users.noreply.github.com> Date: Thu, 4 Mar 2021 14:26:36 +0100 Subject: [PATCH 2/3] Updated italian message.po Have a nice day. --- cps/translations/it/LC_MESSAGES/messages.po | 54 ++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po index 57eb71f6..844e7536 100644 --- a/cps/translations/it/LC_MESSAGES/messages.po +++ b/cps/translations/it/LC_MESSAGES/messages.po @@ -70,15 +70,15 @@ msgstr "Vuoi veramente eliminare il token di Kobo?" #: cps/admin.py:258 msgid "Do you really want to delete this domain?" -msgstr "" +msgstr "Vuoi veramente eliminare questo dominio?" #: cps/admin.py:260 msgid "Do you really want to delete this user?" -msgstr "" +msgstr "Vuoi veramente eliminare questo utente?" #: cps/admin.py:262 cps/templates/shelf.html:90 msgid "Are you sure you want to delete this shelf?" -msgstr "Vuoi davvero eliminare questo scaffale?" +msgstr "Vuoi veramente eliminare questo scaffale?" #: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534 #: cps/templates/modal_dialogs.html:29 @@ -562,7 +562,7 @@ msgstr "Il file della copertina non è in un formato immagine valido o non può #: cps/helper.py:621 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile" -msgstr "" +msgstr "Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per le copertine" #: cps/helper.py:634 msgid "Only jpg/jpeg files are supported as coverfile" @@ -598,7 +598,7 @@ msgstr "Stato sconosciuto" #: cps/kobo_auth.py:130 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device" -msgstr "" +msgstr "Per favore accedi a calibe-web non da localhost per ottenere un api-endpoint valido per il lettore kobo" #: cps/kobo_auth.py:133 cps/kobo_auth.py:161 msgid "Kobo Setup" @@ -796,7 +796,7 @@ msgstr "Formati file" #: cps/render_template.py:85 msgid "Show file formats selection" -msgstr "Mostra la selezione del formato dei file" +msgstr "Mostra l'opzione per la selezione del formato dei file" #: cps/render_template.py:87 cps/web.py:664 msgid "Archived Books" @@ -888,12 +888,12 @@ msgstr "C'era un errore" #: cps/shelf.py:281 #, python-format msgid "A public shelf with the name '%(title)s' already exists." -msgstr "Uno scaffale pubblico denominato '%(title)s' esiste già." +msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'." #: cps/shelf.py:291 #, python-format msgid "A private shelf with the name '%(title)s' already exists." -msgstr "Uno scaffale privato denominato '%(title)s' esiste già." +msgstr "Esiste già uno scaffale privato denominato '%(title)s'." #: cps/shelf.py:358 #, python-format @@ -915,7 +915,7 @@ msgstr "Dati inattesi durante il processo di aggiornamento" #: cps/updater.py:302 cps/updater.py:413 msgid "No update available. You already have the latest version installed" -msgstr "Nessun aggiornamento disponibile. Hai già installato l'ultima versione" +msgstr "Nessun aggiornamento disponibile. Hai già installata l'ultima versione" #: cps/updater.py:334 msgid "A new update is available. Click on the button below to update to the latest version." @@ -1038,7 +1038,7 @@ msgstr "Valutazione >= %(rating)s" #: cps/web.py:1072 #, python-format msgid "Read Status = %(status)s" -msgstr "" +msgstr "Stato di lettura = %(status)s" #: cps/web.py:1246 #, python-format @@ -1065,7 +1065,7 @@ msgstr "registra" #: cps/web.py:1285 msgid "Invalid e-mail address format" -msgstr "" +msgstr "L'e-mail non è scritto in un formato valido" #: cps/web.py:1312 msgid "Your e-mail is not allowed to register" @@ -1505,7 +1505,7 @@ msgstr "Valutazione" #: cps/templates/book_edit.html:98 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)" -msgstr "Carica la copertina da URL (jpg - L'immagine della copertina viene scaricata e salvata nel database)" +msgstr "Carica la copertina da URL (jpeg - l'immagine della copertina viene scaricata e salvata nel database)" #: cps/templates/book_edit.html:102 msgid "Upload Cover from Local Disk" @@ -1692,7 +1692,7 @@ msgstr "Posizione del database di Calibre" #: cps/templates/config_edit.html:29 msgid "To activate serverside filepicker start Calibre-Web with -f option" -msgstr "" +msgstr "Per attivare sul server la funzione filepicker (per permettere al server di leggere i file locali selezionati), avviare Calibre-Web con l'opzione -f" #: cps/templates/config_edit.html:35 msgid "Use Google Drive?" @@ -1945,7 +1945,7 @@ msgstr "LDAP Member User Filter Detection" #: cps/templates/config_edit.html:344 msgid "Autodetect" -msgstr "Autodetect" +msgstr "Autodetect - determina automaticamente" #: cps/templates/config_edit.html:345 msgid "Custom Filter" @@ -2229,7 +2229,7 @@ msgstr "Ordina in ordine discendente secondo l'indice della serie" #: cps/templates/index.xml:6 msgid "Start" -msgstr "Inizio" +msgstr "Avvio" #: cps/templates/index.xml:21 msgid "Popular publications from this catalog based on Downloads." @@ -2430,7 +2430,7 @@ msgstr "e dal disco rigido" #: cps/templates/modal_dialogs.html:56 msgid "Important Kobo Note: deleted books will remain on any paired Kobo device." -msgstr "Oservazione importante riguardo a Kobo: i libri eliminati, rimarranno in ogni lettore Kobo accoppiato." +msgstr "Osservazione importante riguardo Kobo: i libri eliminati, rimarranno in ogni lettore Kobo accoppiato." #: cps/templates/modal_dialogs.html:57 msgid "Books must first be archived and the device synced before a book can safely be deleted." @@ -2438,27 +2438,27 @@ msgstr "Prima di poter eliminare in sicurezza un libro, occorre che il libro ven #: cps/templates/modal_dialogs.html:76 msgid "Choose File Location" -msgstr "" +msgstr "Scegli la posizione del file" #: cps/templates/modal_dialogs.html:82 msgid "type" -msgstr "" +msgstr "tipo" #: cps/templates/modal_dialogs.html:83 msgid "name" -msgstr "" +msgstr "nome" #: cps/templates/modal_dialogs.html:84 msgid "size" -msgstr "" +msgstr "dimensione" #: cps/templates/modal_dialogs.html:90 msgid "Parent Directory" -msgstr "" +msgstr "Cartella principale" #: cps/templates/modal_dialogs.html:98 msgid "Select" -msgstr "" +msgstr "Seleziona" #: cps/templates/osd.xml:5 msgid "Calibre-Web eBook Catalog" @@ -2622,7 +2622,7 @@ msgstr "Data di pubblicazione fino a" #: cps/templates/search_form.html:35 msgid "Read Status" -msgstr "" +msgstr "Stato di lettura" #: cps/templates/search_form.html:52 msgid "Exclude Tags" @@ -2658,19 +2658,19 @@ msgstr "Cancella questo scaffale" #: cps/templates/shelf.html:11 msgid "Edit Shelf Properties" -msgstr "" +msgstr "Modifica le caratteristiche dello scaffale" #: cps/templates/shelf.html:13 msgid "Arrange books manually" -msgstr "" +msgstr "Disponi i libri manualmente" #: cps/templates/shelf.html:14 msgid "Disable Change order" -msgstr "" +msgstr "Disabilita la modifica della disposizione" #: cps/templates/shelf.html:14 msgid "Enable Change order" -msgstr "" +msgstr "Abilita la modifica della disposizione" #: cps/templates/shelf.html:93 msgid "Shelf will be deleted for all users" From 6229e4610a3e9e688f1437fedff93cafa13fe443 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 15 Mar 2021 08:10:42 +0100 Subject: [PATCH 3/3] Updated teststatus and bugfix convert ebooks --- cps/helper.py | 62 +-- test/Calibre-Web TestSummary_Linux.html | 623 ++++++++++++++++-------- 2 files changed, 451 insertions(+), 234 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index 88c0550b..1e9c0321 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -137,43 +137,8 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False): return -def check_send_to_kindle_without_converter(entry): +def check_send_to_kindle_with_converter(formats): bookformats = list() - # no converter - only for mobi and pdf formats - for ele in iter(entry.data): - if ele.uncompressed_size < config.mail_size: - if 'MOBI' in ele.format: - bookformats.append({'format': 'Mobi', - 'convert': 0, - 'text': _('Send %(format)s to Kindle', format='Mobi')}) - if 'PDF' in ele.format: - bookformats.append({'format': 'Pdf', - 'convert': 0, - 'text': _('Send %(format)s to Kindle', format='Pdf')}) - if 'AZW' in ele.format: - bookformats.append({'format': 'Azw', - 'convert': 0, - 'text': _('Send %(format)s to Kindle', format='Azw')}) - return bookformats - -def check_send_to_kindle_with_converter(entry): - bookformats = list() - formats = list() - for ele in iter(entry.data): - if ele.uncompressed_size < config.mail_size: - formats.append(ele.format) - if 'MOBI' in formats: - bookformats.append({'format': 'Mobi', - 'convert': 0, - 'text': _('Send %(format)s to Kindle', format='Mobi')}) - if 'AZW' in formats: - bookformats.append({'format': 'Azw', - 'convert': 0, - 'text': _('Send %(format)s to Kindle', format='Azw')}) - if 'PDF' in formats: - bookformats.append({'format': 'Pdf', - 'convert': 0, - 'text': _('Send %(format)s to Kindle', format='Pdf')}) if 'EPUB' in formats and 'MOBI' not in formats: bookformats.append({'format': 'Mobi', 'convert': 1, @@ -193,12 +158,27 @@ def check_send_to_kindle(entry): """ returns all available book formats for sending to Kindle """ + formats = list() + bookformats = list() if len(entry.data): - if not config.config_converterpath: - book_formats = check_send_to_kindle_with_converter(entry) - else: - book_formats = check_send_to_kindle_with_converter(entry) - return book_formats + for ele in iter(entry.data): + if ele.uncompressed_size < config.mail_size: + formats.append(ele.format) + if 'MOBI' in formats: + bookformats.append({'format': 'Mobi', + 'convert': 0, + 'text': _('Send %(format)s to Kindle', format='Mobi')}) + if 'PDF' in formats: + bookformats.append({'format': 'Pdf', + 'convert': 0, + 'text': _('Send %(format)s to Kindle', format='Pdf')}) + if 'AZW' in formats: + bookformats.append({'format': 'Azw', + 'convert': 0, + 'text': _('Send %(format)s to Kindle', format='Azw')}) + if config.config_converterpath: + bookformats.extend(check_send_to_kindle_with_converter(formats)) + return bookformats else: log.error(u'Cannot find book entry %d', entry.id) return None diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 702a2668..3bfa463d 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2021-02-08 20:40:55

+

Start Time: 2021-03-14 17:35:34

-

Stop Time: 2021-02-08 23:09:33

+

Stop Time: 2021-03-14 19:59:35

-

Duration: 2h 0 min

+

Duration: 1h 55 min

@@ -386,12 +386,12 @@ - + TestEbookConvertCalibre 11 - 11 - 0 - 0 + 7 + 2 + 2 0 Detail @@ -400,20 +400,62 @@ - +
TestEbookConvertCalibre - test_convert_deactivate
- PASS + +
+ FAIL +
+ + + + - +
TestEbookConvertCalibre - test_convert_email
- PASS + +
+ FAIL +
+ + + + @@ -427,20 +469,64 @@ - +
TestEbookConvertCalibre - test_convert_only
- PASS + +
+ ERROR +
+ + + + - +
TestEbookConvertCalibre - test_convert_parameter
- PASS + +
+ ERROR +
+ + + + @@ -569,12 +655,12 @@ - + TestEbookConvertKepubify 3 - 3 - 0 0 + 2 + 1 0 Detail @@ -583,40 +669,102 @@ - +
TestEbookConvertKepubify - test_convert_deactivate
- PASS + +
+ FAIL +
+ + + + - +
TestEbookConvertKepubify - test_convert_only
- PASS + +
+ ERROR +
+ + + + - +
TestEbookConvertKepubify - test_convert_wrong_excecutable
- PASS + +
+ FAIL +
+ + + + - + TestEbookConvertGDriveKepubify 3 - 3 - 0 0 + 2 + 1 0 Detail @@ -625,29 +773,91 @@ - +
TestEbookConvertGDriveKepubify - test_convert_deactivate
- PASS + +
+ FAIL +
+ + + + - +
TestEbookConvertGDriveKepubify - test_convert_only
- PASS + +
+ ERROR +
+ + + + - +
TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable
- PASS + +
+ FAIL +
+ + + + @@ -1595,12 +1805,12 @@ - + TestKoboSync 9 - 8 + 9 + 0 0 - 1 0 Detail @@ -1609,31 +1819,11 @@ - +
TestKoboSync - test_book_download
- -
- ERROR -
- - - - + PASS @@ -2316,6 +2506,47 @@ IndexError: list index out of range + + TestEditBooks + 1 + 0 + 0 + 0 + 1 + + Detail + + + + + + + +
TestEditBooks - test_upload_book_pdf
+ + +
+ SKIP +
+ + + + + + + + + TestReader 5 @@ -2324,13 +2555,13 @@ IndexError: list index out of range 0 0 - Detail + Detail - +
TestReader - test_comic_reader
@@ -2339,7 +2570,7 @@ IndexError: list index out of range - +
TestReader - test_epub_reader
@@ -2348,7 +2579,7 @@ IndexError: list index out of range - +
TestReader - test_pdf_reader
@@ -2357,7 +2588,7 @@ IndexError: list index out of range - +
TestReader - test_sound_listener
@@ -2366,7 +2597,7 @@ IndexError: list index out of range - +
TestReader - test_txt_reader
@@ -2384,13 +2615,13 @@ IndexError: list index out of range 0 0 - Detail + Detail - +
TestRegister - test_forgot_password
@@ -2399,7 +2630,7 @@ IndexError: list index out of range - +
TestRegister - test_illegal_email
@@ -2408,7 +2639,7 @@ IndexError: list index out of range - +
TestRegister - test_limit_domain
@@ -2417,7 +2648,7 @@ IndexError: list index out of range - +
TestRegister - test_register_no_server
@@ -2426,7 +2657,7 @@ IndexError: list index out of range - +
TestRegister - test_registering_only_email
@@ -2435,7 +2666,7 @@ IndexError: list index out of range - +
TestRegister - test_registering_user
@@ -2444,7 +2675,7 @@ IndexError: list index out of range - +
TestRegister - test_registering_user_fail
@@ -2453,7 +2684,7 @@ IndexError: list index out of range - +
TestRegister - test_user_change_password
@@ -2471,13 +2702,13 @@ IndexError: list index out of range 0 1 - Detail + Detail - +
TestShelf - test_add_shelf_from_search
@@ -2486,7 +2717,7 @@ IndexError: list index out of range - +
TestShelf - test_arrange_shelf
@@ -2495,7 +2726,7 @@ IndexError: list index out of range - +
TestShelf - test_delete_book_of_shelf
@@ -2504,7 +2735,7 @@ IndexError: list index out of range - +
TestShelf - test_private_shelf
@@ -2513,7 +2744,7 @@ IndexError: list index out of range - +
TestShelf - test_public_private_shelf
@@ -2522,7 +2753,7 @@ IndexError: list index out of range - +
TestShelf - test_public_shelf
@@ -2531,7 +2762,7 @@ IndexError: list index out of range - +
TestShelf - test_rename_shelf
@@ -2540,7 +2771,7 @@ IndexError: list index out of range - +
TestShelf - test_shelf_action_non_shelf_edit_role
@@ -2549,7 +2780,7 @@ IndexError: list index out of range - +
TestShelf - test_shelf_anonymous
@@ -2558,19 +2789,19 @@ IndexError: list index out of range - +
TestShelf - test_shelf_database_change
- SKIP + SKIP
-