Print count after the list

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

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index d6ea8282ee6f6204fbcb4baefb6114d7a32642ee..d9074813164515269704c398e750886e3a7923ae 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -30,6 +30,10 @@ def _guess_case_sensitivity(values):
     return False
 
 
+def print_count(query):
+    print _("Found").encode(default_encoding), ":", query.count()
+
+
 def _search_authors(case_sensitive, search_type, args):
     if (args.surname or args.name or args.misc_name) and args.fullname:
         sys.stderr.write(
@@ -51,7 +55,7 @@ def _search_authors(case_sensitive, search_type, args):
     authors = search_authors(search_type, case_sensitive, values, expressions,
                              orderBy=('surname', 'name', 'misc_name'))
     if args.count:
-        print authors.count()
+        print_count(authors)
         return
     for author in authors:
         names = filter(None, (author.surname, author.name, author.misc_name))
@@ -59,9 +63,10 @@ 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
+    print_count(authors)
 
 
 def _search_books(case_sensitive, search_type, args):
@@ -129,14 +134,14 @@ def _search_books(case_sensitive, search_type, args):
     books = search_books(search_type, case_sensitive, values, join_expressions,
                          orderBy=('series', 'ser_no', 'title'))
     if args.count:
-        print books.count()
+        print_count(books)
         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 +158,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), ":", \
@@ -167,6 +172,7 @@ def _search_books(case_sensitive, search_type, args):
                 book.size, _("bytes").encode(default_encoding)
             print " ", _("Deleted").encode(default_encoding), ":", \
                 _(str(book.deleted)).encode(default_encoding)
+    print_count(books)
 
 
 def _search_extensions(case_sensitive, search_type, args):
@@ -178,14 +184,15 @@ def _search_extensions(case_sensitive, search_type, args):
     extensions = search_extensions(search_type, case_sensitive, values,
                                    orderBy='name')
     if args.count:
-        print extensions.count()
+        print_count(extensions)
         return
     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
+    print_count(extensions)
 
 
 def _search_genres(case_sensitive, search_type, args):
@@ -194,16 +201,17 @@ def _search_genres(case_sensitive, search_type, args):
         case_sensitive = _guess_case_sensitivity(values)
     genres = search_genres(search_type, case_sensitive, values, orderBy='name')
     if args.count:
-        print genres.count()
+        print_count(genres)
         return
     for genre in genres:
         names = filter(None, (genre.name, genre.title))
         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
+    print_count(genres)
 
 
 def _search_languages(case_sensitive, search_type, args):
@@ -212,13 +220,18 @@ def _search_languages(case_sensitive, search_type, args):
         case_sensitive = _guess_case_sensitivity(values)
     else:
         values = {}
-    for lang in search_languages(search_type, case_sensitive, values,
-                                 orderBy='name'):
+    languages = search_languages(search_type, case_sensitive, values,
+                                 orderBy='name')
+    if args.count:
+        print_count(languages)
+        return
+    for lang in languages:
         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
+    print_count(languages)
 
 
 if __name__ == '__main__':
@@ -235,11 +248,11 @@ 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')