From d77b52af9631ca9f5727097126940932420e8c16 Mon Sep 17 00:00:00 2001 From: Niktia Pchelin Date: Sun, 16 Feb 2020 22:24:00 -0500 Subject: [PATCH 01/12] #645 - displays '(public)' next to public shelves created by the user --- cps/templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/templates/layout.html b/cps/templates/layout.html index 9ffb04f8..84785205 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -140,7 +140,7 @@ {% endfor %} {% for shelf in g.user.shelf %} -
  • {{shelf.name|shortentitle(40)}}
    • +
  • {{shelf.name|shortentitle(40)}}{% if shelf.is_public == 1 %} (public){% endif %}
    • {% endfor %} {% if not g.user.is_anonymous %} From 7c0d10da796737f9c1f829c89914ff93b1a92e94 Mon Sep 17 00:00:00 2001 From: Niktia Pchelin Date: Sun, 16 Feb 2020 22:47:32 -0500 Subject: [PATCH 02/12] #645 - displays '(public)' next to user's public shelves in OPDS feed --- cps/templates/feed.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml index 37b7765e..089ca65b 100644 --- a/cps/templates/feed.xml +++ b/cps/templates/feed.xml @@ -75,7 +75,11 @@ {% endif %} {% for entry in listelements %} + {% if entry.__class__.__name__ == 'Shelf' and entry.is_public == 1 %} + {{entry.name}} (public) + {% else %} {{entry.name}} + {% endif %} {{ url_for(folder, book_id=entry.id) }} From dac48a26108bf38d823f364969902db53095e691 Mon Sep 17 00:00:00 2001 From: Niktia Pchelin Date: Sun, 16 Feb 2020 23:38:35 -0500 Subject: [PATCH 03/12] #645 - changes create_shelf and edit_shelf to allow user create public and private shelves with the same name --- cps/shelf.py | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/cps/shelf.py b/cps/shelf.py index 6e8c4b9f..2a8d7c43 100644 --- a/cps/shelf.py +++ b/cps/shelf.py @@ -204,12 +204,24 @@ def create_shelf(): shelf.is_public = 1 shelf.name = to_save["title"] shelf.user_id = int(current_user.id) - existing_shelf = ub.session.query(ub.Shelf).filter( - or_((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1), - (ub.Shelf.name == to_save["title"]) & (ub.Shelf.user_id == int(current_user.id)))).first() - if existing_shelf: - flash(_(u"A shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + is_shelf_name_unique = False + if shelf.is_public == 1: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1)) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") else: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) & (ub.Shelf.user_id == int(current_user.id))) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + if is_shelf_name_unique: try: ub.session.add(shelf) ub.session.commit() @@ -227,13 +239,26 @@ def edit_shelf(shelf_id): shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first() if request.method == "POST": to_save = request.form.to_dict() - existing_shelf = ub.session.query(ub.Shelf).filter( - or_((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1), - (ub.Shelf.name == to_save["title"]) & (ub.Shelf.user_id == int(current_user.id)))).filter( - ub.Shelf.id != shelf_id).first() - if existing_shelf: - flash(_(u"A shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + is_shelf_name_unique = False + if shelf.is_public == 1: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1)) \ + .filter(ub.Shelf.id != shelf_id) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") else: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) & (ub.Shelf.user_id == int(current_user.id))) \ + .filter(ub.Shelf.id != shelf_id) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + if is_shelf_name_unique: shelf.name = to_save["title"] if "is_public" in to_save: shelf.is_public = 1 From c870f6e87d5791b66ee984bc7461cdd8a80b47c5 Mon Sep 17 00:00:00 2001 From: Josh O'Brien Date: Thu, 19 Mar 2020 13:10:10 +1100 Subject: [PATCH 04/12] English Language V2 --- cps/__init__.py | 0 cps/comic.py | 0 cps/db.py | 0 cps/server.py | 0 cps/shelf.py | 4 ++-- cps/static/js/libs/tinymce/license.txt | 0 .../tinymce/skins/lightgray/content.inline.min.css | 0 .../js/libs/tinymce/skins/lightgray/content.min.css | 0 .../tinymce/skins/lightgray/fonts/tinymce-small.eot | Bin .../tinymce/skins/lightgray/fonts/tinymce-small.svg | 0 .../tinymce/skins/lightgray/fonts/tinymce-small.ttf | Bin .../skins/lightgray/fonts/tinymce-small.woff | Bin .../libs/tinymce/skins/lightgray/fonts/tinymce.eot | Bin .../libs/tinymce/skins/lightgray/fonts/tinymce.svg | 0 .../libs/tinymce/skins/lightgray/fonts/tinymce.ttf | Bin .../libs/tinymce/skins/lightgray/fonts/tinymce.woff | Bin .../js/libs/tinymce/skins/lightgray/img/anchor.gif | Bin .../js/libs/tinymce/skins/lightgray/img/loader.gif | Bin .../js/libs/tinymce/skins/lightgray/img/object.gif | Bin .../js/libs/tinymce/skins/lightgray/img/trans.gif | Bin .../js/libs/tinymce/skins/lightgray/skin.min.css | 0 .../js/libs/tinymce/themes/inlite/theme.min.js | 0 .../js/libs/tinymce/themes/modern/theme.min.js | 0 cps/templates/admin.html | 4 ++-- cps/templates/index.html | 0 cps/templates/modal_restriction.html | 10 +++++----- cps/templates/user_edit.html | 4 ++-- cps/web.py | 6 +++--- 28 files changed, 14 insertions(+), 14 deletions(-) mode change 100755 => 100644 cps/__init__.py mode change 100755 => 100644 cps/comic.py mode change 100755 => 100644 cps/db.py mode change 100755 => 100644 cps/server.py mode change 100755 => 100644 cps/static/js/libs/tinymce/license.txt mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/content.min.css mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/object.gif mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/skin.min.css mode change 100755 => 100644 cps/static/js/libs/tinymce/themes/inlite/theme.min.js mode change 100755 => 100644 cps/static/js/libs/tinymce/themes/modern/theme.min.js mode change 100755 => 100644 cps/templates/index.html diff --git a/cps/__init__.py b/cps/__init__.py old mode 100755 new mode 100644 diff --git a/cps/comic.py b/cps/comic.py old mode 100755 new mode 100644 diff --git a/cps/db.py b/cps/db.py old mode 100755 new mode 100644 diff --git a/cps/server.py b/cps/server.py old mode 100755 new mode 100644 diff --git a/cps/shelf.py b/cps/shelf.py index afee1eaa..bb3a42b5 100644 --- a/cps/shelf.py +++ b/cps/shelf.py @@ -216,9 +216,9 @@ def create_shelf(): flash(_(u"Shelf %(title)s created", title=to_save["title"]), category="success") except Exception: flash(_(u"There was an error"), category="error") - return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate") + return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate") else: - return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate") + return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate") @shelf.route("/shelf/edit/", methods=["GET", "POST"]) diff --git a/cps/static/js/libs/tinymce/license.txt b/cps/static/js/libs/tinymce/license.txt old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css b/cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/content.min.css b/cps/static/js/libs/tinymce/skins/lightgray/content.min.css old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/object.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/object.gif old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/skins/lightgray/skin.min.css b/cps/static/js/libs/tinymce/skins/lightgray/skin.min.css old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/themes/inlite/theme.min.js b/cps/static/js/libs/tinymce/themes/inlite/theme.min.js old mode 100755 new mode 100644 diff --git a/cps/static/js/libs/tinymce/themes/modern/theme.min.js b/cps/static/js/libs/tinymce/themes/modern/theme.min.js old mode 100755 new mode 100644 diff --git a/cps/templates/admin.html b/cps/templates/admin.html index 5b2ad78c..69deee09 100644 --- a/cps/templates/admin.html +++ b/cps/templates/admin.html @@ -15,7 +15,7 @@ {{_('Downloads')}} {{_('Admin')}} {{_('Download')}} - {{_('View eBooks')}} + {{_('View Books')}} {{_('Upload')}} {{_('Edit')}} @@ -58,7 +58,7 @@ {{email.mail_from}} - + diff --git a/cps/templates/index.html b/cps/templates/index.html old mode 100755 new mode 100644 diff --git a/cps/templates/modal_restriction.html b/cps/templates/modal_restriction.html index ede585d7..aa8678df 100644 --- a/cps/templates/modal_restriction.html +++ b/cps/templates/modal_restriction.html @@ -3,10 +3,10 @@
    - - - - + + + +
    @@ -21,7 +21,7 @@
    - +
    diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html index 2b1640c3..bc25b7e0 100644 --- a/cps/templates/user_edit.html +++ b/cps/templates/user_edit.html @@ -80,8 +80,8 @@
    {% if ( g.user and g.user.role_admin() and not new_user ) %} - {{_('Add allowed/denied Tags')}} - {{_('Add allowed/denied custom column values')}} + {{_('Edit Tag Restrictions')}} + {{_('Edit Custom Column Restrictions')}} {% endif %}
    diff --git a/cps/web.py b/cps/web.py index 8f273faf..b5aa3c5c 100644 --- a/cps/web.py +++ b/cps/web.py @@ -1057,13 +1057,13 @@ def send_to_kindle(book_id, book_format, convert): result = send_mail(book_id, book_format, convert, current_user.kindle_mail, config.config_calibre_dir, current_user.nickname) if result is None: - flash(_(u"Book successfully queued for sending to %(kindlemail)s", kindlemail=current_user.kindle_mail), + flash(_(u"Success! Selected book has been sent to your Kindle (%(kindlemail)s)", kindlemail=current_user.kindle_mail), category="success") ub.update_download(book_id, int(current_user.id)) else: - flash(_(u"There was an error sending this book: %(res)s", res=result), category="error") + flash(_(u"Oops! There was an error sending this book: %(res)s", res=result), category="error") else: - flash(_(u"Please configure your kindle e-mail address first..."), category="error") + flash(_(u"Please update your profile with a valid Send to Kindle E-mail Address."), category="error") if "HTTP_REFERER" in request.environ: return redirect(request.environ["HTTP_REFERER"]) else: From da42c51af267b01ec718da8b4ac0dfe1971efc82 Mon Sep 17 00:00:00 2001 From: hexeth Date: Tue, 31 Mar 2020 08:42:08 -0700 Subject: [PATCH 05/12] Updated to exclude new modules --- cps/static/js/caliBlur.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js index 1bd5f69c..92ecba28 100644 --- a/cps/static/js/caliBlur.js +++ b/cps/static/js/caliBlur.js @@ -363,7 +363,7 @@ $( '#logout' ).parent().addClass( 'dropdown' ).appendTo( '.profileDropli' ); // Remove the modals except from some areas where they are needed bodyClass = $( 'body' ).attr( 'class' ).split(' '); -modalWanted = ['admin', 'editbook', 'config', 'uiconfig']; +modalWanted = ['admin', 'editbook', 'config', 'uiconfig', 'me', 'edituser']; if ( $.inArray( bodyClass[0], modalWanted) != -1 ) { } else { From 734e2ffbb2f69dae6d0801f30e92388390972454 Mon Sep 17 00:00:00 2001 From: BeckyDTP Date: Tue, 31 Mar 2020 21:53:13 +0200 Subject: [PATCH 06/12] Updated Polish translations --- cps/translations/pl/LC_MESSAGES/messages.mo | Bin 32407 -> 42619 bytes cps/translations/pl/LC_MESSAGES/messages.po | 364 ++++++++++---------- 2 files changed, 181 insertions(+), 183 deletions(-) diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo index 9e3cb2dc68194ff6c59a4ff56ab59704e14a081d..ffacf44cbff8cf81a2d2af813a8449b05153bbfd 100644 GIT binary patch literal 42619 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 VY}}P_YVk?;8MlGYGCXa0{eLbfcN_o! delta 9707 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 diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po index 8093c363..0baa86c6 100644 --- a/cps/translations/pl/LC_MESSAGES/messages.po +++ b/cps/translations/pl/LC_MESSAGES/messages.po @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: Calibre Web - polski (POT: 2019-08-06 18:35)\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2020-03-14 10:38+0100\n" -"PO-Revision-Date: 2019-08-18 22:06+0200\n" +"PO-Revision-Date: 2020-03-31 21:50+0200\n" "Last-Translator: Jerzy Piątek \n" "Language: pl\n" "Language-Team: \n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.8.0\n" +"X-Generator: Poedit 2.2\n" #: cps/about.py:42 msgid "installed" @@ -52,7 +53,7 @@ msgstr "Panel administratora" #: cps/admin.py:151 msgid "UI Configuration" -msgstr "Konfiguracja Interfejsu (UI)" +msgstr "Konfiguracja Interfejsu" #: cps/admin.py:187 cps/admin.py:637 msgid "Calibre-Web configuration updated" @@ -61,16 +62,16 @@ msgstr "Konfiguracja Calibre-Web została zaktualizowana" #: 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 "Zabroń" #: 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 "Zezwalaj" #: cps/admin.py:667 msgid "Basic Configuration" -msgstr "Podstawowa konfiguracja" +msgstr "Konfiguracja podstawowa" #: cps/admin.py:691 cps/web.py:1089 msgid "Please fill out all fields!" @@ -86,7 +87,7 @@ msgstr "E-mail nie pochodzi z prawidłowej domeny" #: cps/admin.py:710 cps/admin.py:725 msgid "Found an existing account for this e-mail address or nickname." -msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nickname" +msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub pseudonimu." #: cps/admin.py:721 #, python-format @@ -100,7 +101,7 @@ msgstr "Edycja ustawień serwera e-mail" #: cps/admin.py:766 #, python-format msgid "Test e-mail successfully send to %(kindlemail)s" -msgstr "Test e-maila zakończony pomyślnie. Wysłano do %(kindlemail)s" +msgstr "Testowy e-mail pomyślnie przesłany do %(kindlemail)s" #: cps/admin.py:769 #, python-format @@ -162,7 +163,7 @@ msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..." #: cps/admin.py:918 msgid "Logfile viewer" -msgstr "Przeglądanie plików Logu" +msgstr "Przeglądanie dziennika" #: cps/admin.py:957 msgid "Requesting update package" @@ -199,7 +200,7 @@ msgstr "Aktualizacja nieudana:" #: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469 msgid "HTTP Error" -msgstr "" +msgstr "Błąd HTTP" #: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471 msgid "Connection error" @@ -211,7 +212,7 @@ msgstr "Przekroczono limit czasu podczas nawiązywania połączenia" #: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475 msgid "General error" -msgstr "" +msgstr "Błąd ogólny" #: cps/converter.py:31 msgid "not configured" @@ -219,7 +220,7 @@ msgstr "nie skonfigurowane" #: cps/editbooks.py:214 cps/editbooks.py:396 msgid "Error opening eBook. File does not exist or file is not accessible" -msgstr "Błąd podczas otwierania eBooka. Plik nie istnieje lub jest niedostępny" +msgstr "Błąd podczas otwierania e-booka. Plik nie istnieje lub jest niedostępny" #: cps/editbooks.py:242 msgid "edit metadata" @@ -228,11 +229,11 @@ msgstr "edytuj metadane" #: cps/editbooks.py:321 cps/editbooks.py:569 #, python-format msgid "File extension '%(ext)s' is not allowed to be uploaded to this server" -msgstr "Rozszerzenie pliku '%(ext)s' nie jest dozwolone do przesłania na ten serwer" +msgstr "Rozszerzenie pliku '%(ext)s' nie jest dozwolone do wysłania na ten serwer" #: cps/editbooks.py:325 cps/editbooks.py:573 msgid "File to be uploaded must have an extension" -msgstr "Plik do przesłania musi mieć rozszerzenie" +msgstr "Plik do wysłania musi mieć rozszerzenie" #: cps/editbooks.py:337 cps/editbooks.py:607 #, python-format @@ -264,7 +265,7 @@ msgstr "Metadane zostały pomyślnie zaktualizowane" #: cps/editbooks.py:534 msgid "Error editing book, please check logfile for details" -msgstr "Błąd podczas edycji książki, sprawdź plik logu, aby uzyskać szczegółowe informacje" +msgstr "Błąd podczas edycji książki, sprawdź plik dziennika, aby uzyskać szczegółowe informacje" #: cps/editbooks.py:581 #, python-format @@ -273,7 +274,7 @@ msgstr "Nie można zapisać pliku %(filename)s w katalogu tymczasowym" #: cps/editbooks.py:598 msgid "Uploaded book probably exists in the library, consider to change before upload new: " -msgstr "Przesłana książka prawdopodobnie istnieje w bibliotece, rozważ zmianę przed przesłaniem nowej: " +msgstr "Wysłana książka prawdopodobnie istnieje w bibliotece, rozważ zmianę przed przesłaniem nowej: " #: cps/editbooks.py:613 #, python-format @@ -288,7 +289,7 @@ msgstr "Nie udało się usunąć pliku %(file)s (Odmowa dostępu)." #: cps/editbooks.py:709 #, python-format msgid "File %(file)s uploaded" -msgstr "Załadowano plik %(file)s" +msgstr "Wysłano plik %(file)s" #: cps/editbooks.py:738 msgid "Source or destination format for conversion missing" @@ -306,21 +307,21 @@ msgstr "Podczas konwersji książki wystąpił błąd: %(res)s" #: cps/gdrive.py:61 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again" -msgstr "" +msgstr "Konfiguracja Google Drive nie została zakończona, spróbuj dezaktywować i ponownie aktywować Google Drive" #: cps/gdrive.py:103 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console" -msgstr "" +msgstr "Zwrotna domena nie jest zweryfikowana, proszę zweryfikowania domenę w konsoli deweloperskiej google" #: cps/helper.py:80 #, python-format msgid "%(format)s format not found for book id: %(book)d" -msgstr "" +msgstr "Nie znaleziono formatu %(format)s dla id książki: %(book)d" #: cps/helper.py:92 #, python-format msgid "%(format)s not found on Google Drive: %(fn)s" -msgstr "" +msgstr "Nie znaleziono %(format)s na Google Drive: %(fn)s" #: cps/helper.py:99 cps/helper.py:211 cps/templates/detail.html:41 #: cps/templates/detail.html:45 @@ -329,12 +330,12 @@ msgstr "Wyślij do Kindle" #: cps/helper.py:100 cps/helper.py:118 cps/helper.py:213 msgid "This e-mail has been sent via Calibre-Web." -msgstr "Ten e-mail został wysłany za pośrednictwem Caliber-Web." +msgstr "Ten e-mail został wysłany za pośrednictwem Calibre-Web." #: cps/helper.py:111 #, python-format msgid "%(format)s not found: %(fn)s" -msgstr "" +msgstr "%(format)s nie znaleziono: %(fn)s" #: cps/helper.py:116 msgid "Calibre-Web test e-mail" @@ -342,7 +343,7 @@ msgstr "Testowy e-mail Calibre-Web" #: cps/helper.py:118 msgid "Test e-mail" -msgstr "" +msgstr "Testowy e-mail" # ??? #: cps/helper.py:133 @@ -378,7 +379,7 @@ msgstr "Żądany plik nie mógł zostać odczytany. Sprawdź uprawnienia?" #: cps/helper.py:322 #, python-format msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s" -msgstr "Zmiana nazwy tytułu z: '%(src)s' na '%(dest)s' zakończyła się niepowodzeniem z błędem: %(error)s" +msgstr "Zmiana nazwy tytułu z: „%(src)s” na „%(dest)s” zakończyła się niepowodzeniem z błędem: %(error)s" #: cps/helper.py:332 #, python-format @@ -388,37 +389,37 @@ msgstr "Zmiana autora z: '%(src)s' na '%(dest)s' zakończyło się błędem: %(e #: cps/helper.py:346 #, python-format msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s" -msgstr "" +msgstr "Zmiana nazwy pliku w ścieżce '%(src)s' na '%(dest)s' zakończyło się błędem: %(error)s" #: cps/helper.py:372 cps/helper.py:382 cps/helper.py:390 #, python-format msgid "File %(file)s not found on Google Drive" -msgstr "" +msgstr "Nie znaleziono pliku %(file)s na Google Drive" #: cps/helper.py:411 #, python-format msgid "Book path %(path)s not found on Google Drive" -msgstr "" +msgstr "Nie znaleziono ścieżki do książki %(path)s na Google Drive" #: cps/helper.py:511 msgid "Failed to create path for cover" -msgstr "" +msgstr "Nie udało się utworzyć ścieżki dla okładki" #: cps/helper.py:516 msgid "Cover-file is not a valid image file" -msgstr "" +msgstr "Plik okładki nie jest prawidłowym obrazem" #: cps/helper.py:519 msgid "Failed to store cover-file" -msgstr "" +msgstr "Nie udało się zapisać pliku okładki" #: cps/helper.py:530 msgid "Only jpg/jpeg/png/webp files are supported as coverfile" -msgstr "" +msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg/png/webp" #: cps/helper.py:544 msgid "Only jpg/jpeg files are supported as coverfile" -msgstr "" +msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg" #: cps/helper.py:658 msgid "Waiting" @@ -434,7 +435,7 @@ msgstr "Rozpoczynanie" #: cps/helper.py:664 msgid "Finished" -msgstr "" +msgstr "Zakończone" #: cps/helper.py:666 msgid "Unknown Status" @@ -450,7 +451,7 @@ msgstr "Konwertowanie: " #: cps/helper.py:675 msgid "Upload: " -msgstr "Wgrywanie: " +msgstr "Wyślij: " #: cps/helper.py:679 msgid "Unknown Task: " @@ -458,11 +459,11 @@ msgstr "Nieznane zadanie: " #: cps/kobo_auth.py:127 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device" -msgstr "" +msgstr "Aby uzyskać prawidłowy api_endpoint dla urządzenia kobo, należy skorzystać z dostępu do calibre-web spoza localhost" #: cps/kobo_auth.py:130 cps/kobo_auth.py:150 msgid "Kobo Setup" -msgstr "" +msgstr "Konfiguracja Kobo" # ??? #: cps/oauth_bb.py:74 @@ -489,25 +490,25 @@ msgstr "Nie udało się pobrać informacji o użytkowniku z Google." #: cps/oauth_bb.py:273 #, python-format msgid "Unlink to %(oauth)s success." -msgstr "" +msgstr "Odłączenie od %(oauth)s powiodło się." #: cps/oauth_bb.py:277 #, python-format msgid "Unlink to %(oauth)s failed." -msgstr "" +msgstr "Odłączenie od %(oauth)s nie powiodło się." #: cps/oauth_bb.py:280 #, python-format msgid "Not linked to %(oauth)s." -msgstr "" +msgstr "Nie połączono z %(oauth)s." #: cps/oauth_bb.py:308 msgid "GitHub Oauth error, please retry later." -msgstr "" +msgstr "Błąd GitHub Oauth, proszę spróbować później." #: cps/oauth_bb.py:327 msgid "Google Oauth error, please retry later." -msgstr "" +msgstr "Błąd Google Oauth, proszę spróbować później." #: cps/shelf.py:47 cps/shelf.py:99 msgid "Invalid shelf specified" @@ -516,16 +517,16 @@ msgstr "Podano niewłaściwą półkę" #: cps/shelf.py:54 #, python-format msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s" -msgstr "" +msgstr "Niestety, nie posiadasz uprawnień do dodania książki do półki: %(shelfname)s" #: cps/shelf.py:62 msgid "You are not allowed to edit public shelves" -msgstr "Nie masz uprawnień do edytowania publicznej półki" +msgstr "Nie masz uprawnień do edytowania publicznych półek" #: cps/shelf.py:71 #, python-format msgid "Book is already part of the shelf: %(shelfname)s" -msgstr "Książka jest już dodana do półki" +msgstr "Książka jest już dodana do półki: %(shelfname)s" #: cps/shelf.py:85 #, python-format @@ -569,7 +570,7 @@ msgstr "Niestety nie możesz usunąć książki z tej półki %(sname)s" #: cps/shelf.py:211 cps/shelf.py:235 #, python-format msgid "A shelf with the name '%(title)s' already exists." -msgstr "Półka o nazwie '%(title)s' już istnieje." +msgstr "Półka o nazwie „%(title)s” już istnieje." #: cps/shelf.py:216 #, python-format @@ -596,7 +597,7 @@ msgstr "Edytuj półkę" #: cps/shelf.py:301 #, python-format msgid "Shelf: '%(name)s'" -msgstr "Półka: '%(name)s'" +msgstr "Półka: „%(name)s”" #: cps/shelf.py:304 msgid "Error opening shelf. Shelf does not exist or is not accessible" @@ -604,7 +605,7 @@ msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna" #: cps/shelf.py:342 msgid "Hidden Book" -msgstr "" +msgstr "Ukryta książka" #: cps/shelf.py:347 #, python-format @@ -617,28 +618,28 @@ msgstr "Ostatnio dodane" #: cps/ub.py:58 msgid "Show recent books" -msgstr "Pokaż menu ostatnio dodane" +msgstr "Pokaż menu ostatnio dodanych książek" #: cps/templates/index.xml:17 cps/ub.py:59 msgid "Hot Books" -msgstr "Najpopularniejsze książki" +msgstr "Najpopularniejsze" #: cps/ub.py:60 msgid "Show Hot Books" -msgstr "Pokaż menu najpopularniejsze książki" +msgstr "Pokaż menu najpopularniejszych książek" #: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508 msgid "Top Rated Books" -msgstr "Najlepiej ocenione książki" +msgstr "Najwyżej ocenione" #: cps/ub.py:65 msgid "Show Top Rated Books" -msgstr "Pokaż menu najlepiej ocenione książki" +msgstr "Pokaż menu najwyżej ocenionych książek" #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66 #: cps/web.py:1005 msgid "Read Books" -msgstr "Przeczytane książki" +msgstr "Przeczytane" #: cps/ub.py:68 msgid "Show read and unread" @@ -647,7 +648,7 @@ msgstr "Pokaż menu przeczytane i nieprzeczytane" #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70 #: cps/web.py:1009 msgid "Unread Books" -msgstr "Nieprzeczytane książki" +msgstr "Nieprzeczytane" #: cps/ub.py:72 msgid "Show unread" @@ -659,7 +660,7 @@ msgstr "Odkrywaj" #: cps/ub.py:75 msgid "Show random books" -msgstr "Pokaż menu odkrywaj" +msgstr "Pokaż menu losowych książek" #: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787 msgid "Categories" @@ -672,11 +673,11 @@ msgstr "Pokaż menu wyboru kategorii" #: cps/templates/book_edit.html:69 cps/templates/index.xml:82 #: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715 msgid "Series" -msgstr "Seria" +msgstr "Cykle" #: cps/ub.py:81 msgid "Show series selection" -msgstr "Pokaż menu wyboru serii" +msgstr "Pokaż menu wyboru cyklu" #: cps/templates/index.xml:61 cps/ub.py:82 msgid "Authors" @@ -705,7 +706,7 @@ msgstr "Pokaż menu wyboru języka" #: cps/templates/index.xml:96 cps/ub.py:93 msgid "Ratings" -msgstr "Ocena" +msgstr "Oceny" #: cps/ub.py:95 msgid "Show ratings selection" @@ -713,7 +714,7 @@ msgstr "Pokaż menu listy ocen" #: cps/templates/index.xml:104 cps/ub.py:96 msgid "File formats" -msgstr "Format plików" +msgstr "Formaty plików" #: cps/ub.py:98 msgid "Show file formats selection" @@ -721,7 +722,7 @@ msgstr "Pokaż menu formatu plików" #: cps/updater.py:262 cps/updater.py:369 cps/updater.py:382 msgid "Unexpected data while reading update information" -msgstr "" +msgstr "Nieoczekiwane dane podczas odczytywania informacji o aktualizacji" #: cps/updater.py:269 cps/updater.py:375 msgid "No update available. You already have the latest version installed" @@ -766,7 +767,7 @@ msgstr "Najpopularniejsze książki (najczęściej pobierane)" #: cps/web.py:580 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible" -msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:" +msgstr "Błąd otwierania e-booka. Plik nie istnieje lub jest niedostępny" #: cps/web.py:593 #, python-format @@ -781,7 +782,7 @@ msgstr "Wydawca: %(name)s" #: cps/web.py:616 #, python-format msgid "Series: %(serie)s" -msgstr "Seria: %(serie)s" +msgstr "Cykl: %(serie)s" #: cps/web.py:627 #, python-format @@ -855,7 +856,7 @@ msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s" #: cps/web.py:1066 msgid "Please configure your kindle e-mail address first..." -msgstr "Najpierw skonfiguruj adres e-mail Kindla..." +msgstr "Najpierw skonfiguruj adres e-mail Kindle..." #: cps/web.py:1083 msgid "E-Mail server is not configured, please contact your administrator!" @@ -885,7 +886,7 @@ msgstr "Nie można aktywować uwierzytelniania LDAP" #: cps/web.py:1150 cps/web.py:1277 #, python-format msgid "you are now logged in as: '%(nickname)s'" -msgstr "Zalogowałeś się jako: '%(nickname)s'" +msgstr "zalogowałeś się jako: '%(nickname)s'" #: cps/web.py:1155 msgid "Could not login. LDAP server down, please contact your administrator" @@ -935,7 +936,7 @@ msgstr "Zaktualizowano profil" #: cps/web.py:1384 cps/web.py:1480 msgid "Error opening eBook. File does not exist or file is not accessible:" -msgstr "" +msgstr "Błąd podczas otwierania e-booka. Plik nie istnieje lub jest niedostępny:" #: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409 #: cps/web.py:1414 @@ -944,7 +945,7 @@ msgstr "Czytaj książkę" #: cps/web.py:1425 msgid "Error opening eBook. File does not exist or file is not accessible." -msgstr "Błąd podczas otwierania eBooka. Plik nie istnieje lub plik jest niedostępny." +msgstr "Błąd podczas otwierania e-booka. Plik nie istnieje lub jest niedostępny." #: cps/worker.py:335 #, python-format @@ -954,7 +955,7 @@ msgstr "Konwertowanie nie powiodło się: %(error)s" #: cps/worker.py:346 #, python-format msgid "Kindlegen failed with Error %(error)s. Message: %(message)s" -msgstr "Niepowodzenie! Bład Kindlegen %(error)s. Komunikat: %(message)s" +msgstr "Niepowodzenie! Błąd Kindlegen %(error)s. Komunikat: %(message)s" #: cps/templates/admin.html:9 msgid "Users" @@ -973,7 +974,7 @@ msgstr "E-mail" #: cps/templates/admin.html:14 cps/templates/user_edit.html:26 msgid "Send to Kindle E-mail Address" -msgstr "Kindle" +msgstr "Adres e-mail dla wysyłania do Kindle" #: cps/templates/admin.html:15 msgid "Downloads" @@ -993,19 +994,19 @@ msgstr "Pobieranie" #: cps/templates/admin.html:18 msgid "View eBooks" -msgstr "Wyświetl Ebooki" +msgstr "Przeglądanie" #: cps/templates/admin.html:19 cps/templates/layout.html:65 msgid "Upload" -msgstr "Wyślij" +msgstr "Wysyłanie" #: cps/templates/admin.html:20 msgid "Edit" -msgstr "Edytuj" +msgstr "Edycja" #: cps/templates/admin.html:38 msgid "Add New User" -msgstr "" +msgstr "Dodaj nowego użytkownika" #: cps/templates/admin.html:44 msgid "E-mail Server Settings" @@ -1045,7 +1046,7 @@ msgstr "Folder bazy danych Calibre" #: cps/templates/admin.html:74 cps/templates/config_edit.html:122 msgid "Log Level" -msgstr "Poziom Logu" +msgstr "Poziom dziennika" #: cps/templates/admin.html:78 msgid "Port" @@ -1053,7 +1054,7 @@ msgstr "Port" #: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27 msgid "Books per Page" -msgstr "Ilość książek na stronie" +msgstr "Liczba książek na stronie" #: cps/templates/admin.html:88 msgid "Uploads" @@ -1069,11 +1070,11 @@ msgstr "Publiczna rejestracja" #: cps/templates/admin.html:100 msgid "Magic Link Remote Login" -msgstr "Zdalne logowanie" +msgstr "Zdalne logowanie (Magic Link)" #: cps/templates/admin.html:104 msgid "Reverse Proxy Login" -msgstr "" +msgstr "Logowanie reverse proxy" #: cps/templates/admin.html:109 msgid "Reverse proxy header name" @@ -1081,11 +1082,11 @@ msgstr "Nazwa nagłówka reverse proxy" #: cps/templates/admin.html:114 msgid "Edit Basic Configuration" -msgstr "" +msgstr "Edytuj podstawową konfigurację" #: cps/templates/admin.html:115 msgid "Edit UI Configuration" -msgstr "" +msgstr "Edytuj konfigurację interfejsu" #: cps/templates/admin.html:121 msgid "Administration" @@ -1093,7 +1094,7 @@ msgstr "Zarządzanie" #: cps/templates/admin.html:122 msgid "View Logs" -msgstr "Podgląd Logów" +msgstr "Podgląd dziennika" #: cps/templates/admin.html:123 msgid "Reconnect Calibre Database" @@ -1147,7 +1148,7 @@ msgstr "OK" #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19 #: cps/templates/user_edit.html:137 msgid "Cancel" -msgstr "" +msgstr "Anuluj" #: cps/templates/admin.html:179 msgid "Are you sure you want to shutdown?" @@ -1159,7 +1160,7 @@ msgstr "Aktualizowanie, proszę nie odświeżać strony" #: cps/templates/author.html:15 msgid "via" -msgstr "" +msgstr "przez" #: cps/templates/author.html:23 msgid "In Library" @@ -1169,14 +1170,14 @@ msgstr "W Bibliotece" #: cps/templates/author.html:34 cps/templates/list.html:14 #: cps/templates/search.html:41 msgid "All" -msgstr "Wszytsko" +msgstr "Wszystko" #: cps/templates/author.html:58 cps/templates/author.html:110 #: cps/templates/discover.html:27 cps/templates/index.html:26 #: cps/templates/index.html:89 cps/templates/search.html:67 #: cps/templates/shelf.html:36 msgid "reduce" -msgstr "" +msgstr "zwiń" #: cps/templates/author.html:94 msgid "More by" @@ -1234,11 +1235,11 @@ msgstr "Opis" #: cps/templates/book_edit.html:65 cps/templates/search_form.html:33 msgid "Tags" -msgstr "Tagi" +msgstr "Etykiety" #: cps/templates/book_edit.html:73 msgid "Series ID" -msgstr "" +msgstr "ID cyklu" #: cps/templates/book_edit.html:77 msgid "Rating" @@ -1246,11 +1247,11 @@ msgstr "Ocena" #: cps/templates/book_edit.html:81 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)" -msgstr "" +msgstr "Pobierz okładkę z linku (JPEG - obraz zostanie pobrany i zapisany w bazie)" #: cps/templates/book_edit.html:85 msgid "Upload Cover from Local Disk" -msgstr "Prześlij okładkę z dysku lokalnego" +msgstr "Wyślij okładkę z dysku lokalnego" #: cps/templates/book_edit.html:90 msgid "Published Date" @@ -1277,11 +1278,11 @@ msgstr "Nie" #: cps/templates/book_edit.html:158 msgid "Upload Format" -msgstr "Prześli format" +msgstr "Wyślij format" #: cps/templates/book_edit.html:167 msgid "View Book on Save" -msgstr "wyświetl książkę po edycji" +msgstr "Po zapisaniu wyświetl szczegóły książki" #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206 msgid "Fetch Metadata" @@ -1291,7 +1292,7 @@ msgstr "Uzyskaj metadane" #: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38 #: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135 msgid "Save" -msgstr "" +msgstr "Zapisz" #: cps/templates/book_edit.html:185 msgid "Are you really sure?" @@ -1338,7 +1339,7 @@ msgstr "Błąd wyszukiwania!" #: cps/templates/book_edit.html:273 msgid "No Result(s) found! Please try another keyword." -msgstr "Nie znaleziono! Spróbuj użyć innego kluczowego słowa." +msgstr "Nie znaleziono! Spróbuj użyć innego słowa kluczowego." #: cps/templates/config_edit.html:12 msgid "Library Configuration" @@ -1366,11 +1367,11 @@ msgstr "Kliknij przycisk, aby kontynuować instalację" #: cps/templates/config_edit.html:44 msgid "Please finish Google Drive setup after login" -msgstr "" +msgstr "Proszę zakończyć konfigurowanie Google Drive po zalogowaniu" #: cps/templates/config_edit.html:49 msgid "Google Drive Calibre folder" -msgstr "" +msgstr "Folder Calibre na Google Drive" # ??? #: cps/templates/config_edit.html:57 @@ -1379,7 +1380,7 @@ msgstr "Metadane Watch Channel ID" #: cps/templates/config_edit.html:60 msgid "Revoke" -msgstr "" +msgstr "Unieważnij" #: cps/templates/config_edit.html:80 msgid "Server Configuration" @@ -1403,35 +1404,35 @@ msgstr "Kanał aktualizacji" #: cps/templates/config_edit.html:101 msgid "Stable" -msgstr "Stabilna" +msgstr "Wersje stabilne" #: cps/templates/config_edit.html:102 msgid "Stable (Automatic)" -msgstr "Stablina (Automatycznie)" +msgstr "Wersje stabilne (automatycznie)" #: cps/templates/config_edit.html:103 msgid "Nightly" -msgstr "" +msgstr "Wydania nocne" #: cps/templates/config_edit.html:104 msgid "Nightly (Automatic)" -msgstr "" +msgstr "Wydania nocne (automatycznie)" #: cps/templates/config_edit.html:115 msgid "Logfile Configuration" -msgstr "Konfiguracja Logów" +msgstr "Konfiguracja dziennika" #: cps/templates/config_edit.html:131 msgid "Location and name of logfile (calibre-web.log for no entry)" -msgstr "Lokalizacja i nazwa pliku Logu (domyślnie calibre-web.log)" +msgstr "Lokalizacja i nazwa pliku dziennika (domyślnie calibre-web.log)" #: cps/templates/config_edit.html:136 msgid "Enable Access Log" -msgstr "Włacz Log dostępu (access log)" +msgstr "Włącz dziennik dostępu (access log)" #: cps/templates/config_edit.html:139 msgid "Location and name of access logfile (access.log for no entry)" -msgstr "Lokalizacja i nazwa pliku Access Logu (domyślnie access.log)" +msgstr "Lokalizacja i nazwa pliku dziennika dostepu (domyślnie access.log)" #: cps/templates/config_edit.html:150 msgid "Feature Configuration" @@ -1451,15 +1452,15 @@ msgstr "Włącz publiczną rejestrację" #: cps/templates/config_edit.html:170 msgid "Enable Magic Link Remote Login" -msgstr "Włącz zdalne logowanie (\"magic link\")" +msgstr "Włącz zdalne logowanie („Magic Link”)" #: cps/templates/config_edit.html:175 msgid "Enable Kobo sync" -msgstr "" +msgstr "Włącz synchronizację Kobo" #: cps/templates/config_edit.html:180 msgid "Proxy unknown requests to Kobo Store" -msgstr "" +msgstr "Nieznane żądania proxy do Kobo Store" #: cps/templates/config_edit.html:187 msgid "Use Goodreads" @@ -1471,11 +1472,11 @@ msgstr "Uzyskaj klucz API" #: cps/templates/config_edit.html:192 msgid "Goodreads API Key" -msgstr "Klucz API Goodreads " +msgstr "Klucz API Goodreads" #: cps/templates/config_edit.html:196 msgid "Goodreads API Secret" -msgstr "" +msgstr "Goodreads API Secret" #: cps/templates/config_edit.html:203 msgid "Login type" @@ -1531,11 +1532,11 @@ msgstr "Ścieżka certyfikatu SSL LDAP" #: cps/templates/config_edit.html:255 msgid "LDAP Distinguished Name (DN)" -msgstr "" +msgstr "LDAP Distinguished Name (DN)" #: cps/templates/config_edit.html:259 msgid "LDAP User Object Filter" -msgstr "" +msgstr "LDAP User Object Filter" #: cps/templates/config_edit.html:264 msgid "LDAP Server is OpenLDAP?" @@ -1544,21 +1545,21 @@ msgstr "Serwer LDAP to OpenLDAP?" #: cps/templates/config_edit.html:272 #, python-format msgid "Obtain %(provider)s OAuth Credential" -msgstr "" +msgstr "Uzyskaj %(provider)s OAuth Credential" #: cps/templates/config_edit.html:275 #, python-format msgid "%(provider)s OAuth Client Id" -msgstr "" +msgstr "%(provider)s OAuth Client Id" #: cps/templates/config_edit.html:279 #, python-format msgid "%(provider)s OAuth Client Secret" -msgstr "" +msgstr "%(provider)s OAuth Client Secret" #: cps/templates/config_edit.html:288 msgid "Allow Reverse Proxy Authentication" -msgstr "" +msgstr "Zezwalaj na uwierzytelnianie reverse proxy" #: cps/templates/config_edit.html:292 msgid "Reverse Proxy Header Name" @@ -1586,7 +1587,7 @@ msgstr "Ustawienia konwertera e-booków (dodatkowe parametry)" #: cps/templates/config_edit.html:324 msgid "Path to convertertool" -msgstr "Lokalizacja do pliku konwertera" +msgstr "Lokalizacja pliku konwertera" #: cps/templates/config_edit.html:330 msgid "Location of Unrar binary" @@ -1599,11 +1600,11 @@ msgstr "Zaloguj się" #: cps/templates/config_view_edit.html:16 msgid "View Configuration" -msgstr "Konfiguracja Widoku" +msgstr "Konfiguracja widoku" #: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7 msgid "Title" -msgstr "Nazwa" +msgstr "Tytuł" #: cps/templates/config_view_edit.html:31 msgid "No. of Random Books to Display" @@ -1619,7 +1620,7 @@ msgstr "Motyw (Theme)" #: cps/templates/config_view_edit.html:41 msgid "Standard Theme" -msgstr "Motyw Standardowy" +msgstr "Motyw standardowy" #: cps/templates/config_view_edit.html:42 msgid "caliBlur! Dark Theme" @@ -1635,11 +1636,11 @@ msgstr "Link do statusu Przeczytanych/Nieprzeczytanych książek z kolumny Calib #: cps/templates/config_view_edit.html:59 msgid "View Restrictions based on Calibre column" -msgstr "" +msgstr "Ograniczenie przeglądania w oparciu o kolumnę Calibre" #: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21 msgid "None" -msgstr "Nic" +msgstr "Brak" #: cps/templates/config_view_edit.html:68 msgid "Regular Expression for Title Sorting" @@ -1659,7 +1660,7 @@ msgstr "Zezwalaj na pobieranie" #: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101 msgid "Allow eBook Viewer" -msgstr "Zezwalaj na przeglądanie książek" +msgstr "Zezwalaj na przeglądanie e-booków" #: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105 msgid "Allow Uploads" @@ -1671,7 +1672,7 @@ msgstr "Zezwalaj na edycję" #: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113 msgid "Allow Delete Books" -msgstr "" +msgstr "Zezwalaj na usuwanie książek" #: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118 msgid "Allow Changing Password" @@ -1691,11 +1692,11 @@ msgstr "Pokaz losowe książki w widoku szczegółowym" #: cps/templates/config_view_edit.html:144 msgid "Add Allowed/Denied Tags" -msgstr "" +msgstr "Dodaj dozwolone/zabronione etykiety" #: cps/templates/config_view_edit.html:145 msgid "Add Allowed/Denied custom column values" -msgstr "" +msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn" #: cps/templates/detail.html:59 msgid "Read in Browser" @@ -1707,15 +1708,15 @@ msgstr "Słuchaj w przeglądarce" #: cps/templates/detail.html:117 msgid "Book" -msgstr "Książka" +msgstr "Książka (tom)" #: cps/templates/detail.html:117 msgid "of" -msgstr "z" +msgstr "w cyklu" #: cps/templates/detail.html:165 msgid "Published" -msgstr "" +msgstr "Data publikacji" #: cps/templates/detail.html:200 msgid "Mark As Unread" @@ -1759,7 +1760,7 @@ msgstr "Zapisz ustawienia i wyślij testową wiadomość e-mail" #: cps/templates/email_edit.html:43 msgid "Allowed Domains (Whitelist)" -msgstr "Domeny dozwolone do rejestracji" +msgstr "Domeny dozwolone do rejestracji (biała lista)" #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72 msgid "Add Domain" @@ -1775,11 +1776,11 @@ msgstr "Podaj nazwę domeny" #: cps/templates/email_edit.html:60 msgid "Denied Domains (Blacklist)" -msgstr "Nie można zarejestrowac domen" +msgstr "Domeny zabronione (czarna lista)" #: cps/templates/email_edit.html:90 msgid "Are you sure you want to delete this domain?" -msgstr "Czy naprawdę chcesz usunąć tę regułę domeny?" +msgstr "Czy na pewno chcesz usunąć tę domenę?" #: cps/templates/feed.xml:21 cps/templates/layout.html:175 msgid "Next" @@ -1787,13 +1788,12 @@ msgstr "Następne" #: 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 "Otwórz plik .kobo/Kobo eReader.conf w edytorze tekstu i dodaj (lub edytuj):" # | msgid "Create a Shelf" #: cps/templates/http_error.html:38 -#, fuzzy msgid "Create Issue" -msgstr "Utwórz półkę" +msgstr "Zgłoś błąd" # ??? #: cps/templates/http_error.html:45 @@ -1802,7 +1802,7 @@ msgstr "Powrót do głównego menu" #: cps/templates/index.html:64 msgid "Group by series" -msgstr "Grupuj według serii" +msgstr "Grupuj według cyklu" #: cps/templates/index.xml:6 msgid "Start" @@ -1846,19 +1846,19 @@ msgstr "Książki sortowane według kategorii" #: cps/templates/index.xml:86 msgid "Books ordered by series" -msgstr "Książki sortowane według serii" +msgstr "Książki sortowane według cyklu" #: cps/templates/index.xml:93 msgid "Books ordered by Languages" -msgstr "Ksiązki posortowane według języka" +msgstr "Ksiązki sortowane według języka" #: cps/templates/index.xml:100 msgid "Books ordered by Rating" -msgstr "" +msgstr "Książki sortowane według oceny" #: cps/templates/index.xml:108 msgid "Books ordered by file formats" -msgstr "Ksiązki posortowane według formatu" +msgstr "Ksiązki sortowane według formatu" #: cps/templates/index.xml:111 cps/templates/layout.html:136 msgid "Public Shelves" @@ -1878,7 +1878,7 @@ msgstr "Własne półki, widoczne tylko dla bieżącego użytkownika" #: cps/templates/layout.html:28 msgid "Home" -msgstr "" +msgstr "Główne menu" #: cps/templates/layout.html:28 cps/templates/shelf_order.html:32 #: cps/templates/user_edit.html:178 @@ -1891,11 +1891,11 @@ msgstr "Przełącz nawigację" #: cps/templates/layout.html:45 msgid "Search Library" -msgstr "" +msgstr "Przeszukaj bibliotekę" #: cps/templates/layout.html:55 msgid "Advanced Search" -msgstr "Zaawansowane wyszukiwanie" +msgstr "Wyszukiwanie" #: cps/templates/layout.html:76 cps/templates/read.html:71 #: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107 @@ -1908,7 +1908,7 @@ msgstr "Konto" #: cps/templates/layout.html:80 msgid "Logout" -msgstr " Wyloguj się" +msgstr "Wyloguj się" #: cps/templates/layout.html:85 cps/templates/register.html:14 msgid "Register" @@ -1916,11 +1916,11 @@ msgstr "Zarejestruj się" #: cps/templates/layout.html:116 cps/templates/layout.html:222 msgid "Uploading..." -msgstr "" +msgstr "Wysyłanie…" #: cps/templates/layout.html:117 msgid "Please do not refresh the page" -msgstr "" +msgstr "Proszę nie odświeżać strony" #: cps/templates/layout.html:127 msgid "Browse" @@ -1932,7 +1932,7 @@ msgstr "Utwórz półkę" #: cps/templates/layout.html:146 cps/templates/stats.html:3 msgid "About" -msgstr "O programie" +msgstr "Informacje" # ??? #: cps/templates/layout.html:160 @@ -1945,7 +1945,7 @@ msgstr "Szczegóły książki" #: cps/templates/layout.html:221 msgid "Upload done, processing, please wait..." -msgstr "Ładowanie gotowe, przetwarzanie, proszę czekać ..." +msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…" # ??? #: cps/templates/layout.html:224 @@ -1963,19 +1963,19 @@ msgstr "Zapamiętaj mnie" #: cps/templates/login.html:22 msgid "Forgot Password?" -msgstr "Zapomniałem hasła" +msgstr "Zapomniałeś hasło?" #: cps/templates/login.html:25 msgid "Log in with Magic Link" -msgstr "Zaloguj się za pomocą \"magic link\"" +msgstr "Zaloguj się za pomocą „magic link”" #: cps/templates/logviewer.html:6 msgid "Show Calibre-Web Log: " -msgstr "Pokaż log Calibre-Web" +msgstr "Pokaż dziennik Calibre-Web: " #: cps/templates/logviewer.html:8 msgid "Calibre-Web Log: " -msgstr "Log Calibre-Web" +msgstr "Dziennik Calibre-Web: " #: cps/templates/logviewer.html:8 msgid "Stream output, can't be displayed" @@ -1983,40 +1983,39 @@ msgstr "Nie można wyświetlić wyjścia" #: cps/templates/logviewer.html:12 msgid "Show Access Log: " -msgstr "Pokaż log dostępu" +msgstr "Pokaż dziennik dostępu: " #: cps/templates/modal_restriction.html:6 msgid "Select allowed/denied Tags" -msgstr "" +msgstr "Wybierz dozwolone/zabronione etykiety" #: cps/templates/modal_restriction.html:7 msgid "Select allowed/denied Custom Column values" -msgstr "" +msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn" #: cps/templates/modal_restriction.html:8 msgid "Select allowed/denied Tags of user" -msgstr "" +msgstr "Wybierz dozwolone/zabronione etykiety użytkownika" #: cps/templates/modal_restriction.html:9 msgid "Select allowed/denied Custom Column values of user" -msgstr "" +msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn użytkownika" #: cps/templates/modal_restriction.html:15 msgid "Enter Tag" -msgstr "" +msgstr "Wpisz etykietę" #: cps/templates/modal_restriction.html:24 msgid "Add View Restriction" -msgstr "" +msgstr "Dodaj ograniczenie przeglądania" #: cps/templates/osd.xml:5 msgid "Calibre-Web eBook Catalog" msgstr "Katalog e-booków Calibre-Web" #: cps/templates/read.html:74 -#, fuzzy msgid "Reflow text when sidebars are open." -msgstr "Tekst pływający, gdy paski boczne są otwarte." +msgstr "Przepływ tekstu, gdy paski boczne są otwarte." #: cps/templates/readcbr.html:88 msgid "Keyboard Shortcuts" @@ -2044,7 +2043,7 @@ msgstr "Skaluj do wysokości" #: cps/templates/readcbr.html:96 msgid "Scale to Native" -msgstr "" +msgstr "Skaluj do wielkości oryginalnej" #: cps/templates/readcbr.html:97 msgid "Rotate Right" @@ -2056,7 +2055,7 @@ msgstr "Obróć w lewo" #: cps/templates/readcbr.html:99 msgid "Flip Image" -msgstr "" +msgstr "Odwórć obraz" #: cps/templates/readcbr.html:115 msgid "Light" @@ -2084,7 +2083,7 @@ msgstr "Wysokość" #: cps/templates/readcbr.html:127 msgid "Native" -msgstr "" +msgstr "Natywnie" #: cps/templates/readcbr.html:132 msgid "Rotate" @@ -2092,7 +2091,7 @@ msgstr "Obrót" #: cps/templates/readcbr.html:143 msgid "Flip" -msgstr "" +msgstr "Odwróć" #: cps/templates/readcbr.html:146 msgid "Horizontal" @@ -2108,7 +2107,7 @@ msgstr "Kierunek" #: cps/templates/readcbr.html:155 msgid "Left to Right" -msgstr "od lewej do prawej" +msgstr "Od lewej do prawej" #: cps/templates/readcbr.html:156 msgid "Right to Left" @@ -2136,11 +2135,11 @@ msgstr "Twój adres e-mail" #: cps/templates/remote_login.html:4 msgid "Magic Link - Authorise New Device" -msgstr "" +msgstr "Magic Link – Autoryzuj nowe urządzenie" #: cps/templates/remote_login.html:6 msgid "On another device, login and visit:" -msgstr "Użyj innego urządzenia, zaloguj się i odwiedź" +msgstr "Użyj innego urządzenia, zaloguj się i odwiedź:" #: cps/templates/remote_login.html:10 msgid "Once verified, you will automatically be logged in on this device." @@ -2152,11 +2151,11 @@ msgstr "Link wygaśnie po 10 minutach." #: cps/templates/search.html:5 msgid "No Results Found" -msgstr "" +msgstr "Brak wyników" #: cps/templates/search.html:6 msgid "Search Term:" -msgstr "" +msgstr "Wyszukiwano:" #: cps/templates/search.html:8 msgid "Results for:" @@ -2172,11 +2171,11 @@ msgstr "Data publikacji do" #: cps/templates/search_form.html:43 msgid "Exclude Tags" -msgstr "Wyklucz tagi" +msgstr "Wyklucz etykiety" #: cps/templates/search_form.html:63 msgid "Exclude Series" -msgstr "Wyklucz serie" +msgstr "Wyklucz cykle" #: cps/templates/search_form.html:84 msgid "Exclude Languages" @@ -2216,11 +2215,11 @@ msgstr "Czy na pewno chcesz usunąć półkę?" #: cps/templates/shelf.html:70 msgid "Shelf will be deleted for all users" -msgstr "Półka nie będzie dostępne dla wszystkich na zawsze!" +msgstr "Półka zostanie usunięta dla wszystkich użytkowników" #: cps/templates/shelf_edit.html:13 msgid "Share with Everyone" -msgstr "półka powinna być publiczna?" +msgstr "Współdziel z wszystkimi" #: cps/templates/shelf_order.html:5 msgid "Drag to Rearrange Order" @@ -2244,7 +2243,7 @@ msgstr "Kategorie" #: cps/templates/stats.html:24 msgid "Series in this Library" -msgstr "Serie" +msgstr "Cykle w tej bibliotece" #: cps/templates/stats.html:28 msgid "Linked Libraries" @@ -2302,7 +2301,7 @@ msgstr "Pokaż książki w języku" #: cps/templates/user_edit.html:43 msgid "Show All" -msgstr "Pokaż wszystko" +msgstr "Pokaż wszystkie" #: cps/templates/user_edit.html:52 msgid "OAuth Settings" @@ -2318,19 +2317,19 @@ msgstr "Rozłącz" #: cps/templates/user_edit.html:62 msgid "Kobo Sync Token" -msgstr "" +msgstr "Token Kobo Sync" #: cps/templates/user_edit.html:64 msgid "Create/View" -msgstr "" +msgstr "Utwórz/Przeglądaj" #: cps/templates/user_edit.html:83 msgid "Add allowed/denied Tags" -msgstr "" +msgstr "Dodaj dozwolone/zabronione etykiety" #: cps/templates/user_edit.html:84 msgid "Add allowed/denied custom column values" -msgstr "" +msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn" #: cps/templates/user_edit.html:129 msgid "Delete User" @@ -2339,13 +2338,12 @@ msgstr "Usuń tego użytkownika" # ??? #: cps/templates/user_edit.html:144 msgid "Recent Downloads" -msgstr "Pobrane" +msgstr "Ostatnio pobrane" #: cps/templates/user_edit.html:160 msgid "Generate Kobo Auth URL" -msgstr "" +msgstr "Generuj Kobo Auth URL" #: cps/templates/user_edit.html:176 msgid "Do you really want to delete the Kobo Token?" -msgstr "" - +msgstr "Czy na pewno chcesz usunąć Token Kobo?" From 0c27ff11b9522bc0324f48a70399540b63646bbd Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 1 Apr 2020 18:45:16 +0200 Subject: [PATCH 07/12] Update Updater --- cps/admin.py | 3 ++- cps/updater.py | 3 +++ cps/web.py | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index fa5b1caf..55a11c3e 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -964,7 +964,8 @@ def get_updater_status(): "8": _(u'Update failed:') + u' ' + _(u'HTTP Error'), "9": _(u'Update failed:') + u' ' + _(u'Connection error'), "10": _(u'Update failed:') + u' ' + _(u'Timeout while establishing connection'), - "11": _(u'Update failed:') + u' ' + _(u'General error') + "11": _(u'Update failed:') + u' ' + _(u'General error'), + "12": _(u'Update failed:') + u' ' + _(u'Update File Could Not be Saved in Temp Dir') } status['text'] = text updater_thread.status = 0 diff --git a/cps/updater.py b/cps/updater.py index 34f3ceef..0cc0c4f5 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -114,6 +114,9 @@ class Updater(threading.Thread): except (requests.exceptions.RequestException, zipfile.BadZipFile): self.status = 11 log.info(u'General error') + except (IOError, OSError): + self.status = 12 + log.info(u'Update File Could Not be Saved in Temp Dir') self.pause() return False diff --git a/cps/web.py b/cps/web.py index 8f273faf..b42fb0ce 100644 --- a/cps/web.py +++ b/cps/web.py @@ -1039,11 +1039,11 @@ def serve_book(book_id, book_format, anyname): else: return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format) - -@web.route("/download//") +@web.route("/download//", defaults={'anyname': 'None'}) +@web.route("/download///") @login_required_if_no_ano @download_required -def download_link(book_id, book_format): +def download_link(book_id, book_format, anyname): return get_download_link(book_id, book_format.lower()) From bab14a1fbf31739fad032b4207b38175158f7037 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Thu, 2 Apr 2020 18:23:24 +0200 Subject: [PATCH 08/12] Update shelfs handling, bugfix changed updater --- cps/opds.py | 59 ++++++++++++++++++++++++++++----------- cps/server.py | 3 +- cps/shelf.py | 47 +++++++++++++++++++++++-------- cps/templates/detail.html | 6 ++-- cps/templates/feed.xml | 4 +++ cps/templates/index.xml | 15 ++-------- cps/templates/layout.html | 12 ++++---- cps/templates/search.html | 4 +-- cps/web.py | 4 +-- 9 files changed, 100 insertions(+), 54 deletions(-) diff --git a/cps/opds.py b/cps/opds.py index f76d5dc0..6e98e539 100644 --- a/cps/opds.py +++ b/cps/opds.py @@ -25,7 +25,7 @@ import sys import datetime from functools import wraps -from flask import Blueprint, request, render_template, Response, g, make_response +from flask import Blueprint, request, render_template, Response, g, make_response, abort from flask_login import current_user from sqlalchemy.sql.expression import func, text, or_, and_ from werkzeug.security import check_password_hash @@ -165,7 +165,10 @@ def feed_author(book_id): off = request.args.get("offset") or 0 entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), db.Books, db.Books.authors.any(db.Authors.id == book_id), [db.Books.timestamp.desc()]) - return render_xml_template('feed.xml', entries=entries, pagination=pagination) + if len(entries): + return render_xml_template('feed.xml', entries=entries, pagination=pagination) + else: + return abort(404) @opds.route("/opds/publisher") @@ -186,7 +189,10 @@ def feed_publisher(book_id): entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), db.Books, db.Books.publishers.any(db.Publishers.id == book_id), [db.Books.timestamp.desc()]) - return render_xml_template('feed.xml', entries=entries, pagination=pagination) + if len(entries): + return render_xml_template('feed.xml', entries=entries, pagination=pagination) + else: + return abort(404) @opds.route("/opds/category") @@ -206,7 +212,10 @@ def feed_category(book_id): off = request.args.get("offset") or 0 entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), db.Books, db.Books.tags.any(db.Tags.id == book_id), [db.Books.timestamp.desc()]) - return render_xml_template('feed.xml', entries=entries, pagination=pagination) + if len(entries): + return render_xml_template('feed.xml', entries=entries, pagination=pagination) + else: + return abort(404) @opds.route("/opds/series") @@ -226,7 +235,10 @@ def feed_series(book_id): off = request.args.get("offset") or 0 entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), db.Books, db.Books.series.any(db.Series.id == book_id), [db.Books.series_index]) - return render_xml_template('feed.xml', entries=entries, pagination=pagination) + if len(entries): + return render_xml_template('feed.xml', entries=entries, pagination=pagination) + else: + return abort(404) @opds.route("/opds/ratings") @requires_basic_auth_if_no_ano @@ -250,7 +262,11 @@ def feed_ratings(book_id): off = request.args.get("offset") or 0 entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), db.Books, db.Books.ratings.any(db.Ratings.id == book_id),[db.Books.timestamp.desc()]) - return render_xml_template('feed.xml', entries=entries, pagination=pagination) + if len(entries): + return render_xml_template('feed.xml', entries=entries, pagination=pagination) + else: + return abort(404) + @opds.route("/opds/formats") @@ -274,7 +290,11 @@ def feed_format(book_id): off = request.args.get("offset") or 0 entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), db.Books, db.Books.data.any(db.Data.format == book_id.upper()), [db.Books.timestamp.desc()]) - return render_xml_template('feed.xml', entries=entries, pagination=pagination) + if len(entries): + return render_xml_template('feed.xml', entries=entries, pagination=pagination) + else: + return abort(404) + @opds.route("/opds/language") @opds.route("/opds/language/") @@ -305,20 +325,23 @@ def feed_languages(book_id): off = request.args.get("offset") or 0 entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), db.Books, db.Books.languages.any(db.Languages.id == book_id), [db.Books.timestamp.desc()]) - return render_xml_template('feed.xml', entries=entries, pagination=pagination) + if len(entries): + return render_xml_template('feed.xml', entries=entries, pagination=pagination) + else: + return abort(404) -@opds.route("/opds/shelfindex", defaults={'public': 0}) -@opds.route("/opds/shelfindex/") +@opds.route("/opds/shelfindex") #, defaults={'public': 0}) +# @opds.route("/opds/shelfindex/") @requires_basic_auth_if_no_ano -def feed_shelfindex(public): +def feed_shelfindex(): off = request.args.get("offset") or 0 - if public != 0: - shelf = g.public_shelfes - number = len(shelf) - else: - shelf = g.user.shelf - number = shelf.count() + # if public != 0: + shelf = g.shelves_access + number = len(shelf) + #else: + #shelf = g.user.shelf + # number = shelf.count() pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page, number) return render_xml_template('feed.xml', listelements=shelf, folder='opds.feed_shelf', pagination=pagination) @@ -346,6 +369,8 @@ def feed_shelf(book_id): pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page, len(result)) return render_xml_template('feed.xml', entries=result, pagination=pagination) + else: + return abort(404) @opds.route("/opds/download///") diff --git a/cps/server.py b/cps/server.py index a59d7a38..a108181b 100755 --- a/cps/server.py +++ b/cps/server.py @@ -24,7 +24,7 @@ import signal import socket try: - from gevent.pyewsgi import WSGIServer + from gevent.pywsgi import WSGIServer from gevent.pool import Pool from gevent import __version__ as _version VERSION = 'Gevent ' + _version @@ -171,6 +171,7 @@ class WebServer(object): except Exception as ex: log.error("Error starting server: %s", ex) print("Error starting server: %s" % ex) + self.stop() return False finally: self.wsgiserver = None diff --git a/cps/shelf.py b/cps/shelf.py index afee1eaa..02e910eb 100644 --- a/cps/shelf.py +++ b/cps/shelf.py @@ -204,12 +204,24 @@ def create_shelf(): shelf.is_public = 1 shelf.name = to_save["title"] shelf.user_id = int(current_user.id) - existing_shelf = ub.session.query(ub.Shelf).filter( - or_((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1), - (ub.Shelf.name == to_save["title"]) & (ub.Shelf.user_id == int(current_user.id)))).first() - if existing_shelf: - flash(_(u"A shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + is_shelf_name_unique = False + if shelf.is_public == 1: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1)) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") else: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) & (ub.Shelf.user_id == int(current_user.id))) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + if is_shelf_name_unique: try: ub.session.add(shelf) ub.session.commit() @@ -227,13 +239,26 @@ def edit_shelf(shelf_id): shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first() if request.method == "POST": to_save = request.form.to_dict() - existing_shelf = ub.session.query(ub.Shelf).filter( - or_((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1), - (ub.Shelf.name == to_save["title"]) & (ub.Shelf.user_id == int(current_user.id)))).filter( - ub.Shelf.id != shelf_id).first() - if existing_shelf: - flash(_(u"A shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + is_shelf_name_unique = False + if shelf.is_public == 1: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1)) \ + .filter(ub.Shelf.id != shelf_id) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") else: + is_shelf_name_unique = ub.session.query(ub.Shelf) \ + .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) & (ub.Shelf.user_id == int(current_user.id))) \ + .filter(ub.Shelf.id != shelf_id) \ + .first() is None + + if not is_shelf_name_unique: + flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error") + + if is_shelf_name_unique: shelf.name = to_save["title"] if "is_public" in to_save: shelf.is_public = 1 diff --git a/cps/templates/detail.html b/cps/templates/detail.html index d84dbe61..00510a2b 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -217,7 +217,7 @@
    {% if g.user.is_authenticated %} - {% if g.user.shelf.all() or g.public_shelfes %} + {% if g.user.shelf.all() or g.shelves_access %} - - - - - - - - -
    test_download_book
    - - PASS - - - - - - -
    test_edit_author
    - - PASS - - - - - - -
    test_edit_category
    - - PASS - - - - - - -
    test_edit_comments
    - - PASS - - - - - - -
    test_edit_custom_bool
    - - PASS - - - - - - -
    test_edit_custom_rating
    - - PASS - - - - - - -
    test_edit_custom_single_select
    - - PASS - - - - - - -
    test_edit_custom_text
    - - PASS - - - - - - -
    test_edit_language
    - - PASS - - - - - - -
    test_edit_publisher
    - - PASS - - - - - - -
    test_edit_publishing_date
    - - -
    - SKIP -
    - - - - - - - - - - -
    test_edit_rating
    - - PASS - - - - - - -
    test_edit_series
    - - PASS - - - - - - -
    test_edit_title
    - - PASS - - - - - - -
    test_rename_uppercase_lowercase
    - - -
    - SKIP -
    - - - - - - - - - - -
    test_typeahead_author
    - - PASS - - - - - - -
    test_typeahead_language
    - - PASS - - - - - - -
    test_typeahead_publisher
    - - PASS - - - - - - -
    test_typeahead_series
    - - PASS - - - - - - -
    test_typeahead_tag
    - - PASS - - - - - - -
    test_upload_book_cbr
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_book_cbt
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_book_cbz
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_book_epub
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_book_fb2
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_book_lit
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_book_mobi
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_book_pdf
    - - -
    - ERROR -
    - - - - - - - - - - -
    test_upload_cover_hdd
    - - -
    - ERROR -
    - - - - - - - - - - - test_edit_books_gdrive.test_edit_books_gdrive 2 0 0 0 2 - Detail + Detail - + -
    test_database_errors
    +
    test_delete_book
    - SKIP + SKIP
    -