X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=b35d7eba546c375b85eaf8ad72d24db172c1ff9e;hb=2792dae0b23c3fe2f982651cdb31db622615ec81;hp=75a011435c2bb591da53f7234aa7e6ec407e85f0;hpb=7eab2ab93e2bdc2897dd5f41b474abd64bd8df01;p=m_librarian.git

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 75a0114..b35d7eb 100755
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -30,6 +30,10 @@ def _guess_case_sensitivity(values):
     return False
 
 
+def print_count(count):
+    print _("Found").encode(default_encoding), ":", 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,8 +55,9 @@ 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.count())
         return
+    count = 0
     for author in authors:
         names = filter(None, (author.surname, author.name, author.misc_name))
         fullname = u' '.join(names)
@@ -62,6 +67,8 @@ def _search_authors(case_sensitive, search_type, args):
         if args.verbose >= 1:
             print "(id=%d)" % author.id,
         print
+        count += 1
+    print_count(count)
 
 
 def _search_books(case_sensitive, search_type, args):
@@ -129,8 +136,9 @@ 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.count())
         return
+    count = 0
     for book in books:
         print book.title.encode(default_encoding),
         if args.verbose >= 1:
@@ -167,6 +175,8 @@ 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)
+        count += 1
+    print_count(count)
 
 
 def _search_extensions(case_sensitive, search_type, args):
@@ -178,14 +188,17 @@ 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.count())
         return
+    count = 0
     for ext in extensions:
         print ext.name.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding),
         if args.verbose >= 1:
             print "(id=%d)" % ext.id,
         print
+        count += 1
+    print_count(count)
 
 
 def _search_genres(case_sensitive, search_type, args):
@@ -194,8 +207,9 @@ 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.count())
         return
+    count = 0
     for genre in genres:
         names = filter(None, (genre.name, genre.title))
         fullname = u' '.join(names)
@@ -204,6 +218,8 @@ def _search_genres(case_sensitive, search_type, args):
         if args.verbose >= 1:
             print "(id=%d)" % genre.id,
         print
+        count += 1
+    print_count(count)
 
 
 def _search_languages(case_sensitive, search_type, args):
@@ -212,17 +228,25 @@ 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.count())
+        return
+    count = 0
+    for lang in languages:
         print lang.name.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding),
         if args.verbose >= 1:
             print "(id=%d)" % lang.id,
         print
+        count += 1
+    print_count(count)
 
 
 if __name__ == '__main__':
     main_parser = argparse.ArgumentParser(description='Search')
+    main_parser.add_argument('-d', '--database', help='database URI')
     main_parser.add_argument('-i', '--ignore-case', action='store_true',
                              help='ignore case '
                              '(default is to guess)')
@@ -317,5 +341,5 @@ if __name__ == '__main__':
     else:
         search_type = 'start'
 
-    open_db()
+    open_db(args.database)
     args.func(case_sensitive, search_type, args)