X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=5a5ff96f7a00066e9371f0c347369abaf15ab08d;hb=ae2420533ffdb36d6da9531774ef40b0ec20cdca;hp=eff58fbecc901d47bb1a2c8edea16eac81e70575;hpb=514d7a6a405e2212dbc5798c66ff68a3bdcbd633;p=m_librarian.git

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index eff58fb..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, Language, 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
@@ -62,14 +62,45 @@ def _search_books(case_sensitive, search_type, args):
     values = _get_values(args, 'title', 'series', 'archive', 'file')
     if case_sensitive is None:
         test_values = values.copy()
-        test_values.update(_get_values(args, 'ext', 'lang'))
+        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(
@@ -178,7 +209,13 @@ 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)