Document searching by database id

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

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index e23e4a533f845e8d2b3e94b59ce63631d23541e7..5e26ab5fdb7424c300bead413aad9e34c984eb56 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -48,9 +48,12 @@ 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), \
@@ -63,7 +66,7 @@ def _search_authors(case_sensitive, search_type, args):
 
 def _search_books(case_sensitive, search_type, args):
     join_expressions = []
-    values = _get_values(args, 'title', 'series', 'archive', 'file')
+    values = _get_values(args, 'title', 'series', 'archive', 'file', 'id')
     if case_sensitive is None:
         test_values = values.copy()
         test_values.update(_get_values(args, 'surname', 'name', 'misc_name',
@@ -71,6 +74,8 @@ def _search_books(case_sensitive, search_type, args):
                                        'lang'))
         case_sensitive = _guess_case_sensitivity(test_values)
     avalues = _get_values(args, 'surname', 'name', 'misc_name', 'fullname')
+    if args.aid:
+        avalues['id'] = args.aid
     if avalues:
         if (args.surname or args.name or args.misc_name) and args.fullname:
             sys.stderr.write(
@@ -89,62 +94,79 @@ def _search_books(case_sensitive, search_type, args):
         conditions = mk_search_conditions(
             Author, search_type, case_sensitive, avalues, expressions)
         join_expressions.extend(conditions)
+    evalues = {}
     if args.ext:
+        evalues['name'] = args.ext
+    if args.eid:
+        evalues['id'] = args.eid
+    if evalues:
         join_expressions.append(Book.j.extension)
         conditions = mk_search_conditions(
-            Extension, search_type, case_sensitive,
-            {'name': args.ext})
+            Extension, search_type, case_sensitive, evalues)
         join_expressions.extend(conditions)
     gvalues = {}
     for column in 'name', 'title':
         value = getattr(args, 'g' + column)
         if value:
             gvalues[column] = unicode(value, default_encoding)
+    if args.gid:
+        gvalues['id'] = args.gid
     if gvalues:
         join_expressions.append(Book.j.genres)
         conditions = mk_search_conditions(
             Genre, search_type, case_sensitive, gvalues)
         join_expressions.extend(conditions)
+    lvalues = {}
     if args.lang:
+        lvalues['name'] = args.lang
+    if args.lid:
+        lvalues['id'] = args.lid
+    if lvalues:
         join_expressions.append(Book.j.language)
         conditions = mk_search_conditions(
-            Language, search_type, case_sensitive,
-            {'name': args.lang})
+            Language, search_type, case_sensitive, lvalues)
         join_expressions.extend(conditions)
-    for book in search_books(search_type, case_sensitive, values,
-                             join_expressions,
-                             orderBy=('series', 'ser_no', 'title')):
+    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):
@@ -154,8 +176,12 @@ 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),
         if args.details >= 1:
@@ -167,8 +193,11 @@ 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), \
@@ -211,6 +240,8 @@ if __name__ == '__main__':
     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')
@@ -225,14 +256,19 @@ 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('--id', help='search by database id')
     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')
     parser.add_argument('--fullname', help='search by author\'s full name')
+    parser.add_argument('--aid', help='search by author\'s id')
     parser.add_argument('-e', '--ext', help='search by file extension')
+    parser.add_argument('--eid', help='search by extension\'s id')
     parser.add_argument('--gname', help='search by genre\'s name')
     parser.add_argument('--gtitle', help='search by genre\'s title')
+    parser.add_argument('--gid', help='search by genre\'s id')
     parser.add_argument('-l', '--lang', help='search by language')
+    parser.add_argument('--lid', help='search by language\'s id')
     parser.set_defaults(func=_search_books)
 
     parser = subparsers.add_parser('ext', help='Search extensions')