From 52e8e7e4b0e710e5dc47798507580ce2c67c8922 Mon Sep 17 00:00:00 2001 From: flying-sausages Date: Sun, 31 May 2020 22:51:41 +0100 Subject: [PATCH 1/7] Some czech translations --- cps/translations/cs/LC_MESSAGES/messages.po | 76 ++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po index b4724a90..d05ba87a 100644 --- a/cps/translations/cs/LC_MESSAGES/messages.po +++ b/cps/translations/cs/LC_MESSAGES/messages.po @@ -39,11 +39,11 @@ msgstr "Vypínám server, zavřete okno" #: cps/admin.py:103 msgid "Reconnect successful" -msgstr "" +msgstr "Úspěšně obnovené připojení" #: cps/admin.py:106 msgid "Unknown command" -msgstr "" +msgstr "Neznámý příkaz" #: cps/admin.py:116 cps/editbooks.py:563 cps/editbooks.py:573 #: cps/editbooks.py:667 cps/editbooks.py:669 cps/editbooks.py:730 @@ -67,12 +67,12 @@ msgstr "Konfigurace Calibre-Web aktualizována" #: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462 #: cps/templates/modal_restriction.html:29 msgid "Deny" -msgstr "" +msgstr "Zakázat" #: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464 #: cps/templates/modal_restriction.html:28 msgid "Allow" -msgstr "" +msgstr "Povolit" #: cps/admin.py:510 msgid "client_secrets.json Is Not Configured For Web Application" @@ -80,11 +80,11 @@ msgstr "" #: cps/admin.py:549 msgid "Logfile Location is not Valid, Please Enter Correct Path" -msgstr "" +msgstr "Umístění zápisového souboru není platné. Určete prosím platnou polohu." #: cps/admin.py:554 msgid "Access Logfile Location is not Valid, Please Enter Correct Path" -msgstr "" +msgstr "Umístění zápisového souboru pro přístup není platné. Určete prosím platnou polohu." #: cps/admin.py:580 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier" @@ -122,11 +122,11 @@ msgstr "" #: cps/admin.py:700 msgid "DB Location is not Valid, Please Enter Correct Path" -msgstr "" +msgstr "Poloha databáze není platná, opravte prosím polohu" #: cps/admin.py:702 msgid "DB is not Writeable" -msgstr "" +msgstr "Databáze není psatelná" #: cps/admin.py:735 msgid "Basic Configuration" @@ -212,7 +212,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno" #: cps/admin.py:942 msgid "User not found" -msgstr "" +msgstr "Uživatel nenalezen" #: cps/admin.py:977 #, python-format @@ -290,15 +290,15 @@ msgstr "není nakonfigurováno" #: cps/converter.py:34 msgid "Execution permissions missing" -msgstr "" +msgstr "Chybí povolení k exekuci" #: cps/editbooks.py:242 msgid "Book Format Successfully Deleted" -msgstr "" +msgstr "Formát knihy úspěšně vymazán" #: cps/editbooks.py:245 msgid "Book Successfully Deleted" -msgstr "" +msgstr "Kniha úspěšně vymazána" #: cps/editbooks.py:254 cps/editbooks.py:548 cps/web.py:1644 cps/web.py:1685 #: cps/web.py:1747 @@ -336,7 +336,7 @@ msgstr "Uložení souboru %(file)s se nezdařilo." #: cps/editbooks.py:506 cps/editbooks.py:864 #, python-format msgid "Database error: %(error)s." -msgstr "" +msgstr "Error databáze: %(error)s. " #: cps/editbooks.py:510 #, python-format @@ -1787,15 +1787,15 @@ msgstr "Externí binární soubory" #: cps/templates/config_edit.html:348 msgid "Path to Calibre E-Book Converter" -msgstr "" +msgstr "Poloha Calibre E-Book Converteru" #: cps/templates/config_edit.html:356 msgid "Calibre E-Book Converter Settings" -msgstr "" +msgstr "Nastevní Calibre E-Book Converter" #: cps/templates/config_edit.html:359 msgid "Path to Kepubify E-Book Converter" -msgstr "" +msgstr "Poloha Kepubify E-Book Converter" #: cps/templates/config_edit.html:367 msgid "Location of Unrar binary" @@ -1844,7 +1844,7 @@ msgstr "Propojit stav čtení/nepřečtení do sloupce Calibre" #: cps/templates/config_view_edit.html:59 msgid "View Restrictions based on Calibre column" -msgstr "" +msgstr "Zobrazit omezení podle sloupku Calibre" #: cps/templates/config_view_edit.html:68 msgid "Regular Expression for Title Sorting" @@ -1896,7 +1896,7 @@ msgstr "Zobrazit náhodné knihy v podrobném zobrazení" #: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:85 msgid "Add Allowed/Denied Tags" -msgstr "" +msgstr "Přidat povolené/zakázané štítky" #: cps/templates/config_view_edit.html:145 msgid "Add Allowed/Denied custom column values" @@ -1920,7 +1920,7 @@ msgstr "z" #: cps/templates/detail.html:165 msgid "Published" -msgstr "" +msgstr "Publikováno" #: cps/templates/detail.html:200 msgid "Mark As Unread" @@ -1936,15 +1936,15 @@ msgstr "Přečteno" #: cps/templates/detail.html:209 msgid "Restore from archive" -msgstr "" +msgstr "Obnovit z archivu" #: cps/templates/detail.html:209 msgid "Add to archive" -msgstr "" +msgstr "Archívovat" #: cps/templates/detail.html:210 msgid "Archived" -msgstr "" +msgstr "Archivováno" #: cps/templates/detail.html:221 msgid "Description:" @@ -1958,7 +1958,7 @@ msgstr "Přidat do police" #: cps/templates/feed.xml:79 cps/templates/layout.html:137 #: cps/templates/layout.html:141 cps/templates/search.html:20 msgid "(Public)" -msgstr "" +msgstr "(Veřejné)" #: cps/templates/detail.html:276 msgid "Edit Metadata" @@ -1978,7 +1978,7 @@ msgstr "SMTP heslo" #: cps/templates/email_edit.html:38 msgid "Attachment Size Limit" -msgstr "" +msgstr "Limit velikosti souboru:" #: cps/templates/email_edit.html:46 msgid "Save and Send Test E-mail" @@ -2014,7 +2014,7 @@ msgstr "Další" #: cps/templates/generate_kobo_auth_url.html:5 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):" -msgstr "" +msgstr "Otevřte soubor .kobo/Kobo eReader.conf v textovém editoru a vložte (nebo upravte):" #: cps/templates/http_error.html:38 msgid "Create Issue" @@ -2078,7 +2078,7 @@ msgstr "Knihy seřazené podle jazyků" #: cps/templates/index.xml:100 msgid "Books ordered by Rating" -msgstr "" +msgstr "Knihy řazené podle hodnocení" #: cps/templates/index.xml:108 msgid "Books ordered by file formats" @@ -2086,11 +2086,11 @@ msgstr "Knihy seřazené podle soboru formátů" #: cps/templates/index.xml:111 cps/templates/layout.html:135 msgid "Shelves" -msgstr "" +msgstr "Police" #: cps/templates/index.xml:115 msgid "Books organized in shelves" -msgstr "" +msgstr "Knihy organizované v policích" #: cps/templates/layout.html:29 msgid "Home" @@ -2107,7 +2107,7 @@ msgstr "Přepnout navigaci" #: cps/templates/layout.html:46 msgid "Search Library" -msgstr "" +msgstr "Hledat ve knihovně" #: cps/templates/layout.html:56 msgid "Advanced Search" @@ -2212,11 +2212,11 @@ msgstr "" #: cps/templates/modal_restriction.html:15 msgid "Enter Tag" -msgstr "" +msgstr "Vložte štítek" #: cps/templates/modal_restriction.html:24 msgid "Add View Restriction" -msgstr "" +msgstr "Přidat omezení náhledu" #: cps/templates/osd.xml:5 msgid "Calibre-Web eBook Catalog" @@ -2344,7 +2344,7 @@ msgstr "Vaše e-mailová adresa" #: cps/templates/remote_login.html:4 msgid "Magic Link - Authorise New Device" -msgstr "" +msgstr "Kouzelný odkaz - Schválit nové zařízení" #: cps/templates/remote_login.html:6 msgid "On another device, login and visit:" @@ -2364,7 +2364,7 @@ msgstr "Žádné výsledky pro:" #: cps/templates/search.html:6 msgid "Search Term:" -msgstr "" +msgstr "Termín vyhledávání:" #: cps/templates/search.html:8 msgid "Results for:" @@ -2420,7 +2420,7 @@ msgstr "Změnit řazení" #: cps/templates/shelf.html:67 msgid "Are you sure you want to delete this shelf?" -msgstr "" +msgstr "Jste si jisti, že chcete odstranit tuto polici?" #: cps/templates/shelf.html:70 msgid "Shelf will be deleted for all users" @@ -2524,11 +2524,11 @@ msgstr "Odpojit" #: cps/templates/user_edit.html:63 msgid "Kobo Sync Token" -msgstr "" +msgstr "Kobo Sync TOken" #: cps/templates/user_edit.html:65 msgid "Create/View" -msgstr "" +msgstr "Nové/Otevřít" #: cps/templates/user_edit.html:86 msgid "Add allowed/Denied Custom Column Values" @@ -2544,9 +2544,9 @@ msgstr "Nedávná stahování" #: cps/templates/user_edit.html:162 msgid "Generate Kobo Auth URL" -msgstr "" +msgstr "Vygenerovat URL pro Kobo Auth" #: cps/templates/user_edit.html:178 msgid "Do you really want to delete the Kobo Token?" -msgstr "" +msgstr "Chcete opravdu odstranit Kobo Token?" From 41d922867ee7e850f2f533d513cab893070965c2 Mon Sep 17 00:00:00 2001 From: ElQuimm <50202052+ElQuimm@users.noreply.github.com> Date: Tue, 2 Jun 2020 09:02:44 +0200 Subject: [PATCH 2/7] updated italian version of message.po Thank you. --- cps/translations/it/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po index 2f479ec3..cb29cd05 100644 --- a/cps/translations/it/LC_MESSAGES/messages.po +++ b/cps/translations/it/LC_MESSAGES/messages.po @@ -262,7 +262,7 @@ msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina" #: cps/admin.py:1041 cps/admin.py:1042 cps/admin.py:1043 cps/admin.py:1044 #: cps/admin.py:1045 msgid "Update failed:" -msgstr "Aggiornamento fallito:" +msgstr "Aggiornamento non riuscito:" #: cps/admin.py:1041 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522 msgid "HTTP Error" @@ -500,7 +500,7 @@ msgstr "Non ho trovato la cartella %(path)s del libro su Google Drive" #: cps/helper.py:542 msgid "Error Downloading Cover" -msgstr "" +msgstr "Errore nello scaricare la copertina" #: cps/helper.py:558 msgid "Failed to create path for cover" From ef2c98ba39ac65ce05ea4be946a0d3fd05dda186 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Mon, 1 Jun 2020 10:53:48 +0200 Subject: [PATCH 3/7] Fix #1453 (error unrar binary not found) --- README.md | 4 +--- cps/admin.py | 7 ++++--- cps/helper.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1487c6d9..82c7976c 100644 --- a/README.md +++ b/README.md @@ -54,9 +54,7 @@ Optionally, to enable on-the-fly conversion from one ebook format to another whe [Download and install](https://calibre-ebook.com/download) the Calibre desktop program for your platform and enter the folder including program name (normally /opt/calibre/ebook-convert, or C:\Program Files\calibre\ebook-convert.exe) in the field "calibre's converter tool" on the setup page. -\*** DEPRECATED \*** Support will be removed in future releases - -[Download](http://www.amazon.com/gp/feature.html?docId=1000765211) Amazon's KindleGen tool for your platform and place the binary named `kindlegen` in the `vendor` folder. +[Download](https://github.com/geek1011/kepubify/releases/tag/v3.1.2) Kepubify tool for your platform and place the binary starting with `kepubify` in Linux: `\opt\kepubify` Windows: `C:\Program Files\kepubify`. ## Docker Images diff --git a/cps/admin.py b/cps/admin.py index 947d0087..84a94cba 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -683,9 +683,10 @@ def _configuration_update_helper(): reboot_required |= reboot # Rarfile Content configuration _config_string(to_save, "config_rarfile_location") - unrar_status = helper.check_unrar(config.config_rarfile_location) - if unrar_status: - return _configuration_result(unrar_status, gdriveError) + if "config_rarfile_location" in to_save: + unrar_status = helper.check_unrar(config.config_rarfile_location) + if unrar_status: + return _configuration_result(unrar_status, gdriveError) try: metadata_db = os.path.join(config.config_calibre_dir, "metadata.db") diff --git a/cps/helper.py b/cps/helper.py index ecb7180d..b9463416 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -778,7 +778,7 @@ def get_download_link(book_id, book_format, client): book_format = book_format.split(".")[0] book = calibre_db.get_filtered_book(book_id) if book: - data1 = data = calibre_db.get_book_format(book.id, book_format.upper()) + data1 = calibre_db.get_book_format(book.id, book_format.upper()) else: abort(404) if data1: From 2ad329e64c0cfa67adc4a9f594481379ab8bb3ac Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Tue, 2 Jun 2020 22:12:36 +0200 Subject: [PATCH 4/7] Preparation for release --- cps/constants.py | 2 +- test/Calibre-Web TestSummary.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cps/constants.py b/cps/constants.py index 4649f5d9..3b7a8e66 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -128,7 +128,7 @@ def selected_roles(dictionary): BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, ' 'series_id, languages') -STABLE_VERSION = {'version': '0.6.8 Beta'} +STABLE_VERSION = {'version': '0.6.8'} NIGHTLY_VERSION = {} NIGHTLY_VERSION[0] = '$Format:%H$' diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html index a2844ee5..60acb23d 100755 --- a/test/Calibre-Web TestSummary.html +++ b/test/Calibre-Web TestSummary.html @@ -36,17 +36,17 @@
-

