X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=5a5ff96f7a00066e9371f0c347369abaf15ab08d;hb=d6ef04787834ffeded257d96af4c965ca7055a51;hp=b5b34c41eed0dbc30a043bc364bad1748a64d5d9;hpb=5126c1afb98575a2430d188ad20a6cc6d5627acb;p=m_librarian.git

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index b5b34c4..5a5ff96 100755
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -5,7 +5,7 @@ import sys
 from sqlobject.sqlbuilder import CONCAT
 
 from m_lib.defenc import default_encoding
-from m_librarian.db import Author, Book, Extension, open_db
+from m_librarian.db import Author, Book, Extension, Genre, Language, open_db
 from m_librarian.search import mk_search_conditions, \
     search_authors, search_books, \
     search_extensions, search_genres, search_languages
@@ -14,6 +14,15 @@ from m_librarian.translations import translations
 _ = translations.ugettext
 
 
+def _get_values(args, *columns):
+    values = {}
+    for column in columns:
+        value = getattr(args, column)
+        if value:
+            values[column] = unicode(value, default_encoding)
+    return values
+
+
 def _guess_case_sensitivity(values):
     for value in values.values():
         if not value.islower():
@@ -27,12 +36,8 @@ def _search_authors(case_sensitive, search_type, args):
             "Cannot search by names and full name at the same time\n")
         main_parser.print_help()
         sys.exit(1)
-    values = {}
     expressions = []
-    for column in 'surname', 'name', 'misc_name':
-        value = getattr(args, column)
-        if value:
-            values[column] = unicode(value, default_encoding)
+    values = _get_values(args, 'surname', 'name', 'misc_name')
     if not values:
         value = args.fullname
         if value:
@@ -53,25 +58,55 @@ def _search_authors(case_sensitive, search_type, args):
 
 
 def _search_books(case_sensitive, search_type, args):
-    values = {}
     join_expressions = []
-    for column in 'title', 'series', 'archive', 'file':
-        value = getattr(args, column)
-        if value:
-            values[column] = unicode(value, default_encoding)
+    values = _get_values(args, 'title', 'series', 'archive', 'file')
     if case_sensitive is None:
         test_values = values.copy()
-        for column in 'ext', :
-            value = getattr(args, column)
-            if value:
-                test_values[column] = unicode(value, default_encoding)
+        test_values.update(_get_values(args, 'surname', 'name', 'misc_name',
+                                       'fullname', 'ext', 'gname', 'gtitle',
+                                       'lang'))
         case_sensitive = _guess_case_sensitivity(test_values)
+    avalues = _get_values(args, 'surname', 'name', 'misc_name', 'fullname')
+    if avalues:
+        if (args.surname or args.name or args.misc_name) and args.fullname:
+            sys.stderr.write(
+                "Cannot search by names and full name at the same time\n")
+            main_parser.print_help()
+            sys.exit(1)
+        expressions = []
+        join_expressions.append(Book.j.authors)
+        value = args.fullname
+        if value:
+            expressions.append((
+                CONCAT(Author.q.surname, ' ', Author.q.name, ' ',
+                       Author.q.misc_name),
+                unicode(value, default_encoding)
+            ))
+        conditions = mk_search_conditions(
+            Author, search_type, case_sensitive, avalues, expressions)
+        join_expressions.extend(conditions)
     if args.ext:
         join_expressions.append(Book.j.extension)
         conditions = mk_search_conditions(
             Extension, search_type, case_sensitive,
             {'name': args.ext})
         join_expressions.extend(conditions)
+    gvalues = {}
+    for column in 'name', 'title':
+        value = getattr(args, 'g' + column)
+        if value:
+            gvalues[column] = unicode(value, default_encoding)
+    if gvalues:
+        join_expressions.append(Book.j.genres)
+        conditions = mk_search_conditions(
+            Genre, search_type, case_sensitive, gvalues)
+        join_expressions.extend(conditions)
+    if args.lang:
+        join_expressions.append(Book.j.language)
+        conditions = mk_search_conditions(
+            Language, search_type, case_sensitive,
+            {'name': args.lang})
+        join_expressions.extend(conditions)
     for book in search_books(search_type, case_sensitive, values,
                              join_expressions,
                              orderBy=('series', 'ser_no', 'title')):
@@ -119,11 +154,7 @@ def _search_extensions(case_sensitive, search_type, args):
 
 
 def _search_genres(case_sensitive, search_type, args):
-    values = {}
-    for column in 'name', 'title':
-        value = getattr(args, column)
-        if value:
-            values[column] = unicode(value, default_encoding)
+    values = _get_values(args, 'name', 'title')
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
     for genre in search_genres(search_type, case_sensitive, values,
@@ -178,7 +209,14 @@ if __name__ == '__main__':
     parser.add_argument('-d', '--details', action='count',
                         help='output more details about books; '
                         'repeat for even more details')
+    parser.add_argument('--surname', help='search by author\'s surname')
+    parser.add_argument('--name', help='search by author\'s name')
+    parser.add_argument('--misc-name', help='search by author\'s misc. name')
+    parser.add_argument('--fullname', help='search by author\'s full name')
     parser.add_argument('-e', '--ext', help='search by file extension')
+    parser.add_argument('--gname', help='search by genre\'s name')
+    parser.add_argument('--gtitle', help='search by genre\'s title')
+    parser.add_argument('-l', '--lang', help='search by language')
     parser.set_defaults(func=_search_books)
 
     parser = subparsers.add_parser('ext', help='Search extensions')