X-Git-Url: https://git.phdru.name/?p=m_librarian.git;a=blobdiff_plain;f=scripts%2Fml-search.py;h=db57f2be054d979e0e3ec1043da9e07756110471;hp=eff58fbecc901d47bb1a2c8edea16eac81e70575;hb=6408cf9621ddfc695902939bcdfe29fe73528e96;hpb=2bde7fb4a4f400aee640a185b45c2ade7952adc6

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index eff58fb..db57f2b 100755
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -62,8 +62,28 @@ 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', '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(
@@ -178,6 +198,10 @@ 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('-l', '--lang', help='search by language')
     parser.set_defaults(func=_search_books)