Output count of found objects

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

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 5a5ff96f7a00066e9371f0c347369abaf15ab08d..861edbcf273761aa5461bdef60acac863a0532d4 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -48,13 +48,20 @@ def _search_authors(case_sensitive, search_type, args):
             ))
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
-    for author in search_authors(search_type, case_sensitive, values,
-                                 expressions,
-                                 orderBy=('surname', 'name', 'misc_name')):
+    authors = search_authors(search_type, case_sensitive, values, expressions,
+                             orderBy=('surname', 'name', 'misc_name'))
+    if args.count:
+        print authors.count()
+        return
+    for author in authors:
         names = filter(None, (author.surname, author.name, author.misc_name))
         fullname = u' '.join(names)
         print fullname.encode(default_encoding), \
-            (u"(%s: %d)" % (_('books'), author.count)).encode(default_encoding)
+            (u"(%s: %d)" % (_('books'), author.count))\
+            .encode(default_encoding),
+        if args.details >= 1:
+            print "(id=%d)" % author.id,
+        print
 
 
 def _search_books(case_sensitive, search_type, args):
@@ -107,37 +114,47 @@ def _search_books(case_sensitive, search_type, args):
             Language, search_type, case_sensitive,
             {'name': args.lang})
         join_expressions.extend(conditions)
-    for book in search_books(search_type, case_sensitive, values,
-                             join_expressions,
-                             orderBy=('series', 'ser_no', 'title')):
-        print book.title.encode(default_encoding)
+    books = search_books(search_type, case_sensitive, values, join_expressions,
+                         orderBy=('series', 'ser_no', 'title'))
+    if args.count:
+        print books.count()
+        return
+    for book in books:
+        print book.title.encode(default_encoding),
+        if args.details >= 1:
+            print "(id=%d)" % book.id,
+        print
         if args.details >= 1:
-            print " ", _("Author(s)"), ":",
+            print " ", _("Author(s)").encode(default_encoding), ":",
             for author in book.authors:
                 names = filter(None,
                                (author.surname, author.name, author.misc_name))
                 fullname = u' '.join(names)
                 print fullname.encode(default_encoding),
             print
-            print " ", _("Genre(s)"), ":",
+            print " ", _("Genre(s)").encode(default_encoding), ":",
             for genre in book.genres:
                 print (genre.title or genre.name).encode(default_encoding),
             print
             if book.series:
-                print " ", _("Series"), ":",
+                print " ", _("Series").encode(default_encoding), ":",
                 print book.series.encode(default_encoding), \
                     "(%d)" % book.ser_no
 
         if args.details >= 2:
-            print " ", _("Date"), ":", book.date
-            print " ", _("Language"), ":", book.language.name
+            print " ", _("Date").encode(default_encoding), ":", book.date
+            print " ", _("Language").encode(default_encoding), ":", \
+                book.language.name.encode(default_encoding)
 
         if args.details >= 3:
-            print " ", _("Archive"), ":", book.archive
-            print " ", _("File"), ":", book.file
-            print " ", _("Extension"), ":", book.extension.name
-            print " ", _("Size"), ":", book.size, _("bytes")
-            print " ", _("Deleted"), ":", _(str(book.deleted))
+            print " ", _("Archive").encode(default_encoding), ":", book.archive
+            print " ", _("File").encode(default_encoding), ":", book.file
+            print " ", _("Extension").encode(default_encoding), ":", \
+                book.extension.name.encode(default_encoding)
+            print " ", _("Size").encode(default_encoding), ":", \
+                book.size, _("bytes").encode(default_encoding)
+            print " ", _("Deleted").encode(default_encoding), ":", \
+                _(str(book.deleted)).encode(default_encoding)
 
 
 def _search_extensions(case_sensitive, search_type, args):
@@ -147,22 +164,35 @@ def _search_extensions(case_sensitive, search_type, args):
             case_sensitive = _guess_case_sensitivity(values)
     else:
         values = {}
-    for ext in search_extensions(search_type, case_sensitive, values,
-                                 orderBy='name'):
+    extensions = search_extensions(search_type, case_sensitive, values,
+                                   orderBy='name')
+    if args.count:
+        print extensions.count()
+        return
+    for ext in extensions:
         print ext.name.encode(default_encoding), \
-            (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding)
+            (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding),
+        if args.details >= 1:
+            print "(id=%d)" % ext.id,
+        print
 
 
 def _search_genres(case_sensitive, search_type, args):
     values = _get_values(args, 'name', 'title')
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
-    for genre in search_genres(search_type, case_sensitive, values,
-                               orderBy='name'):
+    genres = search_genres(search_type, case_sensitive, values, orderBy='name')
+    if args.count:
+        print genres.count()
+        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)
+            (u"(%s: %d)" % (_('books'), genre.count)).encode(default_encoding),
+        if args.details >= 1:
+            print "(id=%d)" % genre.id,
+        print
 
 
 def _search_languages(case_sensitive, search_type, args):
@@ -175,7 +205,10 @@ def _search_languages(case_sensitive, search_type, args):
     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)
+            (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding),
+        if args.details >= 1:
+            print "(id=%d)" % lang.id,
+        print
 
 
 if __name__ == '__main__':
@@ -192,6 +225,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')
     subparsers = main_parser.add_subparsers(help='Commands')
 
     parser = subparsers.add_parser('authors', help='Search authors')
@@ -206,9 +244,6 @@ if __name__ == '__main__':
     parser.add_argument('-s', '--series', help='search by series')
     parser.add_argument('-a', '--archive', help='search by archive (zip file)')
     parser.add_argument('-f', '--file', help='search by file name')
-    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')