From 6c493df2f56c6f4ea77b771d74b3553f468af3cb Mon Sep 17 00:00:00 2001 From: Yijun Zhao Date: Tue, 26 Mar 2019 14:31:00 +0800 Subject: [PATCH 1/9] support issue: #843 --- cps/helper.py | 15 +++++++++++++-- requirements.txt | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index ea9e035c..6826c9c6 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -24,6 +24,7 @@ import ub from flask import current_app as app from tempfile import gettempdir import sys +import io import os import re import unicodedata @@ -34,6 +35,7 @@ from flask_babel import gettext as _ from flask_login import current_user from babel.dates import format_datetime from datetime import datetime +from PIL import Image import shutil import requests try: @@ -445,10 +447,19 @@ def get_book_cover(cover_path): # saves book cover to gdrive or locally def save_cover(url, book_path): img = requests.get(url) - if img.headers.get('content-type') != 'image/jpeg': - web.app.logger.error("Cover is no jpg file, can't save") + content_type = img.headers.get('content-type') + if content_type not in ('image/jpeg', 'image/png', 'image/webp'): + web.app.logger.error("Cover is only support jpg/png/webp file, can't save") return False + # convert to jpg because calibre just support jpg + if content_type in ('image/png', 'image/webp'): + imgc = Image.open(io.BytesIO(img.content)) + im = imgc.convert('RGB') + tmp_bytesio = io.BytesIO() + im.save(tmp_bytesio, format='JPEG') + img.content = tmp_bytesio.getvalue() + if ub.config.config_use_google_drive: tmpDir = gettempdir() f = open(os.path.join(tmpDir, "uploaded_cover.jpg"), "wb") diff --git a/requirements.txt b/requirements.txt index 3fb23ea3..84ffdd7c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,4 @@ SQLAlchemy>=1.1.0 tornado>=4.1 Wand>=0.4.4 unidecode>=0.04.19 +Pillow>=5.4.0 \ No newline at end of file From 0b8624b542f413c4213df8065e53bcefb68390d0 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 17 Apr 2019 19:55:32 +0200 Subject: [PATCH 2/9] Deleted load metadata from douban, as API seems to be shut down (#858) --- cps/static/js/get_meta.js | 22 +++++++++------------- cps/templates/book_edit.html | 4 ++-- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index 4598228a..7c5dbe4f 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -25,15 +25,12 @@ var ggResults = []; $(function () { var msg = i18nMsg; - var douban = "https://api.douban.com"; - var dbSearch = "/v2/book/search"; - // var dbGetInfo = "/v2/book/"; - // var db_get_info_by_isbn = "/v2/book/isbn/ "; - var dbDone = false; + /*var douban = "https://api.douban.com"; + var dbSearch = "/v2/book/search";*/ + var dbDone = true; var google = "https://www.googleapis.com/"; var ggSearch = "/books/v1/volumes"; - // var gg_get_info = "/books/v1/volumes/"; var ggDone = false; var showFlag = 0; @@ -96,7 +93,7 @@ $(function () { }); ggDone = false; } - if (dbDone && dbResults.length > 0) { + /*if (dbDone && dbResults.length > 0) { dbResults.forEach(function(result) { var book = { id: result.id, @@ -130,7 +127,7 @@ $(function () { $("#book-list").append($book); }); dbDone = false; - } + }*/ } function ggSearchBook (title) { @@ -150,7 +147,7 @@ $(function () { }); } - function dbSearchBook (title) { + /*function dbSearchBook (title) { $.ajax({ url: douban + dbSearch + "?q=" + title + "&fields=all&count=10", type: "GET", @@ -160,7 +157,7 @@ $(function () { dbResults = data.books; }, error: function error() { - $("#meta-info").html("

" + msg.search_error + "!

"); + $("#meta-info").html("

" + msg.search_error + "!

