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

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 5c1f47d..1405e09 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,5 +1,10 @@
+try:
+    from configparser import NoSectionError, NoOptionError
+except ImportError:  # Python 2
+    from ConfigParser import NoSectionError, NoOptionError
 
-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__ = [
@@ -72,9 +77,34 @@ 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()
+        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):