X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=82889a8d518e720108d3dc297316a4409c080a69;hb=HEAD;hp=5b289f089b3f303f7465d3c28c70dd7722a937a2;hpb=900d4e36f7ea51280e43ecf52c2412b94083ca76;p=m_librarian.git diff --git a/m_librarian/search.py b/m_librarian/search.py index 5b289f0..c190dc8 100644 --- a/m_librarian/search.py +++ b/m_librarian/search.py @@ -1,3 +1,7 @@ +from sqlobject.sqlbuilder import AND, OR, func, CONCAT + +from .config import get_config +from .db import Author, Book, Extension, Genre, Language __all__ = [ 'mk_search_conditions', @@ -5,17 +9,20 @@ __all__ = [ 'search_genres', 'search_languages', ] -from sqlobject.sqlbuilder import AND, func -from .db import Author, Book, Extension, Genre, Language - def _mk_search_conditions_with_operator(table, case_sensitive, comparison_op, values, expressions): if expressions is None: expressions = [] _expressions = [] + for column, value in values.items(): + if column == 'id': + _expressions.append(table.q.id == value) + break if case_sensitive: for column, value in values.items(): + if column == 'id': + continue _expressions.append( getattr(getattr(table.q, column), comparison_op)(value)) for expr, value in expressions: @@ -23,16 +30,19 @@ def _mk_search_conditions_with_operator(table, case_sensitive, comparison_op, getattr(expr, comparison_op)(value)) else: for column, value in values.items(): + if column == 'id': + continue _expressions.append( getattr(func.lower( - getattr(table.q, column)), comparison_op)(value.lower())) + getattr(table.q, column)), + comparison_op)(value.lower())) for expr, value in expressions: _expressions.append( getattr(func.lower(expr), comparison_op)(value.lower())) return _expressions -_search_conditions_dict = { +_comparison_operators = { 'start': 'startswith', 'substring': 'contains', 'full': '__eq__', @@ -40,28 +50,51 @@ _search_conditions_dict = { def mk_search_conditions(table, search_type, case_sensitive, values, - expressions=None): + expressions=None, join_expressions=None): + if join_expressions is None: + join_expressions = [] return _mk_search_conditions_with_operator( - table, case_sensitive, _search_conditions_dict[search_type], - values, expressions) + table, case_sensitive, _comparison_operators[search_type], + values, expressions) + join_expressions def _search(table, search_type, case_sensitive, values, - expressions=None, orderBy=None): + expressions=None, join_expressions=None, orderBy=None): conditions = mk_search_conditions( - table, search_type, case_sensitive, values, expressions=expressions) + table, search_type, case_sensitive, values, expressions=expressions, + join_expressions=join_expressions) return table.select(AND(*conditions), orderBy=orderBy) def search_authors(search_type, case_sensitive, values, expressions=None, orderBy=None): return _search(Author, search_type, case_sensitive, values, - expressions=None, orderBy=orderBy) - - -def search_books(search_type, case_sensitive, values, orderBy=None): - return _search(Book, search_type, case_sensitive, values, - orderBy=orderBy) + expressions=expressions, orderBy=orderBy) + + +def search_books(search_type, case_sensitive, values, join_expressions=None, + orderBy=None, use_filters=False): + if use_filters: + config = get_config() + lang_filter = config.getlist('filters', 'lang') + deleted_filter = config.getint('filters', 'deleted') + if lang_filter: + if join_expressions is None: + join_expressions = [] + lang_conditions = [] + for lang in lang_filter: + lvalues = {'name': lang} + conditions = mk_search_conditions( + Language, search_type, case_sensitive, lvalues) + lang_conditions.append(conditions) + join_expressions.append(Book.j.language) + join_expressions.append(OR(*lang_conditions)) + conditions = mk_search_conditions( + Book, search_type, case_sensitive, values, + join_expressions=join_expressions) + if use_filters and not deleted_filter: + conditions.append(Book.q.deleted == False) # noqa: E712 + return Book.select(AND(*conditions), orderBy=orderBy) def search_extensions(search_type, case_sensitive, values, orderBy=None): @@ -77,3 +110,83 @@ def search_genres(search_type, case_sensitive, values, orderBy=None): def search_languages(search_type, case_sensitive, values, orderBy=None): return _search(Language, search_type, case_sensitive, values, orderBy=orderBy) + + +def decode(value): + if isinstance(value, bytes): + return value.decode('utf-8') + return value + + +def _guess_case_sensitivity(value): + return not value.islower() + + +def search_authors_raw(value, search_type, case_sensitive): + value = decode(value) + if not search_type: + search_type = 'start' + if case_sensitive is None: + case_sensitive = _guess_case_sensitivity(value) + expressions = [( + CONCAT(Author.q.surname, ' ', Author.q.name, ' ', Author.q.misc_name), + decode(value) + )] + authors = search_authors(search_type, case_sensitive, {}, expressions, + orderBy=('surname', 'name', 'misc_name')) + columns = get_config().getlist('columns', 'author', ['fullname']) + return { + 'authors': list(authors), + 'search_authors': value, + 'search_type': search_type, + 'case_sensitive': case_sensitive, + 'columns': columns, + } + + +def books_by_author(aid): + use_filters = get_config().getint('filters', 'use_in_books_list', 1) + columns = get_config().getlist('columns', 'book', ['title']) + author = Author.get(aid) + if use_filters: + join_expressions = [] + join_expressions.append(Book.j.authors) + join_expressions.append(Author.q.id == aid) + books = search_books('full', None, {}, join_expressions, + orderBy=('series', 'ser_no', 'title', '-date'), + use_filters=use_filters) + else: + books = Book.select( + Book.j.authors & (Author.q.id == aid), + orderBy=['series', 'ser_no', 'title'], + ) + return { + 'books_by_author': {author.fullname: list(books)}, + 'columns': columns, + } + + +def search_books_raw(value, search_type, case_sensitive, use_filters): + value = decode(value) + if not search_type: + search_type = 'start' + if case_sensitive is None: + case_sensitive = _guess_case_sensitivity(value) + books = search_books(search_type, case_sensitive, {'title': value}, None, + orderBy=('title',), use_filters=use_filters) + books_by_authors = {} + for book in books: + author = book.author1 + if author in books_by_authors: + books_by_author = books_by_authors[author] + else: + books_by_author = books_by_authors[author] = [] + books_by_author.append(book) + columns = get_config().getlist('columns', 'book', ['title']) + return { + 'books_by_author': books_by_authors, + 'search_books': value, + 'search_type': search_type, + 'case_sensitive': case_sensitive, + 'columns': columns, + }