Start Time: 2020-05-29 07:01:47

+

Start Time: 2020-06-02 21:06:42

-

Stop Time: 2020-05-29 08:01:43

+

Stop Time: 2020-06-02 22:07:54

-

Duration: 50:44 min

+

Duration: 51:46 min

From 4c539b6db4315cde925ac1be940e4a6a10a4cfa8 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 3 Jun 2020 19:10:07 +0200 Subject: [PATCH 5/7] Fix #1448 (Public shelfs are accessible even if not logged in) --- cps/shelf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cps/shelf.py b/cps/shelf.py index b13fe556..30768930 100644 --- a/cps/shelf.py +++ b/cps/shelf.py @@ -308,6 +308,7 @@ def delete_shelf(shelf_id): @shelf.route("/shelf/", defaults={'shelf_type': 1}) @shelf.route("/shelf//") +@login_required def show_shelf(shelf_type, shelf_id): shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first() From b83d56eff2c820e55222c9856000f0422f721f3d Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 3 Jun 2020 19:10:36 +0200 Subject: [PATCH 6/7] Version bump --- cps/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/constants.py b/cps/constants.py index 3b7a8e66..a9c35950 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -128,7 +128,7 @@ def selected_roles(dictionary): BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, ' 'series_id, languages') -STABLE_VERSION = {'version': '0.6.8'} +STABLE_VERSION = {'version': '0.6.9 Beta'} NIGHTLY_VERSION = {} NIGHTLY_VERSION[0] = '$Format:%H$' From eef2112e1e5527ed721091fbe419495996b52b58 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 3 Jun 2020 20:14:07 +0200 Subject: [PATCH 7/7] #1430 (changed color of rating stars) --- cps/static/css/style.css | 5 +++-- cps/templates/author.html | 4 ++-- cps/templates/detail.html | 2 +- cps/templates/discover.html | 2 +- cps/templates/index.html | 4 ++-- cps/templates/list.html | 2 +- cps/templates/search.html | 2 +- cps/templates/shelf.html | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cps/static/css/style.css b/cps/static/css/style.css index c043f459..4d8b4805 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -133,8 +133,9 @@ a { color: #45b29d; } } .container-fluid .book .meta .rating { margin-top: 5px; } -.rating .glyphicon-star { color: #999; } -.rating .glyphicon-star.good { color: #45b29d; } +.rating .glyphicon-star-empty { color: #444; } +.rating .glyphicon-star.good { color: #444; } +.rating-clear .glyphicon-remove { color: #333 } .container-fluid .author .author-hidden, .container-fluid .author .author-hidden-divider { display: none; } diff --git a/cps/templates/author.html b/cps/templates/author.html index 0d4369a3..18742003 100644 --- a/cps/templates/author.html +++ b/cps/templates/author.html @@ -76,7 +76,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} @@ -119,7 +119,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} diff --git a/cps/templates/detail.html b/cps/templates/detail.html index 24ba10c7..6edf1677 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -105,7 +105,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} diff --git a/cps/templates/discover.html b/cps/templates/discover.html index 650bdeda..1326f9a9 100644 --- a/cps/templates/discover.html +++ b/cps/templates/discover.html @@ -40,7 +40,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} diff --git a/cps/templates/index.html b/cps/templates/index.html index b65beccb..3498791c 100644 --- a/cps/templates/index.html +++ b/cps/templates/index.html @@ -39,7 +39,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} @@ -107,7 +107,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} diff --git a/cps/templates/list.html b/cps/templates/list.html index e84c252b..a2938be1 100644 --- a/cps/templates/list.html +++ b/cps/templates/list.html @@ -39,7 +39,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} diff --git a/cps/templates/search.html b/cps/templates/search.html index fa8176e9..da59efa6 100644 --- a/cps/templates/search.html +++ b/cps/templates/search.html @@ -82,7 +82,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %} diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html index f37661ce..5635705a 100644 --- a/cps/templates/shelf.html +++ b/cps/templates/shelf.html @@ -49,7 +49,7 @@ {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} - + {% endfor %} {% endif %} {% endfor %}