Rename -d/--details options to -v/--verbose

[m_librarian.git] / scripts / ml-search.py

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 5e26ab5fdb7424c300bead413aad9e34c984eb56..75a011435c2bb591da53f7234aa7e6ec407e85f0 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -37,7 +37,7 @@ def _search_authors(case_sensitive, search_type, args):
         main_parser.print_help()
         sys.exit(1)
     expressions = []
-    values = _get_values(args, 'surname', 'name', 'misc_name')
+    values = _get_values(args, 'surname', 'name', 'misc_name', 'id')
     if not values:
         value = args.fullname
         if value:
@@ -59,7 +59,7 @@ def _search_authors(case_sensitive, search_type, args):
         print fullname.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), author.count))\
             .encode(default_encoding),
-        if args.details >= 1:
+        if args.verbose >= 1:
             print "(id=%d)" % author.id,
         print
 
@@ -133,10 +133,10 @@ def _search_books(case_sensitive, search_type, args):
         return
     for book in books:
         print book.title.encode(default_encoding),
-        if args.details >= 1:
+        if args.verbose >= 1:
             print "(id=%d)" % book.id,
         print
-        if args.details >= 1:
+        if args.verbose >= 1:
             print " ", _("Author(s)").encode(default_encoding), ":",
             for author in book.authors:
                 names = filter(None,
@@ -153,12 +153,12 @@ def _search_books(case_sensitive, search_type, args):
                 print book.series.encode(default_encoding), \
                     "(%d)" % book.ser_no
 
-        if args.details >= 2:
+        if args.verbose >= 2:
             print " ", _("Date").encode(default_encoding), ":", book.date
             print " ", _("Language").encode(default_encoding), ":", \
                 book.language.name.encode(default_encoding)
 
-        if args.details >= 3:
+        if args.verbose >= 3:
             print " ", _("Archive").encode(default_encoding), ":", book.archive
             print " ", _("File").encode(default_encoding), ":", book.file
             print " ", _("Extension").encode(default_encoding), ":", \
@@ -170,10 +170,9 @@ def _search_books(case_sensitive, search_type, args):
 
 
 def _search_extensions(case_sensitive, search_type, args):
-    if args.name:
-        values = {'name': args.name}
-        if case_sensitive is None:
-            case_sensitive = _guess_case_sensitivity(values)
+    values = _get_values(args, 'name', 'id')
+    if case_sensitive is None:
+        case_sensitive = _guess_case_sensitivity(values)
     else:
         values = {}
     extensions = search_extensions(search_type, case_sensitive, values,
@@ -184,13 +183,13 @@ def _search_extensions(case_sensitive, search_type, args):
     for ext in extensions:
         print ext.name.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding),
-        if args.details >= 1:
+        if args.verbose >= 1:
             print "(id=%d)" % ext.id,
         print
 
 
 def _search_genres(case_sensitive, search_type, args):
-    values = _get_values(args, 'name', 'title')
+    values = _get_values(args, 'name', 'title', 'id')
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
     genres = search_genres(search_type, case_sensitive, values, orderBy='name')
@@ -202,23 +201,22 @@ def _search_genres(case_sensitive, search_type, args):
         fullname = u' '.join(names)
         print fullname.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), genre.count)).encode(default_encoding),
-        if args.details >= 1:
+        if args.verbose >= 1:
             print "(id=%d)" % genre.id,
         print
 
 
 def _search_languages(case_sensitive, search_type, args):
-    if args.name:
-        values = {'name': args.name}
-        if case_sensitive is None:
-            case_sensitive = _guess_case_sensitivity(values)
+    values = _get_values(args, 'name', 'id')
+    if case_sensitive is None:
+        case_sensitive = _guess_case_sensitivity(values)
     else:
         values = {}
     for lang in search_languages(search_type, case_sensitive, values,
                                  orderBy='name'):
         print lang.name.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding),
-        if args.details >= 1:
+        if args.verbose >= 1:
             print "(id=%d)" % lang.id,
         print
 
@@ -237,17 +235,18 @@ if __name__ == '__main__':
                              help='search substring anywhere')
     main_parser.add_argument('-f', '--full', action='store_true',
                              help='match the entire string')
-    main_parser.add_argument('-d', '--details', action='count',
-                             help='output more details about books; '
-                             'repeat for even more details')
     main_parser.add_argument('-c', '--count', action='store_true',
                              help='count instead of output')
+    main_parser.add_argument('-v', '--verbose', action='count',
+                             help='output more details about books; '
+                             'repeat for even more details')
     subparsers = main_parser.add_subparsers(help='Commands')
 
     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-name', help='search by misc. name')
+    parser.add_argument('--id', help='search by database id')
     parser.add_argument('fullname', nargs='?', help='search by full name')
     parser.set_defaults(func=_search_authors)
 
@@ -273,15 +272,18 @@ if __name__ == '__main__':
 
     parser = subparsers.add_parser('ext', help='Search extensions')
     parser.add_argument('name', nargs='?', help='search by name')
+    parser.add_argument('--id', help='search by database id')
     parser.set_defaults(func=_search_extensions)
 
     parser = subparsers.add_parser('genres', help='Search genres')
     parser.add_argument('-n', '--name', help='search by name')
     parser.add_argument('-t', '--title', help='search by title')
+    parser.add_argument('--id', help='search by database id')
     parser.set_defaults(func=_search_genres)
 
     parser = subparsers.add_parser('lang', help='Search languages')
     parser.add_argument('name', nargs='?', help='search by name')
+    parser.add_argument('--id', help='search by database id')
     parser.set_defaults(func=_search_languages)
 
     args = main_parser.parse_args()