From 6caf132fef05ab66ab2cd85964d230d0438eb430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Thu, 2 Mar 2017 18:31:21 +0800 Subject: [PATCH 01/16] init travis --- .travis.yml | 22 ++++++++++++++++++++++ build.sh | 11 +++++++++++ readme.md | 1 + 3 files changed, 34 insertions(+) create mode 100644 .travis.yml create mode 100755 build.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..c8115603 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: python + +python: +# - "2.6" + - "2.7" +# - "3.2" +# - "3.3" +# - "3.4" +# - "3.5" +# - "3.5-dev" # 3.5 development branch + - "3.6" +# - "3.6-dev" # 3.6 development branch +# - "3.7-dev" # 3.7 development branch +# - "nightly" # currently points to 3.7-dev + +install: false + +branches: + only: + - travis + +script: ./build.sh diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..1b051883 --- /dev/null +++ b/build.sh @@ -0,0 +1,11 @@ +#!/bin/sh +python -m py_compile cps.py +python -m py_compile cps/book_formats.py +python -m py_compile cps/db.py +python -m py_compile cps/epub.py +python -m py_compile cps/fb2.py +python -m py_compile cps/helper.py +python -m py_compile cps/ub.py +python -m py_compile cps/uploader.py +python -m py_compile cps/web.py +python -m py_compile cps.py diff --git a/readme.md b/readme.md index 102d4b2e..8b36e132 100755 --- a/readme.md +++ b/readme.md @@ -1,3 +1,4 @@ +##Forked from [janeczku/calibre-web](https://github.com/janeczku/calibre-web) [![Build Status](https://travis-ci.org/Kennyl/calibre-web.svg?branch=master)](https://travis-ci.org/Kennyl/calibre-web) ##About Calibre Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing [Calibre](https://calibre-ebook.com) database. From 9ca88840eb30a7a51d4fd12a38582efeb1c88655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Sun, 5 Mar 2017 15:30:35 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E2=80=9C-=E2=80=9C=20is=20removed=20at?= =?UTF-8?q?=20helper=20,=20so=20use=20=E2=80=9C=5F=E2=80=9D=20instead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cps/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/web.py b/cps/web.py index 5687d604..ff61c022 100755 --- a/cps/web.py +++ b/cps/web.py @@ -1275,7 +1275,7 @@ def get_download_link(book_id, format): helper.update_download(book_id, int(current_user.id)) file_name = book.title if len(book.authors) > 0: - file_name = book.authors[0].name + '-' + file_name + file_name = book.authors[0].name + '_' + file_name file_name = helper.get_valid_filename(file_name) response = make_response( send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format)) From 3a9a327957c6966766c13e4b79b20a515fb0cfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Sun, 5 Mar 2017 15:43:56 +0800 Subject: [PATCH 03/16] Fix build script --- .travis.yml | 7 +++++++ build.sh | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c8115603..7fa2b4c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,13 @@ python: # - "3.7-dev" # 3.7 development branch # - "nightly" # currently points to 3.7-dev +matrix: + include: + - python: "2.7" + env: PVERSION=2 + - python: "3.6" + env: PVERSION=3 + install: false branches: diff --git a/build.sh b/build.sh index 1b051883..bd0ff5b0 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,5 @@ #!/bin/sh +if [[$PVERSION=2]]; then python -m py_compile cps.py python -m py_compile cps/book_formats.py python -m py_compile cps/db.py @@ -8,4 +9,18 @@ python -m py_compile cps/helper.py python -m py_compile cps/ub.py python -m py_compile cps/uploader.py python -m py_compile cps/web.py -python -m py_compile cps.py +python -m py_compile cps.py +fi +f [[$PVERSION=3]]; then +python3.6 -m py_compile cps.py +python3.6 -m py_compile cps/book_formats.py +python3.6 -m py_compile cps/db.py +python3.6 -m py_compile cps/epub.py +python3.6 -m py_compile cps/fb2.py +python3.6 -m py_compile cps/helper.py +python3.6 -m py_compile cps/ub.py +python3.6 -m py_compile cps/uploader.py +python3.6 -m py_compile cps/web.py +python3.6 -m py_compile cps.py +fi + From 5bd93186c2dd94dfa2f4c6387fc1abc7af05bbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Sun, 5 Mar 2017 15:51:20 +0800 Subject: [PATCH 04/16] Fix shell script bug --- .travis.yml | 6 +++--- build.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7fa2b4c6..49024a22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: python -python: +#python: # - "2.6" - - "2.7" +# - "2.7" # - "3.2" # - "3.3" # - "3.4" # - "3.5" # - "3.5-dev" # 3.5 development branch - - "3.6" +# - "3.6" # - "3.6-dev" # 3.6 development branch # - "3.7-dev" # 3.7 development branch # - "nightly" # currently points to 3.7-dev diff --git a/build.sh b/build.sh index bd0ff5b0..0e799931 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/sh -if [[$PVERSION=2]]; then +if [[ $PVERSION = 2 ]]; then python -m py_compile cps.py python -m py_compile cps/book_formats.py python -m py_compile cps/db.py @@ -11,7 +11,7 @@ python -m py_compile cps/uploader.py python -m py_compile cps/web.py python -m py_compile cps.py fi -f [[$PVERSION=3]]; then +if [[ $PVERSION = 3 ]]; then python3.6 -m py_compile cps.py python3.6 -m py_compile cps/book_formats.py python3.6 -m py_compile cps/db.py From d56d67ce43893c2a5cacae1c53765f7950bb7013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Sun, 5 Mar 2017 15:55:10 +0800 Subject: [PATCH 05/16] Fix bash --- .travis.yml | 16 ++++++++-------- build.sh | 17 ++--------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49024a22..d863179d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,23 +2,23 @@ language: python #python: # - "2.6" -# - "2.7" + - "2.7" # - "3.2" # - "3.3" # - "3.4" # - "3.5" # - "3.5-dev" # 3.5 development branch -# - "3.6" + - "3.6" # - "3.6-dev" # 3.6 development branch # - "3.7-dev" # 3.7 development branch # - "nightly" # currently points to 3.7-dev -matrix: - include: - - python: "2.7" - env: PVERSION=2 - - python: "3.6" - env: PVERSION=3 +#matrix: +# include: +# - python: "2.7" +# env: PVERSION=2 +# - python: "3.6" +# env: PVERSION=3 install: false diff --git a/build.sh b/build.sh index 0e799931..fc04dc21 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ #!/bin/sh -if [[ $PVERSION = 2 ]]; then +set -x + python -m py_compile cps.py python -m py_compile cps/book_formats.py python -m py_compile cps/db.py @@ -10,17 +11,3 @@ python -m py_compile cps/ub.py python -m py_compile cps/uploader.py python -m py_compile cps/web.py python -m py_compile cps.py -fi -if [[ $PVERSION = 3 ]]; then -python3.6 -m py_compile cps.py -python3.6 -m py_compile cps/book_formats.py -python3.6 -m py_compile cps/db.py -python3.6 -m py_compile cps/epub.py -python3.6 -m py_compile cps/fb2.py -python3.6 -m py_compile cps/helper.py -python3.6 -m py_compile cps/ub.py -python3.6 -m py_compile cps/uploader.py -python3.6 -m py_compile cps/web.py -python3.6 -m py_compile cps.py -fi - From f315d54c879a436e990beba01e00fe4ed95642c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Sun, 5 Mar 2017 15:56:27 +0800 Subject: [PATCH 06/16] fix yams --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d863179d..c174aedd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python -#python: +python: # - "2.6" - "2.7" # - "3.2" From fca1fc23da167cf56c156f0d83e981f01263067a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Mon, 6 Mar 2017 14:30:45 +0800 Subject: [PATCH 07/16] double requirement fix --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 51056ce0..1eb4cb70 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ future -sqlalchemy +#sqlalchemy PyPDF2 babel From 376eb8752ec7a051808c58e3a27fbe6e201b3c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Mon, 6 Mar 2017 14:46:44 +0800 Subject: [PATCH 08/16] wrong conflict merge --- cps/epub.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cps/epub.py b/cps/epub.py index 563faa1c..455b1ab8 100644 --- a/cps/epub.py +++ b/cps/epub.py @@ -71,9 +71,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension): epub_metadata['language'] = isoLanguages.get(part3=lang).name else: epub_metadata['language'] = "" - except IndexError as e: - epub_metadata['language'] = "" - + coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns) coverfile = None if len(coversection) > 0: From dc985e76df12f3a0f9651054baaa49c294af2b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Mon, 6 Mar 2017 18:23:33 +0800 Subject: [PATCH 09/16] python3 fix --- cps/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/web.py b/cps/web.py index 3387f150..82cee89d 100755 --- a/cps/web.py +++ b/cps/web.py @@ -683,7 +683,7 @@ def get_opds_download_link(book_id, format): file_name = book.authors[0].name + '-' + file_name file_name = helper.get_valid_filename(file_name) response = make_response(send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format)) - response.headers["Content-Disposition"] = "attachment; filename=\"%s.%s\"" % (urllib.quote(file_name.encode('utf8')), format) + response.headers["Content-Disposition"] = "attachment; filename=\"%s.%s\"" % (quote(file_name.encode('utf8')), format) return response From 8c625dfb938f6f570456c64a05ff46921d733b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Wed, 8 Mar 2017 13:56:13 +0800 Subject: [PATCH 10/16] Fix #146 For WebUI only OPDS remains previous behaviour --- cps/templates/detail.html | 2 +- cps/web.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cps/templates/detail.html b/cps/templates/detail.html index 9639e954..510cfb68 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -126,7 +126,7 @@ diff --git a/cps/web.py b/cps/web.py index 07d7fb63..eed95f11 100755 --- a/cps/web.py +++ b/cps/web.py @@ -1309,7 +1309,6 @@ def read_book(book_id, format): flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error") return redirect(url_for("index")) - @app.route("/download//") @login_required_if_no_ano @download_required @@ -1336,6 +1335,11 @@ def get_download_link(book_id, format): else: abort(404) +@app.route("/download///") +@login_required_if_no_ano +@download_required +def get_download_link_ext(book_id, format, anyname): + return get_download_link(book_id, format) @app.route('/register', methods=['GET', 'POST']) def register(): From a7d361a0ffa6f73ca4fe4c707e8b7a14db091be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Wed, 8 Mar 2017 23:52:41 +0800 Subject: [PATCH 11/16] merge conflict --- cps/web.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cps/web.py b/cps/web.py index 06e0b037..809cedc8 100755 --- a/cps/web.py +++ b/cps/web.py @@ -1331,11 +1331,7 @@ def get_download_link(book_id, format): response.headers["Content-Type"] = mimetypes.types_map['.' + format] except Exception as e: pass -<<<<<<< HEAD - response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (urllib.quote(file_name.encode('utf-8')), format) -======= response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (quote(file_name.encode('utf-8')), format) ->>>>>>> master return response else: abort(404) From 7bae79d82621684141fece5f2b0428d198a74413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Wed, 8 Mar 2017 23:56:20 +0800 Subject: [PATCH 12/16] fix conflict --- cps/epub.py | 12 ------------ cps/templates/book_edit.html | 2 -- 2 files changed, 14 deletions(-) diff --git a/cps/epub.py b/cps/epub.py index 368eadf5..446efe9b 100644 --- a/cps/epub.py +++ b/cps/epub.py @@ -41,14 +41,6 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension): p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0] epub_metadata = {} -<<<<<<< HEAD - try:#maybe description isn't present - comments = tree.xpath("//*[local-name() = 'description']/text()")[0] - epub_metadata['comments'] = comments - except IndexError as e: - epub_metadata['comments'] = "" -======= ->>>>>>> master for s in ['title', 'description', 'creator', 'language']: tmp = p.xpath('dc:%s/text()' % s, namespaces=ns) @@ -74,11 +66,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension): epub_metadata['language'] = isoLanguages.get(part3=lang).name else: epub_metadata['language'] = "" -<<<<<<< HEAD - -======= ->>>>>>> master coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns) coverfile = None if len(coversection) > 0: diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index 86b7281e..f3425995 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -150,9 +150,7 @@ -<<<<<<< HEAD -======= {% endblock %} {% block header %} From d7d29827f440bc52d89988fde9f0dca6e34ba8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Wed, 8 Mar 2017 23:59:56 +0800 Subject: [PATCH 13/16] fix behind --- cps/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/web.py b/cps/web.py index 809cedc8..930a1093 100755 --- a/cps/web.py +++ b/cps/web.py @@ -56,7 +56,7 @@ except ImportError as e: try: from flask_login import __version__ as flask_loginVersion -except ImportError, e: +except ImportError as e: from flask_login.__about__ import __version__ as flask_loginVersion try: From 045419e880f64ea8d11d0a3bf3fcdb7641862b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Thu, 9 Mar 2017 12:32:10 +0800 Subject: [PATCH 14/16] Fix #146 For WebUI only OPDS remains previous behaviour --- cps/templates/detail.html | 2 +- cps/web.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cps/templates/detail.html b/cps/templates/detail.html index 9639e954..ce7e179a 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -126,7 +126,7 @@ diff --git a/cps/web.py b/cps/web.py index 07d7fb63..eed95f11 100755 --- a/cps/web.py +++ b/cps/web.py @@ -1309,7 +1309,6 @@ def read_book(book_id, format): flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error") return redirect(url_for("index")) - @app.route("/download//") @login_required_if_no_ano @download_required @@ -1336,6 +1335,11 @@ def get_download_link(book_id, format): else: abort(404) +@app.route("/download///") +@login_required_if_no_ano +@download_required +def get_download_link_ext(book_id, format, anyname): + return get_download_link(book_id, format) @app.route('/register', methods=['GET', 'POST']) def register(): From 89fa9eb02f6cb206c8422de4eb34229ee903aed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Kierznowski?= Date: Sat, 11 Mar 2017 15:35:38 +0100 Subject: [PATCH 15/16] Update polish translation Calibre Web - polski (POT: 2017-03-11 09:09) --- cps/translations/pl/LC_MESSAGES/messages.mo | Bin 16474 -> 17385 bytes cps/translations/pl/LC_MESSAGES/messages.po | 308 ++++++++++++-------- 2 files changed, 179 insertions(+), 129 deletions(-) diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo index 010831aa50b89f8a4d92b4baa93637198f513f1d..b1b4b5b239e267d0b82c98346bbc3e26e17363d1 100644 GIT binary patch delta 6169 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 iHObquSBc9rwJ;%6 `I^uI>Ep27e>Z%v=a1O5x1RyT|Q diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po index 087bb7ba..7cc4b6be 100644 --- a/cps/translations/pl/LC_MESSAGES/messages.po +++ b/cps/translations/pl/LC_MESSAGES/messages.po @@ -1,14 +1,13 @@ -# Polish translations for Calibre Web. -# Copyright (C) 2017 Radosław Kierznowski +# Copyright (C) 2017 Radosław Kierznowski # This file is distributed under the same license as the Calibre Web # project. -# Radosław Kierznowski , 2017. +# Radosław Kierznowski , 2017. # msgid "" msgstr "" -"Project-Id-Version: Calibre Web - polski (POT: 2017-02-20 19:47)\n" +"Project-Id-Version: Calibre Web - polski (POT: 2017-03-11 09:09)\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-03-04 20:50+0100\n" +"POT-Creation-Date: 2017-03-11 14:53+0100\n" "PO-Revision-Date: \n" "Last-Translator: Radosław Kierznowski \n" "Language-Team: \n" @@ -17,358 +16,362 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.12\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-Basepath: .\n" -#: cps/book_formats.py:111 cps/book_formats.py:115 cps/web.py:1041 +#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082 msgid "not installed" msgstr "nie zainstalowane" -#: cps/helper.py:152 +#: cps/helper.py:159 #, python-format msgid "Failed to send mail: %s" msgstr "Nie można wysłać poczty: %s" -#: cps/helper.py:159 +#: cps/helper.py:166 msgid "Calibre-web test email" msgstr "Calibre-web testowy email" -#: cps/helper.py:160 cps/helper.py:172 +#: cps/helper.py:167 cps/helper.py:179 msgid "This email has been sent via calibre web." msgstr "Ten e-mail został wysłany przez Calibre Web." -#: cps/helper.py:169 cps/templates/detail.html:136 +#: cps/helper.py:176 cps/templates/detail.html:136 msgid "Send to Kindle" msgstr "Wyślij do Kindle" -#: cps/helper.py:189 cps/helper.py:204 +#: cps/helper.py:196 cps/helper.py:211 msgid "Could not find any formats suitable for sending by email" msgstr "" "Nie można znaleźć żadnych formatów przystosowane do wysyłania pocztą e-mail" -#: cps/helper.py:198 +#: cps/helper.py:205 msgid "Could not convert epub to mobi" msgstr "Nie można konwertować epub do mobi" -#: cps/ub.py:433 +#: cps/ub.py:442 msgid "Guest" msgstr "Gość" -#: cps/web.py:742 +#: cps/web.py:768 msgid "Requesting update package" msgstr "Żądanie o pakiet aktualizacji" -#: cps/web.py:743 +#: cps/web.py:769 msgid "Downloading update package" msgstr "Pobieranie pakietu aktualizacji" -#: cps/web.py:744 +#: cps/web.py:770 msgid "Unzipping update package" msgstr "Rozpakowywanie pakietu aktualizacji" -#: cps/web.py:745 +#: cps/web.py:771 msgid "Files are replaced" msgstr "Pliki zostały zastąpione" -#: cps/web.py:746 +#: cps/web.py:772 msgid "Database connections are closed" msgstr "Połączenia z bazą danych zostały zakończone" -#: cps/web.py:747 +#: cps/web.py:773 msgid "Server is stopped" msgstr "Serwer jest zatrzymany" -#: cps/web.py:748 +#: cps/web.py:774 msgid "Update finished, please press okay and reload page" msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę" -#: cps/web.py:821 +#: cps/web.py:847 msgid "Latest Books" msgstr "Ostatnie książki" -#: cps/web.py:846 +#: cps/web.py:878 msgid "Hot Books (most downloaded)" msgstr "Najpopularniejsze książki (najczęściej pobierane)" -#: cps/web.py:856 +#: cps/web.py:888 msgid "Best rated books" msgstr "Najlepiej oceniane książki" -#: cps/templates/index.xml:36 cps/web.py:865 +#: cps/templates/index.xml:36 cps/web.py:897 msgid "Random Books" msgstr "Losowe książki" -#: cps/web.py:878 +#: cps/web.py:910 msgid "Author list" msgstr "Lista autorów" -#: cps/web.py:889 +#: cps/web.py:921 #, python-format msgid "Author: %(name)s" msgstr "Autor: %(name)s" -#: cps/web.py:891 cps/web.py:919 cps/web.py:1018 cps/web.py:1261 -#: cps/web.py:2143 +#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309 +#: cps/web.py:2193 msgid "Error opening eBook. File does not exist or file is not accessible:" msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:" -#: cps/templates/index.xml:57 cps/web.py:905 +#: cps/templates/index.xml:57 cps/web.py:937 msgid "Series list" msgstr "Lista serii" -#: cps/web.py:917 +#: cps/web.py:949 #, python-format msgid "Series: %(serie)s" msgstr "Seria: %(serie)s" -#: cps/web.py:950 +#: cps/web.py:982 msgid "Available languages" msgstr "Dostępne języki" -#: cps/web.py:965 +#: cps/web.py:997 #, python-format msgid "Language: %(name)s" msgstr "Język: %(name)s" -#: cps/templates/index.xml:50 cps/web.py:978 +#: cps/templates/index.xml:50 cps/web.py:1010 msgid "Category list" msgstr "Lista kategorii" -#: cps/web.py:990 +#: cps/web.py:1022 #, python-format msgid "Category: %(name)s" msgstr "Kategoria: %(name)s" -#: cps/web.py:1062 +#: cps/web.py:1105 msgid "Statistics" msgstr "Statystyki" -#: cps/web.py:1083 +#: cps/web.py:1126 msgid "Server restarted, please reload page" msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę" -#: cps/web.py:1085 +#: cps/web.py:1128 msgid "Performing shutdown of server, please close window" msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno" -#: cps/web.py:1095 +#: cps/web.py:1143 msgid "Update done" msgstr "Aktualizacja zakończona" -#: cps/web.py:1173 cps/web.py:1186 +#: cps/web.py:1221 cps/web.py:1234 msgid "search" msgstr "szukaj" -#: cps/web.py:1237 cps/web.py:1244 cps/web.py:1251 cps/web.py:1258 +#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306 msgid "Read a Book" msgstr "Czytaj książkę" -#: cps/web.py:1302 cps/web.py:1739 +#: cps/web.py:1350 cps/web.py:1789 msgid "Please fill out all fields!" msgstr "Proszę wypełnić wszystkie pola!" -#: cps/web.py:1303 cps/web.py:1319 cps/web.py:1324 cps/web.py:1326 +#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374 msgid "register" msgstr "rejestracja" -#: cps/web.py:1318 +#: cps/web.py:1366 msgid "An unknown error occured. Please try again later." msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później." -#: cps/web.py:1323 +#: cps/web.py:1371 msgid "This username or email address is already in use." msgstr "Nazwa użytkownika lub adres e-mail jest już w użyciu." -#: cps/web.py:1341 +#: cps/web.py:1389 #, python-format msgid "you are now logged in as: '%(nickname)s'" msgstr "Zalogowałeś się jako: '%(nickname)s'" -#: cps/web.py:1346 +#: cps/web.py:1394 msgid "Wrong Username or Password" msgstr "Błędna nazwa użytkownika lub hasło" -#: cps/web.py:1348 +#: cps/web.py:1396 msgid "login" msgstr "logowanie" -#: cps/web.py:1365 +#: cps/web.py:1413 msgid "Please configure the SMTP mail settings first..." msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..." -#: cps/web.py:1369 +#: cps/web.py:1417 #, python-format msgid "Book successfully send to %(kindlemail)s" msgstr "Książka została pomyślnie wysłana do %(kindlemail)s" -#: cps/web.py:1373 +#: cps/web.py:1421 #, python-format msgid "There was an error sending this book: %(res)s" msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s" -#: cps/web.py:1375 +#: cps/web.py:1423 msgid "Please configure your kindle email address first..." msgstr "Proszę najpierw skonfigurować adres e-mail swojego kindla..." -#: cps/web.py:1395 +#: cps/web.py:1443 #, python-format msgid "Book has been added to shelf: %(sname)s" msgstr "Książka została dodana do półki: %(sname)s" -#: cps/web.py:1416 +#: cps/web.py:1464 #, python-format msgid "Book has been removed from shelf: %(sname)s" msgstr "Książka została usunięta z półki: %(sname)s" -#: cps/web.py:1435 cps/web.py:1459 +#: cps/web.py:1483 cps/web.py:1507 #, python-format msgid "A shelf with the name '%(title)s' already exists." msgstr "Półka o nazwie '%(title)s' już istnieje." -#: cps/web.py:1440 +#: cps/web.py:1488 #, python-format msgid "Shelf %(title)s created" msgstr "Półka %(title)s została utworzona" -#: cps/web.py:1442 cps/web.py:1470 +#: cps/web.py:1490 cps/web.py:1518 msgid "There was an error" msgstr "Wystąpił błąd" -#: cps/web.py:1443 cps/web.py:1445 +#: cps/web.py:1491 cps/web.py:1493 msgid "create a shelf" msgstr "utwórz półkę" -#: cps/web.py:1468 +#: cps/web.py:1516 #, python-format msgid "Shelf %(title)s changed" msgstr "Półka %(title)s została zmieniona" -#: cps/web.py:1471 cps/web.py:1473 +#: cps/web.py:1519 cps/web.py:1521 msgid "Edit a shelf" msgstr "Edytuj półkę" -#: cps/web.py:1491 +#: cps/web.py:1539 #, python-format msgid "successfully deleted shelf %(name)s" msgstr "pomyślnie usunięto półkę %(name)s" -#: cps/web.py:1513 +#: cps/web.py:1561 #, python-format msgid "Shelf: '%(name)s'" msgstr "Półka: '%(name)s'" -#: cps/web.py:1544 +#: cps/web.py:1592 #, python-format msgid "Change order of Shelf: '%(name)s'" msgstr "Zmieniono kolejność półki: '%(name)s'" -#: cps/web.py:1606 +#: cps/web.py:1654 msgid "Found an existing account for this email address." msgstr "Znaleziono istniejące konto dla tego adresu e-mail." -#: cps/web.py:1608 cps/web.py:1612 +#: cps/web.py:1656 cps/web.py:1660 #, python-format msgid "%(name)s's profile" msgstr "Profil użytkownika %(name)s" -#: cps/web.py:1609 +#: cps/web.py:1657 msgid "Profile updated" msgstr "Zaktualizowano profil" -#: cps/web.py:1623 +#: cps/web.py:1671 msgid "Admin page" msgstr "Portal administracyjny" -#: cps/web.py:1694 +#: cps/web.py:1744 msgid "Calibre-web configuration updated" msgstr "Konfiguracja Calibre-web została zaktualizowana" -#: cps/web.py:1701 cps/web.py:1707 cps/web.py:1720 +#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770 msgid "Basic Configuration" msgstr "Podstawowa konfiguracja" -#: cps/web.py:1705 +#: cps/web.py:1755 msgid "DB location is not valid, please enter correct path" msgstr "Lokalizacja bazy danych jest nieprawidłowa, wpisz poprawną ścieżkę" -#: cps/templates/admin.html:34 cps/web.py:1741 cps/web.py:1787 +#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837 msgid "Add new user" msgstr "Dodaj nowego użytkownika" -#: cps/web.py:1779 +#: cps/web.py:1829 #, python-format msgid "User '%(user)s' created" msgstr "Użytkownik '%(user)s' został utworzony" -#: cps/web.py:1783 +#: cps/web.py:1833 msgid "Found an existing account for this email address or nickname." msgstr "" "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy użytkownika." -#: cps/web.py:1805 +#: cps/web.py:1855 msgid "Mail settings updated" msgstr "Zaktualizowano ustawienia poczty e-mail" -#: cps/web.py:1811 +#: cps/web.py:1861 #, python-format msgid "Test E-Mail successfully send to %(kindlemail)s" msgstr "Testowy e-mail został pomyślnie wysłany do %(kindlemail)s" -#: cps/web.py:1814 +#: cps/web.py:1864 #, python-format msgid "There was an error sending the Test E-Mail: %(res)s" msgstr "Wystąpił błąd podczas wysyłania testowej wiadomości e-mail: %(res)s" -#: cps/web.py:1816 +#: cps/web.py:1866 msgid "E-Mail settings updated" msgstr "Zaktualizowano ustawienia e-mail" -#: cps/web.py:1817 +#: cps/web.py:1867 msgid "Edit mail settings" msgstr "Edytuj ustawienia poczty e-mail" -#: cps/web.py:1845 +#: cps/web.py:1895 #, python-format msgid "User '%(nick)s' deleted" msgstr "Użytkownik '%(nick)s' został usunięty" -#: cps/web.py:1926 +#: cps/web.py:1976 #, python-format msgid "User '%(nick)s' updated" msgstr "Użytkownik '%(nick)s' został zaktualizowany" -#: cps/web.py:1929 +#: cps/web.py:1979 msgid "An unknown error occured." msgstr "Wystąpił nieznany błąd." -#: cps/web.py:1932 +#: cps/web.py:1982 #, python-format msgid "Edit User %(nick)s" msgstr "Edytuj użytkownika %(nick)s" -#: cps/web.py:2138 cps/web.py:2141 cps/web.py:2228 +#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301 msgid "edit metadata" msgstr "edytuj metadane" -#: cps/web.py:2162 +#: cps/web.py:2212 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "" "Rozszerzenie pliku \"%s\" nie jest dozwolone do przesłania na ten serwer" -#: cps/web.py:2168 +#: cps/web.py:2218 msgid "File to be uploaded must have an extension" msgstr "Plik do przesłania musi mieć rozszerzenie" -#: cps/web.py:2185 +#: cps/web.py:2235 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)." -#: cps/web.py:2190 +#: cps/web.py:2240 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)." -#: cps/web.py:2195 +#: cps/web.py:2245 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)." @@ -453,7 +456,7 @@ msgstr "Konfiguracja" msgid "Calibre DB dir" msgstr "Folder bazy danych Calibre" -#: cps/templates/admin.html:61 cps/templates/config_edit.html:32 +#: cps/templates/admin.html:61 cps/templates/config_edit.html:35 msgid "Log Level" msgstr "Poziom logów" @@ -490,42 +493,46 @@ msgid "Newest commit timestamp" msgstr "Znacznik czasowy nowej wersji" #: cps/templates/admin.html:83 -msgid "Restart Calibre-web" -msgstr "Zrestartuj Calibre Web" +msgid "Reconnect to Calibre DB" +msgstr "Połącz ponownie z bazą danych Calibre" #: cps/templates/admin.html:84 +msgid "Restart Calibre-web" +msgstr "Uruchom ponownie Calibre Web" + +#: cps/templates/admin.html:85 msgid "Stop Calibre-web" msgstr "Zatrzymaj Calibre Web" -#: cps/templates/admin.html:85 +#: cps/templates/admin.html:86 msgid "Check for update" msgstr "Sprawdź aktualizacje" -#: cps/templates/admin.html:86 +#: cps/templates/admin.html:87 msgid "Perform Update" msgstr "Wykonaj aktualizację" -#: cps/templates/admin.html:96 +#: cps/templates/admin.html:97 msgid "Do you really want to restart Calibre-web?" msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?" -#: cps/templates/admin.html:101 cps/templates/admin.html:115 -#: cps/templates/admin.html:136 +#: cps/templates/admin.html:102 cps/templates/admin.html:116 +#: cps/templates/admin.html:137 msgid "Ok" msgstr "OK" -#: cps/templates/admin.html:102 cps/templates/admin.html:116 -#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75 +#: cps/templates/admin.html:103 cps/templates/admin.html:117 +#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116 msgid "Back" msgstr "Wróć" -#: cps/templates/admin.html:114 +#: cps/templates/admin.html:115 msgid "Do you really want to stop Calibre-web?" msgstr "Na pewno chcesz zatrzymać Calibre Web?" -#: cps/templates/admin.html:127 +#: cps/templates/admin.html:128 msgid "Updating, please do not reload page" msgstr "Aktualizowanie, proszę nie odświeżać strony" @@ -533,11 +540,12 @@ msgstr "Aktualizowanie, proszę nie odświeżać strony" msgid "Book Title" msgstr "Tytuł książki" -#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:20 cps/templates/book_edit.html:145 +#: cps/templates/search_form.html:10 msgid "Author" msgstr "Autor" -#: cps/templates/book_edit.html:24 +#: cps/templates/book_edit.html:24 cps/templates/book_edit.html:147 msgid "Description" msgstr "Opis" @@ -578,12 +586,61 @@ msgstr "Nie" msgid "view book after edit" msgstr "wyświetl książkę po edycji" -#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73 +#: cps/templates/book_edit.html:107 +msgid "Get Metadata" +msgstr "Uzyskaj Metadane" + +#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76 #: cps/templates/login.html:19 cps/templates/search_form.html:79 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114 msgid "Submit" msgstr "Wyślij" +#: cps/templates/book_edit.html:118 +msgid "Get metadata" +msgstr "Uzyskaj metadane" + +#: cps/templates/book_edit.html:121 +msgid "Keyword" +msgstr "Słowo kluczowe" + +#: cps/templates/book_edit.html:122 +msgid " Search keyword " +msgstr " Szukaj słowa kluczowego " + +#: cps/templates/book_edit.html:124 cps/templates/layout.html:60 +msgid "Go!" +msgstr "Idź!" + +#: cps/templates/book_edit.html:125 +msgid "Click the cover to load metadata to the form" +msgstr "Kliknij okładkę, aby załadować metadane do formularza" + +#: cps/templates/book_edit.html:129 cps/templates/book_edit.html:142 +msgid "Loading..." +msgstr "Ładowanie..." + +#: cps/templates/book_edit.html:132 +msgid "Close" +msgstr "Zamknij" + +#: cps/templates/book_edit.html:143 +msgid "Search error!" +msgstr "Błąd wyszukiwania!" + +#: cps/templates/book_edit.html:144 +msgid "No Result! Please try anonther keyword." +msgstr "Brak wyników! Spróbuj innego słowa kluczowego." + +#: cps/templates/book_edit.html:146 cps/templates/detail.html:76 +#: cps/templates/search_form.html:14 +msgid "Publisher" +msgstr "Wydawca" + +#: cps/templates/book_edit.html:148 +msgid "Source" +msgstr "Źródło" + #: cps/templates/config_edit.html:7 msgid "Location of Calibre database" msgstr "Lokalizacja bazy danych Calibre" @@ -600,47 +657,51 @@ msgstr "Tytuł" msgid "No. of random books to show" msgstr "Liczba losowych książek do pokazania" -#: cps/templates/config_edit.html:28 +#: cps/templates/config_edit.html:27 +msgid "Regular expression for ignoring columns" +msgstr "Wyrażenie regularne dla ignorowanych kolumn" + +#: cps/templates/config_edit.html:31 msgid "Regular expression for title sorting" msgstr "Wyrażenie regularne dla tytułu sortującego" -#: cps/templates/config_edit.html:42 +#: cps/templates/config_edit.html:45 msgid "Enable uploading" msgstr "Włącz wysyłanie" -#: cps/templates/config_edit.html:46 +#: cps/templates/config_edit.html:49 msgid "Enable anonymous browsing" msgstr "Włącz anonimowe przeglądanie" -#: cps/templates/config_edit.html:50 +#: cps/templates/config_edit.html:53 msgid "Enable public registration" msgstr "Włącz publiczną rejestrację" -#: cps/templates/config_edit.html:52 +#: cps/templates/config_edit.html:55 msgid "Default Settings for new users" msgstr "Domyślne ustawienia dla nowych użytkowników" -#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:83 +#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83 msgid "Admin user" msgstr "Użytkownik z uprawnieniami administratora" -#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:88 +#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88 msgid "Allow Downloads" msgstr "Zezwalaj na pobieranie" -#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:92 +#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92 msgid "Allow Uploads" msgstr "Zezwalaj na wysyłanie" -#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:96 +#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96 msgid "Allow Edit" msgstr "Zezwalaj na edycję" -#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:101 +#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101 msgid "Allow Changing Password" msgstr "Zezwalaj na zmianę hasła" -#: cps/templates/config_edit.html:78 cps/templates/layout.html:93 +#: cps/templates/config_edit.html:81 cps/templates/layout.html:93 #: cps/templates/login.html:4 msgid "Login" msgstr "Zaloguj się" @@ -657,10 +718,6 @@ msgstr "z" msgid "language" msgstr "język" -#: cps/templates/detail.html:76 cps/templates/search_form.html:14 -msgid "Publisher" -msgstr "Wydawca" - #: cps/templates/detail.html:81 msgid "Publishing date" msgstr "Data publikacji" @@ -780,10 +837,6 @@ msgstr "Książki sortowane według serii" msgid "Toggle navigation" msgstr "Przełącz nawigację" -#: cps/templates/layout.html:60 -msgid "Go!" -msgstr "Idź!" - #: cps/templates/layout.html:68 msgid "Advanced Search" msgstr "Zaawansowane wyszukiwanie" @@ -929,19 +982,19 @@ msgstr "Statystyki biblioteki Calibre" #: cps/templates/stats.html:8 msgid "Books in this Library" -msgstr "Książek w bibliotece" +msgstr "Książki" #: cps/templates/stats.html:12 msgid "Authors in this Library" -msgstr "Autorów w bibliotece" +msgstr "Autorzy" #: cps/templates/stats.html:16 msgid "Categories in this Library" -msgstr "Kategorii w bibliotece" +msgstr "Kategorie" #: cps/templates/stats.html:20 msgid "Series in this Library" -msgstr "Serii w tej bibliotece" +msgstr "Serie" #: cps/templates/stats.html:24 msgid "Linked libraries" @@ -11765,9 +11818,6 @@ msgstr "Ostatnio pobierane" #~ msgid "Lele (Guinea)" #~ msgstr "Lele (Guinea)" -#~ msgid "Ladin" -#~ msgstr "ladyński" - #~ msgid "Lele (Papua New Guinea)" #~ msgstr "Lele (Papua New Guinea)" @@ -24105,7 +24155,7 @@ msgstr "Ostatnio pobierane" #~ msgstr "Zay" #~ msgid "No linguistic content" -#~ msgstr "brak kontekstu językowego" +#~ msgstr "brak kontekstu językowego" #~ msgid "Zhuang; Yongbei" #~ msgstr "Zhuang; Yongbei" From b081bc8672c2068701b0a0f184db40a9c583251e Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Sun, 12 Mar 2017 20:01:20 +0100 Subject: [PATCH 16/16] Fix #157 --- cps/web.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cps/web.py b/cps/web.py index 0e19dec0..5d932ec9 100755 --- a/cps/web.py +++ b/cps/web.py @@ -51,19 +51,18 @@ try: from urllib.parse import quote from imp import reload from past.builtins import xrange -except ImportError as e: +except ImportError: from urllib import quote try: from flask_login import __version__ as flask_loginVersion -except ImportError, e: +except ImportError: from flask_login.__about__ import __version__ as flask_loginVersion try: from wand.image import Image - use_generic_pdf_cover = False -except ImportError as e: +except ImportError: use_generic_pdf_cover = True from cgi import escape