X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=82889a8d518e720108d3dc297316a4409c080a69;hb=18f8a04ae9135d026a4db5548f80b00e40b763e0;hp=300e2a639b4bcfdcb62672a723e8875c3ce166bd;hpb=6087ec01127e72a5bccaff55db0b74a5a01c5a65;p=m_librarian.git

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 300e2a6..82889a8 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,3 +1,6 @@
+from sqlobject.sqlbuilder import AND, OR, func
+from .config import get_config
+from .db import Author, Book, Extension, Genre, Language
 
 __all__ = [
     'mk_search_conditions',
@@ -5,15 +8,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:
@@ -21,16 +29,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__',
@@ -38,40 +49,63 @@ _search_conditions_dict = {
 
 
 def mk_search_conditions(table, search_type, case_sensitive, values,
-                         expressions):
+                         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, orderBy=None):
+            expressions=None, join_expressions=None, orderBy=None):
     conditions = mk_search_conditions(
-        table, search_type, case_sensitive, values, 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, orderBy=None):
+                   expressions=None, orderBy=None):
     return _search(Author, search_type, case_sensitive, values,
-                   expressions, orderBy)
-
-
-def search_books(search_type, case_sensitive, values, orderBy=None):
-    return _search(Book, search_type, case_sensitive, values,
-                   [], 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):
     return _search(Extension, search_type, case_sensitive, values,
-                   [], orderBy)
+                   orderBy=orderBy)
 
 
 def search_genres(search_type, case_sensitive, values, orderBy=None):
     return _search(Genre, search_type, case_sensitive, values,
-                   [], orderBy)
+                   orderBy=orderBy)
 
 
 def search_languages(search_type, case_sensitive, values, orderBy=None):
     return _search(Language, search_type, case_sensitive, values,
-                   [], orderBy)
+                   orderBy=orderBy)