X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=e163daf208f0e72cea338dedd4590e607041182a;hb=b1657c852615f0deac00c879d4f69a3166d6fcdf;hp=daef7a01de9674f899da97d350d96346a2b38db2;hpb=c3baed6ff87ae74b951807ba6c8d386bb07c9399;p=m_librarian.git

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index daef7a0..e163daf 100755
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -1,20 +1,30 @@
 #! /usr/bin/env python
 
 import argparse
+import sys
 from m_lib.defenc import default_encoding
-from m_librarian.search import search_authors, search_books, \
-    search_extensions, search_genres, search_languages
-import m_librarian.translations
+from m_librarian.db import open_db
+from m_librarian.search import search_authors
+from m_librarian.translations import translations
+_ = translations.ugettext
 
 
-def _search_authors(args):
+def _guess_case_sensitivity(values):
+    for value in values.values():
+        if not value.islower():
+            return True
+    return False
+
+
+def _search_authors(case_sensitive, args):
     values = {}
-    for column in 'surname', 'name', 'misc':
+    for column in 'surname', 'name', 'misc_name':
         value = getattr(args, column)
         if value:
             values[column] = unicode(value, default_encoding)
-    for author in search_authors(args.search_type, args.case_sensitive,
-                                 values):
+    if case_sensitive is None:
+        case_sensitive = _guess_case_sensitivity(values)
+    for author in search_authors(args.search_type, case_sensitive, values):
         full_name = filter(None,
                            (author.surname, author.name, author.misc_name))
         full_name = u' '.join(full_name)
@@ -24,10 +34,13 @@ def _search_authors(args):
 
 if __name__ == '__main__':
     main_parser = argparse.ArgumentParser(description='Search')
+    main_parser.add_argument('-i', '--ignore-case',
+                             action='store_true',
+                             help='ignore case '
+                             '(default is to guess)')
     main_parser.add_argument('-I', '--case-sensitive',
                              action='store_true',
-                             help='don\'t ignore case '
-                             '(default is case-insensitive search)')
+                             help='don\'t ignore case ')
     main_parser.add_argument('-t', '--search-type',
                              choices=['exact', 'start', 'substring'],
                              default='start',
@@ -39,8 +52,19 @@ if __name__ == '__main__':
     parser = subparsers.add_parser('authors', help='Search authors')
     parser.add_argument('-s', '--surname', help='search by surname')
     parser.add_argument('-n', '--name', help='search by name')
-    parser.add_argument('-m', '--misc', help='search by misc. name')
+    parser.add_argument('-m', '--misc-name', help='search by misc. name')
     parser.set_defaults(func=_search_authors)
 
     args = main_parser.parse_args()
-    args.func(args)
+    if args.case_sensitive:
+        if args.ignore_case:
+            main_parser.print_help()
+            sys.exit(1)
+        else:
+            case_sensitive = True
+    elif args.ignore_case:
+        case_sensitive = False
+    else:
+        case_sensitive = None  # guess case sensitivity
+    open_db()
+    args.func(case_sensitive, args)