X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=e4e2884c2c7d5a61642fb7324e7f55cd4db30fdd;hb=8fdf6aab492482fcacad9ce2ec764bdc5bf76590;hp=d431c30d1bc354c4f2b708dc28017631500ace4e;hpb=cf773e9ae70a7a1cbdd27e234db3834c3c07d649;p=m_librarian.git

diff --git a/m_librarian/search.py b/m_librarian/search.py
index d431c30..e4e2884 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,5 +1,5 @@
-
-from sqlobject.sqlbuilder import AND, func
+from sqlobject.sqlbuilder import AND, OR, func
+from .config import get_config
 from .db import Author, Book, Extension, Genre, Language
 
 __all__ = [
@@ -17,28 +17,31 @@ def _mk_search_conditions_with_operator(table, case_sensitive, comparison_op,
     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':
-                _expressions.append(
-                    getattr(getattr(table.q, column), comparison_op)(value))
+            if column == 'id':
+                continue
+            _expressions.append(
+                getattr(getattr(table.q, column), comparison_op)(value))
         for expr, value in expressions:
             _expressions.append(
                 getattr(expr, comparison_op)(value))
     else:
         for column, value in values.items():
-            if column != 'id':
-                _expressions.append(
-                    getattr(func.lower(
-                        getattr(table.q, column)),
-                        comparison_op)(value.lower()))
+            if column == 'id':
+                continue
+            _expressions.append(
+                getattr(func.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__',
@@ -50,7 +53,7 @@ def mk_search_conditions(table, search_type, case_sensitive, values,
     if join_expressions is None:
         join_expressions = []
     return _mk_search_conditions_with_operator(
-        table, case_sensitive, _search_conditions_dict[search_type],
+        table, case_sensitive, _comparison_operators[search_type],
         values, expressions) + join_expressions
 
 
@@ -69,9 +72,28 @@ def search_authors(search_type, case_sensitive, values,
 
 
 def search_books(search_type, case_sensitive, values, join_expressions=None,
-                 orderBy=None):
-    return _search(Book, search_type, case_sensitive, values,
-                   join_expressions=join_expressions, orderBy=orderBy)
+                 orderBy=None, use_filters=False):
+    if use_filters:
+        config = get_config()
+        lang_filter = config.get('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.split():
+                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):