|
|
@ -37,7 +37,7 @@ from flask import session as flask_session
|
|
|
|
from flask_babel import gettext as _
|
|
|
|
from flask_babel import gettext as _
|
|
|
|
from flask_login import login_user, logout_user, login_required, current_user
|
|
|
|
from flask_login import login_user, logout_user, login_required, current_user
|
|
|
|
from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
|
|
|
|
from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
|
|
|
|
from sqlalchemy.sql.expression import text, func, false, not_, and_
|
|
|
|
from sqlalchemy.sql.expression import text, func, false, not_, and_, or_
|
|
|
|
from sqlalchemy.orm.attributes import flag_modified
|
|
|
|
from sqlalchemy.orm.attributes import flag_modified
|
|
|
|
from sqlalchemy.sql.functions import coalesce
|
|
|
|
from sqlalchemy.sql.functions import coalesce
|
|
|
|
|
|
|
|
|
|
|
@ -711,6 +711,9 @@ def render_prepare_search_form(cc):
|
|
|
|
.group_by(text('books_series_link.series'))\
|
|
|
|
.group_by(text('books_series_link.series'))\
|
|
|
|
.order_by(db.Series.name)\
|
|
|
|
.order_by(db.Series.name)\
|
|
|
|
.filter(calibre_db.common_filters()).all()
|
|
|
|
.filter(calibre_db.common_filters()).all()
|
|
|
|
|
|
|
|
shelves = ub.session.query(ub.Shelf)\
|
|
|
|
|
|
|
|
.filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id)))\
|
|
|
|
|
|
|
|
.order_by(ub.Shelf.name).all()
|
|
|
|
extensions = calibre_db.session.query(db.Data)\
|
|
|
|
extensions = calibre_db.session.query(db.Data)\
|
|
|
|
.join(db.Books)\
|
|
|
|
.join(db.Books)\
|
|
|
|
.filter(calibre_db.common_filters()) \
|
|
|
|
.filter(calibre_db.common_filters()) \
|
|
|
@ -721,7 +724,7 @@ def render_prepare_search_form(cc):
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
languages = None
|
|
|
|
languages = None
|
|
|
|
return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
|
|
|
|
return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
|
|
|
|
series=series, title=_(u"Advanced Search"), cc=cc, page="advsearch")
|
|
|
|
series=series,shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def render_search_results(term, offset=None, order=None, limit=None):
|
|
|
|
def render_search_results(term, offset=None, order=None, limit=None):
|
|
|
@ -1020,7 +1023,7 @@ def search():
|
|
|
|
@login_required_if_no_ano
|
|
|
|
@login_required_if_no_ano
|
|
|
|
def advanced_search():
|
|
|
|
def advanced_search():
|
|
|
|
values = dict(request.form)
|
|
|
|
values = dict(request.form)
|
|
|
|
params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_language',
|
|
|
|
params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_shelf','exclude_shelf','include_language',
|
|
|
|
'exclude_language', 'include_extension', 'exclude_extension']
|
|
|
|
'exclude_language', 'include_extension', 'exclude_extension']
|
|
|
|
for param in params:
|
|
|
|
for param in params:
|
|
|
|
values[param] = list(request.form.getlist(param))
|
|
|
|
values[param] = list(request.form.getlist(param))
|
|
|
@ -1112,6 +1115,12 @@ def adv_search_serie(q, include_series_inputs, exclude_series_inputs):
|
|
|
|
q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
|
|
|
|
q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
|
|
|
|
return q
|
|
|
|
return q
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
|
|
|
|
|
|
|
|
q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)\
|
|
|
|
|
|
|
|
.filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
|
|
|
|
|
|
|
|
if len(include_shelf_inputs) > 0:
|
|
|
|
|
|
|
|
q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
|
|
|
|
|
|
|
|
return q
|
|
|
|
|
|
|
|
|
|
|
|
def extend_search_term(searchterm,
|
|
|
|
def extend_search_term(searchterm,
|
|
|
|
author_name,
|
|
|
|
author_name,
|
|
|
@ -1119,16 +1128,10 @@ def extend_search_term(searchterm,
|
|
|
|
publisher,
|
|
|
|
publisher,
|
|
|
|
pub_start,
|
|
|
|
pub_start,
|
|
|
|
pub_end,
|
|
|
|
pub_end,
|
|
|
|
include_tag_inputs,
|
|
|
|
tags,
|
|
|
|
exclude_tag_inputs,
|
|
|
|
|
|
|
|
include_series_inputs,
|
|
|
|
|
|
|
|
exclude_series_inputs,
|
|
|
|
|
|
|
|
include_languages_inputs,
|
|
|
|
|
|
|
|
rating_high,
|
|
|
|
rating_high,
|
|
|
|
rating_low,
|
|
|
|
rating_low,
|
|
|
|
read_status,
|
|
|
|
read_status,
|
|
|
|
include_extension_inputs,
|
|
|
|
|
|
|
|
exclude_extension_inputs
|
|
|
|
|
|
|
|
):
|
|
|
|
):
|
|
|
|
searchterm.extend((author_name.replace('|', ','), book_title, publisher))
|
|
|
|
searchterm.extend((author_name.replace('|', ','), book_title, publisher))
|
|
|
|
if pub_start:
|
|
|
|
if pub_start:
|
|
|
@ -1145,16 +1148,27 @@ def extend_search_term(searchterm,
|
|
|
|
format='medium', locale=get_locale())])
|
|
|
|
format='medium', locale=get_locale())])
|
|
|
|
except ValueError:
|
|
|
|
except ValueError:
|
|
|
|
pub_start = u""
|
|
|
|
pub_start = u""
|
|
|
|
tag_names = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(include_tag_inputs)).all()
|
|
|
|
elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
|
|
|
|
|
|
|
|
for key, db_element in elements.items():
|
|
|
|
|
|
|
|
tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
|
|
|
|
searchterm.extend(tag.name for tag in tag_names)
|
|
|
|
searchterm.extend(tag.name for tag in tag_names)
|
|
|
|
tag_names = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(exclude_tag_inputs)).all()
|
|
|
|
tag_names = calibre_db.session.query(db_element).filter(db.Tags.id.in_(tags['exclude_' + key])).all()
|
|
|
|
searchterm.extend(tag.name for tag in tag_names)
|
|
|
|
searchterm.extend(tag.name for tag in tag_names)
|
|
|
|
serie_names = calibre_db.session.query(db.Series).filter(db.Series.id.in_(include_series_inputs)).all()
|
|
|
|
#serie_names = calibre_db.session.query(db.Series).filter(db.Series.id.in_(tags['include_serie'])).all()
|
|
|
|
searchterm.extend(serie.name for serie in serie_names)
|
|
|
|
#searchterm.extend(serie.name for serie in serie_names)
|
|
|
|
serie_names = calibre_db.session.query(db.Series).filter(db.Series.id.in_(exclude_series_inputs)).all()
|
|
|
|
#serie_names = calibre_db.session.query(db.Series).filter(db.Series.id.in_(tags['include_serie'])).all()
|
|
|
|
searchterm.extend(serie.name for serie in serie_names)
|
|
|
|
#searchterm.extend(serie.name for serie in serie_names)
|
|
|
|
|
|
|
|
#shelf_names = ub.session.query(ub.Shelf).filter(ub.Shelf.id.in_(tags['include_shelf'])).all()
|
|
|
|
|
|
|
|
#searchterm.extend(shelf.name for shelf in shelf_names)
|
|
|
|
|
|
|
|
#shelf_names = ub.session.query(ub.Shelf).filter(ub.Shelf.id.in_(tags['include_shelf'])).all()
|
|
|
|
|
|
|
|
#searchterm.extend(shelf.name for shelf in shelf_names)
|
|
|
|
|
|
|
|
language_names = calibre_db.session.query(db.Languages). \
|
|
|
|
|
|
|
|
filter(db.Languages.id.in_(tags['include_language'])).all()
|
|
|
|
|
|
|
|
if language_names:
|
|
|
|
|
|
|
|
language_names = calibre_db.speaking_language(language_names)
|
|
|
|
|
|
|
|
searchterm.extend(language.name for language in language_names)
|
|
|
|
language_names = calibre_db.session.query(db.Languages). \
|
|
|
|
language_names = calibre_db.session.query(db.Languages). \
|
|
|
|
filter(db.Languages.id.in_(include_languages_inputs)).all()
|
|
|
|
filter(db.Languages.id.in_(tags['exclude_language'])).all()
|
|
|
|
if language_names:
|
|
|
|
if language_names:
|
|
|
|
language_names = calibre_db.speaking_language(language_names)
|
|
|
|
language_names = calibre_db.speaking_language(language_names)
|
|
|
|
searchterm.extend(language.name for language in language_names)
|
|
|
|
searchterm.extend(language.name for language in language_names)
|
|
|
@ -1164,8 +1178,8 @@ def extend_search_term(searchterm,
|
|
|
|
searchterm.extend([_(u"Rating >= %(rating)s", rating=rating_low)])
|
|
|
|
searchterm.extend([_(u"Rating >= %(rating)s", rating=rating_low)])
|
|
|
|
if read_status:
|
|
|
|
if read_status:
|
|
|
|
searchterm.extend([_(u"Read Status = %(status)s", status=read_status)])
|
|
|
|
searchterm.extend([_(u"Read Status = %(status)s", status=read_status)])
|
|
|
|
searchterm.extend(ext for ext in include_extension_inputs)
|
|
|
|
searchterm.extend(ext for ext in tags['include_extension'])
|
|
|
|
searchterm.extend(ext for ext in exclude_extension_inputs)
|
|
|
|
searchterm.extend(ext for ext in tags['exclude_extension'])
|
|
|
|
# handle custom columns
|
|
|
|
# handle custom columns
|
|
|
|
searchterm = " + ".join(filter(None, searchterm))
|
|
|
|
searchterm = " + ".join(filter(None, searchterm))
|
|
|
|
return searchterm, pub_start, pub_end
|
|
|
|
return searchterm, pub_start, pub_end
|
|
|
@ -1179,14 +1193,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
|
|
|
|
calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
|
|
|
|
calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
|
|
|
|
q = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(True))
|
|
|
|
q = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(True))
|
|
|
|
|
|
|
|
|
|
|
|
include_tag_inputs = term.get('include_tag')
|
|
|
|
# parse multiselects to a complete dict
|
|
|
|
exclude_tag_inputs = term.get('exclude_tag')
|
|
|
|
tags = dict()
|
|
|
|
include_series_inputs = term.get('include_serie')
|
|
|
|
elements = ['tag', 'serie', 'shelf', 'language', 'extension']
|
|
|
|
exclude_series_inputs = term.get('exclude_serie')
|
|
|
|
for element in elements:
|
|
|
|
include_languages_inputs = term.get('include_language')
|
|
|
|
tags['include_' + element] = term.get('include_' + element)
|
|
|
|
exclude_languages_inputs = term.get('exclude_language')
|
|
|
|
tags['exclude_' + element] = term.get('exclude_' + element)
|
|
|
|
include_extension_inputs = term.get('include_extension')
|
|
|
|
|
|
|
|
exclude_extension_inputs = term.get('exclude_extension')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
author_name = term.get("author_name")
|
|
|
|
author_name = term.get("author_name")
|
|
|
|
book_title = term.get("book_title")
|
|
|
|
book_title = term.get("book_title")
|
|
|
@ -1211,26 +1223,18 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
|
|
|
|
searchterm.extend([(u"%s: %s" % (c.name, term.get('custom_column_' + str(c.id))))])
|
|
|
|
searchterm.extend([(u"%s: %s" % (c.name, term.get('custom_column_' + str(c.id))))])
|
|
|
|
cc_present = True
|
|
|
|
cc_present = True
|
|
|
|
|
|
|
|
|
|
|
|
if include_tag_inputs or exclude_tag_inputs or include_series_inputs or exclude_series_inputs or \
|
|
|
|
if any(tags.values()) or author_name or book_title or publisher or pub_start or pub_end or rating_low \
|
|
|
|
include_languages_inputs or exclude_languages_inputs or author_name or book_title or \
|
|
|
|
or rating_high or description or cc_present or read_status:
|
|
|
|
publisher or pub_start or pub_end or rating_low or rating_high or description or cc_present or \
|
|
|
|
|
|
|
|
include_extension_inputs or exclude_extension_inputs or read_status:
|
|
|
|
|
|
|
|
searchterm, pub_start, pub_end = extend_search_term(searchterm,
|
|
|
|
searchterm, pub_start, pub_end = extend_search_term(searchterm,
|
|
|
|
author_name,
|
|
|
|
author_name,
|
|
|
|
book_title,
|
|
|
|
book_title,
|
|
|
|
publisher,
|
|
|
|
publisher,
|
|
|
|
pub_start,
|
|
|
|
pub_start,
|
|
|
|
pub_end,
|
|
|
|
pub_end,
|
|
|
|
include_tag_inputs,
|
|
|
|
tags,
|
|
|
|
exclude_tag_inputs,
|
|
|
|
|
|
|
|
include_series_inputs,
|
|
|
|
|
|
|
|
exclude_series_inputs,
|
|
|
|
|
|
|
|
include_languages_inputs,
|
|
|
|
|
|
|
|
rating_high,
|
|
|
|
rating_high,
|
|
|
|
rating_low,
|
|
|
|
rating_low,
|
|
|
|
read_status,
|
|
|
|
read_status)
|
|
|
|
include_extension_inputs,
|
|
|
|
|
|
|
|
exclude_extension_inputs)
|
|
|
|
|
|
|
|
q = q.filter()
|
|
|
|
q = q.filter()
|
|
|
|
if author_name:
|
|
|
|
if author_name:
|
|
|
|
q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
|
|
|
|
q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
|
|
|
@ -1243,10 +1247,11 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
|
|
|
|
q = adv_search_read_status(q, read_status)
|
|
|
|
q = adv_search_read_status(q, read_status)
|
|
|
|
if publisher:
|
|
|
|
if publisher:
|
|
|
|
q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
|
|
|
|
q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
|
|
|
|
q = adv_search_tag(q, include_tag_inputs, exclude_tag_inputs)
|
|
|
|
q = adv_search_tag(q, tags['include_tag'], tags['exclude_tag'])
|
|
|
|
q = adv_search_serie(q, include_series_inputs, exclude_series_inputs)
|
|
|
|
q = adv_search_serie(q, tags['include_serie'], tags['exclude_serie'])
|
|
|
|
q = adv_search_extension(q, include_extension_inputs, exclude_extension_inputs)
|
|
|
|
q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
|
|
|
|
q = adv_search_language(q, include_languages_inputs, exclude_languages_inputs)
|
|
|
|
q = adv_search_extension(q, tags['include_extension'], tags['exclude_extension'])
|
|
|
|
|
|
|
|
q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
|
|
|
|
q = adv_search_ratings(q, rating_high, rating_low)
|
|
|
|
q = adv_search_ratings(q, rating_high, rating_low)
|
|
|
|
|
|
|
|
|
|
|
|
if description:
|
|
|
|
if description:
|
|
|
|