X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=1405e09dac6fe582a7c1ce3f0fd9efbe15cb0021;hb=5932dd9301f9820b2b103545593606909f8eceb8;hp=c4b53256d59ce17e12844fc36f31b7f16503e2d7;hpb=cd508a983971cb2d185c7839e7238c44aa0d871e;p=m_librarian.git

diff --git a/m_librarian/search.py b/m_librarian/search.py
index c4b5325..1405e09 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,18 +1,32 @@
+try:
+    from configparser import NoSectionError, NoOptionError
+except ImportError:  # Python 2
+    from ConfigParser import NoSectionError, NoOptionError
+
+from sqlobject.sqlbuilder import AND, OR, func
+from .config import get_config
+from .db import Author, Book, Extension, Genre, Language
 
 __all__ = [
+    'mk_search_conditions',
     'search_authors', 'search_books', 'search_extensions',
     'search_genres', 'search_languages',
 ]
 
-from sqlobject.sqlbuilder import AND, func
-from .db import Author, Book, Extension, Genre, Language
-
 
-def _search_with_operator(table, case_sensitive, comparison_op, values,
-                          expressions):
+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:
@@ -20,58 +34,89 @@ def _search_with_operator(table, case_sensitive, comparison_op, values,
                 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 AND(*_expressions)
+    return _expressions
 
 
-def _search_exact(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, '__eq__', values,
-                                 expressions)
+_comparison_operators = {
+    'start': 'startswith',
+    'substring': 'contains',
+    'full': '__eq__',
+}
 
 
-def _search_start(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, 'startswith', values,
-                                 expressions)
-
-
-def _search_substring(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, 'contains', values,
-                                 expressions)
+def mk_search_conditions(table, search_type, case_sensitive, values,
+                         expressions=None, join_expressions=None):
+    if join_expressions is None:
+        join_expressions = []
+    return _mk_search_conditions_with_operator(
+        table, case_sensitive, _comparison_operators[search_type],
+        values, expressions) + join_expressions
 
 
 def _search(table, search_type, case_sensitive, values,
-            expressions, orderBy=None):
-    _search_f = globals()['_search_%s' % search_type]
-    conditions = _search_f(table, case_sensitive, values, expressions)
-    return table.select(conditions, orderBy=orderBy)
+            expressions=None, join_expressions=None, orderBy=None):
+    conditions = mk_search_conditions(
+        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()
+        try:
+            lang_filter = config.get('filters', 'lang')
+        except (NoSectionError, NoOptionError):
+            lang_filter = None
+        try:
+            deleted_filter = config.getint('filters', 'deleted')
+        except (NoSectionError, NoOptionError):
+            deleted_filter = None
+        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):
     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)