"+ $("#meta-info")[0].innerHTML) }, complete: function complete() { dbDone = true; @@ -168,14 +165,13 @@ $(function () { $("#show-douban").trigger("change"); } }); - } + }*/ function doSearch (keyword) { showFlag = 0; $("#meta-info").text(msg.loading); - // var keyword = $("#keyword").val(); if (keyword) { - dbSearchBook(keyword); + // dbSearchBook(keyword); ggSearchBook(keyword); } } diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index 9d2b2c76..90eb20c0 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -223,8 +223,8 @@
- - + From e1e79a73e87dc1e480ced63c2f0c04bd1173a4c9 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 17 Apr 2019 20:14:24 +0200 Subject: [PATCH 3/9] Fix #884 --- cps/db.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cps/db.py b/cps/db.py index 225bcf4e..8a651aea 100755 --- a/cps/db.py +++ b/cps/db.py @@ -112,6 +112,8 @@ class Identifiers(Base): return u"Google Books" elif self.type == "kobo": return u"Kobo" + if self.type == "lubimyczytac": + return u"Lubimyczytac" else: return self.type @@ -130,6 +132,8 @@ class Identifiers(Base): return u"https://books.google.com/books?id={0}".format(self.val) elif self.type == "kobo": return u"https://www.kobo.com/ebook/{0}".format(self.val) + elif self.type == "lubimyczytac": + return u" http://lubimyczytac.pl/ksiazka/{0}".format(self.val) elif self.type == "url": return u"{0}".format(self.val) else: From 89516fc2d6ab47727ae42353d850b089f5b1efc5 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 17 Apr 2019 20:45:08 +0200 Subject: [PATCH 4/9] Make PIL optional #885 --- cps/book_formats.py | 76 ++++++++++++++++++++++++--------------------- cps/helper.py | 28 ++++++++++------- 2 files changed, 57 insertions(+), 47 deletions(-) diff --git a/cps/book_formats.py b/cps/book_formats.py index fb08caa9..a5448e4d 100644 --- a/cps/book_formats.py +++ b/cps/book_formats.py @@ -62,7 +62,11 @@ except ImportError as e: logger.warning('cannot import fb2, extracting fb2 metadata will not work: %s', e) use_fb2_meta = False -from PIL import Image +try: + from PIL import Image + use_PIL = True +except ImportError: + use_PIL = False def process(tmp_file_path, original_file_name, original_file_extension): @@ -133,47 +137,47 @@ def pdf_preview(tmp_file_path, tmp_dir): if use_generic_pdf_cover: return None else: - try: - input1 = PdfFileReader(open(tmp_file_path, 'rb'), strict=False) - page0 = input1.getPage(0) - xObject = page0['/Resources']['/XObject'].getObject() + if use_PIL: + try: + input1 = PdfFileReader(open(tmp_file_path, 'rb'), strict=False) + page0 = input1.getPage(0) + xObject = page0['/Resources']['/XObject'].getObject() - for obj in xObject: - if xObject[obj]['/Subtype'] == '/Image': - size = (xObject[obj]['/Width'], xObject[obj]['/Height']) - data = xObject[obj]._data # xObject[obj].getData() - if xObject[obj]['/ColorSpace'] == '/DeviceRGB': - mode = "RGB" - else: - mode = "P" - if '/Filter' in xObject[obj]: - if xObject[obj]['/Filter'] == '/FlateDecode': + for obj in xObject: + if xObject[obj]['/Subtype'] == '/Image': + size = (xObject[obj]['/Width'], xObject[obj]['/Height']) + data = xObject[obj]._data # xObject[obj].getData() + if xObject[obj]['/ColorSpace'] == '/DeviceRGB': + mode = "RGB" + else: + mode = "P" + if '/Filter' in xObject[obj]: + if xObject[obj]['/Filter'] == '/FlateDecode': + img = Image.frombytes(mode, size, data) + cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.png" + img.save(filename=os.path.join(tmp_dir, cover_file_name)) + return cover_file_name + # img.save(obj[1:] + ".png") + elif xObject[obj]['/Filter'] == '/DCTDecode': + cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jpg" + img = open(cover_file_name, "wb") + img.write(data) + img.close() + return cover_file_name + elif xObject[obj]['/Filter'] == '/JPXDecode': + cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jp2" + img = open(cover_file_name, "wb") + img.write(data) + img.close() + return cover_file_name + else: img = Image.frombytes(mode, size, data) cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.png" img.save(filename=os.path.join(tmp_dir, cover_file_name)) return cover_file_name # img.save(obj[1:] + ".png") - elif xObject[obj]['/Filter'] == '/DCTDecode': - cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jpg" - img = open(cover_file_name, "wb") - img.write(data) - img.close() - return cover_file_name - elif xObject[obj]['/Filter'] == '/JPXDecode': - cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jp2" - img = open(cover_file_name, "wb") - img.write(data) - img.close() - return cover_file_name - else: - img = Image.frombytes(mode, size, data) - cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.png" - img.save(filename=os.path.join(tmp_dir, cover_file_name)) - return cover_file_name - # img.save(obj[1:] + ".png") - except Exception as ex: - print(ex) - + except Exception as ex: + print(ex) try: cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jpg" with Image(filename=tmp_file_path + "[0]", resolution=150) as img: diff --git a/cps/helper.py b/cps/helper.py index aa832e42..79cf92af 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -35,7 +35,6 @@ from flask_babel import gettext as _ from flask_login import current_user from babel.dates import format_datetime from datetime import datetime -from PIL import Image import shutil import requests try: @@ -52,6 +51,12 @@ try: except ImportError: use_unidecode = False +try: + from PIL import Image + use_PIL = True +except ImportError: + use_PIL = False + # Global variables # updater_thread = None global_WorkerThread = worker.WorkerThread() @@ -481,16 +486,17 @@ def save_cover(img, book_path): web.app.logger.error("Only jpg/jpeg/png/webp files are supported as coverfile") return False - # convert to jpg because calibre only supports jpg - if content_type in ('image/png', 'image/webp'): - if hasattr(img,'stream'): - imgc = Image.open(img.stream) - else: - imgc = Image.open(io.BytesIO(img.content)) - im = imgc.convert('RGB') - tmp_bytesio = io.BytesIO() - im.save(tmp_bytesio, format='JPEG') - img._content = tmp_bytesio.getvalue() + if use_PIL: + # convert to jpg because calibre only supports jpg + if content_type in ('image/png', 'image/webp'): + if hasattr(img,'stream'): + imgc = Image.open(img.stream) + else: + imgc = Image.open(io.BytesIO(img.content)) + im = imgc.convert('RGB') + tmp_bytesio = io.BytesIO() + im.save(tmp_bytesio, format='JPEG') + img._content = tmp_bytesio.getvalue() if ub.config.config_use_google_drive: tmpDir = gettempdir() From 67736fe1877bb6c8f2d194a4fa756c5813810eb0 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Thu, 18 Apr 2019 21:17:59 +0200 Subject: [PATCH 5/9] Catch errors on loading pickle file Fix for cover images without Pillow --- cps/book_formats.py | 12 ++++++++++-- cps/helper.py | 10 +++++++--- cps/web.py | 11 ++++++++--- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/cps/book_formats.py b/cps/book_formats.py index a5448e4d..125e0b99 100644 --- a/cps/book_formats.py +++ b/cps/book_formats.py @@ -64,6 +64,7 @@ except ImportError as e: try: from PIL import Image + from PIL import __version__ as PILversion use_PIL = True except ImportError: use_PIL = False @@ -175,7 +176,6 @@ def pdf_preview(tmp_file_path, tmp_dir): cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.png" img.save(filename=os.path.join(tmp_dir, cover_file_name)) return cover_file_name - # img.save(obj[1:] + ".png") except Exception as ex: print(ex) try: @@ -206,4 +206,12 @@ def get_versions(): XVersion = 'v'+'.'.join(map(str, lxmlversion)) else: XVersion = _(u'not installed') - return {'Image Magick': IVersion, 'PyPdf': PVersion, 'lxml':XVersion, 'Wand Version': WVersion} + if use_PIL: + PILVersion = 'v' + PILversion + else: + PILVersion = _(u'not installed') + return {'Image Magick': IVersion, + 'PyPdf': PVersion, + 'lxml':XVersion, + 'Wand': WVersion, + 'Pillow': PILVersion} diff --git a/cps/helper.py b/cps/helper.py index 79cf92af..287479f7 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -482,11 +482,11 @@ def save_cover_from_filestorage(filepath, saved_filename, img): # saves book cover to gdrive or locally def save_cover(img, book_path): content_type = img.headers.get('content-type') - if content_type not in ('image/jpeg', 'image/png', 'image/webp'): - web.app.logger.error("Only jpg/jpeg/png/webp files are supported as coverfile") - return False if use_PIL: + if content_type not in ('image/jpeg', 'image/png', 'image/webp'): + web.app.logger.error("Only jpg/jpeg/png/webp files are supported as coverfile") + return False # convert to jpg because calibre only supports jpg if content_type in ('image/png', 'image/webp'): if hasattr(img,'stream'): @@ -497,6 +497,10 @@ def save_cover(img, book_path): tmp_bytesio = io.BytesIO() im.save(tmp_bytesio, format='JPEG') img._content = tmp_bytesio.getvalue() + else: + if content_type not in ('image/jpeg'): + web.app.logger.error("Only jpg/jpeg files are supported as coverfile") + return False if ub.config.config_use_google_drive: tmpDir = gettempdir() diff --git a/cps/web.py b/cps/web.py index 9b6f47af..3e19d2cc 100644 --- a/cps/web.py +++ b/cps/web.py @@ -201,9 +201,14 @@ lm.anonymous_user = ub.Anonymous app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT') db.setup_db() -with open(os.path.join(config.get_main_dir, 'cps/translations/iso639.pickle'), 'rb') as f: - language_table = cPickle.load(f) - +try: + with open(os.path.join(config.get_main_dir, 'cps/translations/iso639.pickle'), 'rb') as f: + language_table = cPickle.load(f) +except cPickle.UnpicklingError as error: + app.logger.error("Can't read file cps/translations/iso639.pickle: %s", error) + print("Can't read file cps/translations/iso639.pickle: %s" % error) + helper.global_WorkerThread.stop() + sys.exit(1) def is_gdrive_ready(): return os.path.exists(os.path.join(config.get_main_dir, 'settings.yaml')) and \ From 544405f5aa46ea60eb2e0ab22680c398844047a8 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Fri, 19 Apr 2019 06:54:12 +0200 Subject: [PATCH 6/9] Update search for cyrillic letters #877 --- cps/db.py | 7 ++++--- cps/web.py | 57 +++++++++++++++++++++++------------------------------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/cps/db.py b/cps/db.py index 8a651aea..688f7fde 100755 --- a/cps/db.py +++ b/cps/db.py @@ -27,6 +27,7 @@ import ast from ub import config import ub import sys +import unidecode session = None cc_exceptions = ['datetime', 'comments', 'float', 'composite', 'series'] @@ -46,7 +47,7 @@ def title_sort(title): def lcase(s): - return s.lower() + return unidecode.unidecode(s.lower()) def ucase(s): @@ -359,8 +360,8 @@ def setup_db(): ub.session.commit() config.loadSettings() conn.connection.create_function('title_sort', 1, title_sort) - conn.connection.create_function('lower', 1, lcase) - conn.connection.create_function('upper', 1, ucase) + # conn.connection.create_function('lower', 1, lcase) + # conn.connection.create_function('upper', 1, ucase) if not cc_classes: cc = conn.execute("SELECT id, datatype FROM custom_columns") diff --git a/cps/web.py b/cps/web.py index 3e19d2cc..eaf39527 100644 --- a/cps/web.py +++ b/cps/web.py @@ -668,25 +668,20 @@ def modify_database_object(input_elements, db_book_object, db_object, db_session # read search results from calibre-database and return it (function is used for feed and simple search def get_search_results(term): + db.session.connection().connection.connection.create_function("lower", 1, db.lcase) q = list() authorterms = re.split("[, ]+", term) for authorterm in authorterms: - q.append(db.Books.authors.any(db.or_(db.Authors.name.ilike("%" + authorterm + "%"), - db.Authors.name.ilike("%" + unidecode.unidecode(authorterm) + "%")))) - db.session.connection().connection.connection.create_function("lower", 1, db.lcase) - db.Books.authors.any(db.or_(db.Authors.name.ilike("%" + term + "%"), - db.Authors.name.ilike("%" + unidecode.unidecode(term) + "%"))) + q.append(db.Books.authors.any(db.func.lower(db.Authors.name).ilike("%" + authorterm + "%"))) + + db.Books.authors.any(db.func.lower(db.Authors.name).ilike("%" + term + "%")) return db.session.query(db.Books).filter(common_filters()).filter( - db.or_(db.Books.tags.any(db.Tags.name.ilike("%" + term + "%")), - db.Books.series.any(db.Series.name.ilike("%" + term + "%")), + db.or_(db.Books.tags.any(db.func.lower(db.Tags.name).ilike("%" + term + "%")), + db.Books.series.any(db.func.lower(db.Series.name).ilike("%" + term + "%")), db.Books.authors.any(and_(*q)), - db.Books.publishers.any(db.Publishers.name.ilike("%" + term + "%")), - db.Books.title.ilike("%" + term + "%"), - db.Books.tags.any(db.Tags.name.ilike("%" + unidecode.unidecode(term) + "%")), - db.Books.series.any(db.Series.name.ilike("%" + unidecode.unidecode(term) + "%")), - db.Books.publishers.any(db.Publishers.name.ilike("%" + unidecode.unidecode(term) + "%")), - db.Books.title.ilike("%" + unidecode.unidecode(term) + "%") + db.Books.publishers.any(db.func.lower(db.Publishers.name).ilike("%" + term + "%")), + db.func.lower(db.Books.title).ilike("%" + term + "%") )).all() @@ -1097,7 +1092,8 @@ def get_comic_book(book_id, book_format, page): def get_authors_json(): if request.method == "GET": query = request.args.get('q') - entries = db.session.query(db.Authors).filter(db.Authors.name.ilike("%" + query + "%")).all() + db.session.connection().connection.connection.create_function("lower", 1, db.lcase) + entries = db.session.query(db.Authors).filter(db.func.lower(db.Authors.name).ilike("%" + query + "%")).all() json_dumps = json.dumps([dict(name=r.name.replace('|',',')) for r in entries]) return json_dumps @@ -1107,7 +1103,8 @@ def get_authors_json(): def get_publishers_json(): if request.method == "GET": query = request.args.get('q') - entries = db.session.query(db.Publishers).filter(db.Publishers.name.ilike("%" + query + "%")).all() + db.session.connection().connection.connection.create_function("lower", 1, db.lcase) + entries = db.session.query(db.Publishers).filter(db.func.lower(db.Publishers.name).ilike("%" + query + "%")).all() json_dumps = json.dumps([dict(name=r.name.replace('|',',')) for r in entries]) return json_dumps @@ -1117,7 +1114,8 @@ def get_publishers_json(): def get_tags_json(): if request.method == "GET": query = request.args.get('q') - entries = db.session.query(db.Tags).filter(db.Tags.name.ilike("%" + query + "%")).all() + db.session.connection().connection.connection.create_function("lower", 1, db.lcase) + entries = db.session.query(db.Tags).filter(db.func.lower(db.Tags.name).ilike("%" + query + "%")).all() json_dumps = json.dumps([dict(name=r.name) for r in entries]) return json_dumps @@ -1143,7 +1141,8 @@ def get_languages_json(): def get_series_json(): if request.method == "GET": query = request.args.get('q') - entries = db.session.query(db.Series).filter(db.Series.name.ilike("%" + query + "%")).all() + db.session.connection().connection.connection.create_function("lower", 1, db.lcase) + entries = db.session.query(db.Series).filter(db.func.lower(db.Series.name).ilike("%" + query + "%")).all() # entries = db.session.execute("select name from series where name like '%" + query + "%'") json_dumps = json.dumps([dict(name=r.name) for r in entries]) return json_dumps @@ -1155,12 +1154,13 @@ def get_matching_tags(): tag_dict = {'tags': []} if request.method == "GET": q = db.session.query(db.Books) + db.session.connection().connection.connection.create_function("lower", 1, db.lcase) author_input = request.args.get('author_name') title_input = request.args.get('book_title') include_tag_inputs = request.args.getlist('include_tag') exclude_tag_inputs = request.args.getlist('exclude_tag') - q = q.filter(db.Books.authors.any(db.Authors.name.ilike("%" + author_input + "%")), - db.Books.title.ilike("%" + title_input + "%")) + q = q.filter(db.Books.authors.any(db.func.lower(db.Authors.name).ilike("%" + author_input + "%")), + db.func.lower(db.Books.title).ilike("%" + title_input + "%")) if len(include_tag_inputs) > 0: for tag in include_tag_inputs: q = q.filter(db.Books.tags.any(db.Tags.id == tag)) @@ -1916,7 +1916,6 @@ def advanced_search(): db.session.connection().connection.connection.create_function("lower", 1, db.lcase) q = db.session.query(db.Books) - # postargs = request.form.to_dict() include_tag_inputs = request.args.getlist('include_tag') exclude_tag_inputs = request.args.getlist('exclude_tag') @@ -1982,20 +1981,15 @@ def advanced_search(): searchterm = " + ".join(filter(None, searchterm)) q = q.filter() if author_name: - q = q.filter(db.Books.authors.any(db.or_(db.Authors.name.ilike("%" + author_name + "%"), - db.Authors.name.ilike("%" + unidecode.unidecode(author_name) - + "%")))) + q = q.filter(db.Books.authors.any(db.func.lower(db.Authors.name).ilike("%" + author_name + "%"))) if book_title: - q = q.filter(db.or_(db.Books.title.ilike("%" + book_title + "%"), - db.Books.title.ilike("%" + unidecode.unidecode(book_title) + "%"))) + q = q.filter(db.func.lower(db.Books.title).ilike("%" + book_title + "%")) if pub_start: q = q.filter(db.Books.pubdate >= pub_start) if pub_end: q = q.filter(db.Books.pubdate <= pub_end) if publisher: - q = q.filter(db.Books.publishers.any(db.or_(db.Publishers.name.ilike("%" + publisher + "%"), - db.Publishers.name.ilike("%" + unidecode.unidecode(publisher) - + "%"),))) + q = q.filter(db.Books.publishers.any(db.func.lower(db.Publishers.name).ilike("%" + publisher + "%"))) for tag in include_tag_inputs: q = q.filter(db.Books.tags.any(db.Tags.id == tag)) for tag in exclude_tag_inputs: @@ -2018,9 +2012,7 @@ def advanced_search(): rating_low = int(rating_low) *2 q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low)) if description: - q = q.filter(db.Books.comments.any(db.or_(db.Comments.text.ilike("%" + description + "%"), - db.Comments.text.ilike("%" + unidecode.unidecode(description) - + "%")))) + q = q.filter(db.Books.comments.any(db.func.lower(db.Comments.text).ilike("%" + description + "%"))) # search custom culumns for c in cc: @@ -2035,8 +2027,7 @@ def advanced_search(): db.cc_classes[c.id].value == custom_query )) else: q = q.filter(getattr(db.Books, 'custom_column_'+str(c.id)).any( - db.or_(db.cc_classes[c.id].value.ilike("%" + custom_query + "%"), - db.cc_classes[c.id].value.ilike("%" + unidecode.unidecode(custom_query) + "%")))) + db.func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%"))) q = q.all() ids = list() for element in q: From c748716ad2354dfcfa30ad8da30eb136756b037e Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Fri, 19 Apr 2019 12:07:46 +0200 Subject: [PATCH 7/9] Fix for opds feed of unread/read books --- cps/web.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cps/web.py b/cps/web.py index eaf39527..095020af 100644 --- a/cps/web.py +++ b/cps/web.py @@ -724,6 +724,7 @@ def before_request(): # Routing functions +@app.route("/opds/") @app.route("/opds") @requires_basic_auth_if_no_ano def feed_index(): @@ -2123,12 +2124,16 @@ def render_read_books(page, are_read, as_xml=False): @app.route("/opds/readbooks/") -@login_required_if_no_ano +@requires_basic_auth_if_no_ano def feed_read_books(): off = request.args.get("offset") or 0 return render_read_books(int(off) / (int(config.config_books_per_page)) + 1, True, True) +@app.route("/favicon.ico") +def favicon(): + return send_from_directory(os.path.join(os.path.dirname(__file__), "static"), "favicon.ico") + @app.route("/readbooks/", defaults={'page': 1}) @app.route("/readbooks/") @login_required_if_no_ano @@ -2137,7 +2142,7 @@ def read_books(page): @app.route("/opds/unreadbooks/") -@login_required_if_no_ano +@requires_basic_auth_if_no_ano def feed_unread_books(): off = request.args.get("offset") or 0 return render_read_books(int(off) / (int(config.config_books_per_page)) + 1, False, True) From cc5c2c0f65be2a9fed76a5076e378710f7fe4db4 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sat, 20 Apr 2019 12:30:33 +0200 Subject: [PATCH 8/9] Update Version info --- cps/updater.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/updater.py b/cps/updater.py index f1c0b95f..416d7237 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -237,7 +237,7 @@ class Updater(threading.Thread): return False def _stable_version_info(self): - return {'version': '0.6.1'} # Current version + return {'version': '0.6.2'} # Current version def _nightly_available_updates(self, request_method): tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone) From f1a65a2aeb701c463b53e4d1320ab833b8de6e6a Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sat, 20 Apr 2019 17:57:06 +0200 Subject: [PATCH 9/9] Clarified licences for isolanguages.py and reverseproxy.py --- cps/isoLanguages.py | 15 +++++++++++++++ cps/reverseproxy.py | 44 ++++++++++++++++++++++++++++++++------------ 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/cps/isoLanguages.py b/cps/isoLanguages.py index 0d300ea0..31ef341e 100644 --- a/cps/isoLanguages.py +++ b/cps/isoLanguages.py @@ -1,6 +1,21 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web) +# Copyright (C) 2019 pwr +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . try: from iso639 import languages, __version__ diff --git a/cps/reverseproxy.py b/cps/reverseproxy.py index 3fc9d600..8a44062a 100644 --- a/cps/reverseproxy.py +++ b/cps/reverseproxy.py @@ -1,21 +1,41 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web) -# Copyright (C) 2018 cervinko, janeczku, OzzieIsaacs +# Flask License # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# Copyright © 2010 by the Pallets team, cervinko, janeczku, OzzieIsaacs # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Some rights reserved. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Redistribution and use in source and binary forms of the software as +# well as documentation, with or without modification, are permitted +# provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND +# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# Inspired by http://flask.pocoo.org/snippets/35/ class ReverseProxied(object): """Wrap the application in this middleware and configure the