Search and print a list of books by title, series, archive or file name

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

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index e4ae0119fe58127de3b5c43515582063d1eb1ead..6f71d0a9cfec0c0eb0e49b527c269bb51cca331d 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -6,8 +6,8 @@ from sqlobject.sqlbuilder import CONCAT
 
 from m_lib.defenc import default_encoding
 from m_librarian.db import Author, open_db
-from m_librarian.search import search_authors, search_extensions, \
-    search_genres, search_languages
+from m_librarian.search import search_authors, search_books, \
+    search_extensions, search_genres, search_languages
 
 from m_librarian.translations import translations
 _ = translations.ugettext
@@ -43,32 +43,56 @@ def _search_authors(case_sensitive, args):
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
     for author in search_authors(args.search_type, case_sensitive, values,
-                                 expressions):
+                                 expressions,
+                                 orderBy=('surname', 'name', 'misc_name')):
         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)
 
 
-def _search_extensions(case_sensitive, args):
-    values = {'name': args.name}
+def _search_books(case_sensitive, args):
+    values = {}
+    for column in 'title', 'series', 'archive', 'file':
+        value = getattr(args, column)
+        if value:
+            values[column] = unicode(value, default_encoding)
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
-    for ext in search_extensions(args.search_type, case_sensitive, values):
+    for book in search_books(args.search_type, case_sensitive, values,
+                             orderBy='title'):
+        print book.title.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
+
+
+def _search_extensions(case_sensitive, args):
+    if args.name:
+        values = {'name': args.name}
+        if case_sensitive is None:
+            case_sensitive = _guess_case_sensitivity(values)
+    else:
+        values = {}
+    for ext in search_extensions(args.search_type, case_sensitive, values,
+                                 orderBy='name'):
         print ext.name.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding)
 
 
 def _search_genres(case_sensitive, args):
     values = {}
-    expressions = []
     for column in 'name', 'title':
         value = getattr(args, column)
         if value:
             values[column] = unicode(value, default_encoding)
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
-    for genre in search_genres(args.search_type, case_sensitive, values):
+    for genre in search_genres(args.search_type, case_sensitive, values,
+                               orderBy='name'):
         names = filter(None, (genre.name, genre.title))
         fullname = u' '.join(names)
         print fullname.encode(default_encoding), \
@@ -76,10 +100,14 @@ def _search_genres(case_sensitive, args):
 
 
 def _search_languages(case_sensitive, args):
-    values = {'name': args.name}
-    if case_sensitive is None:
-        case_sensitive = _guess_case_sensitivity(values)
-    for lang in search_languages(args.search_type, case_sensitive, values):
+    if args.name:
+        values = {'name': args.name}
+        if case_sensitive is None:
+            case_sensitive = _guess_case_sensitivity(values)
+    else:
+        values = {}
+    for lang in search_languages(args.search_type, case_sensitive, values,
+                                 orderBy='name'):
         print lang.name.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding)
 
@@ -108,8 +136,15 @@ if __name__ == '__main__':
     parser.add_argument('fullname', nargs='?', help='search by full name')
     parser.set_defaults(func=_search_authors)
 
+    parser = subparsers.add_parser('books', help='Search books')
+    parser.add_argument('-t', '--title', help='search by title')
+    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.set_defaults(func=_search_books)
+
     parser = subparsers.add_parser('ext', help='Search extensions')
-    parser.add_argument('name', help='search by name')
+    parser.add_argument('name', nargs='?', help='search by name')
     parser.set_defaults(func=_search_extensions)
 
     parser = subparsers.add_parser('genres', help='Search genres')
@@ -118,7 +153,7 @@ if __name__ == '__main__':
     parser.set_defaults(func=_search_genres)
 
     parser = subparsers.add_parser('lang', help='Search languages')
-    parser.add_argument('name', help='search by name')
+    parser.add_argument('name', nargs='?', help='search by name')
     parser.set_defaults(func=_search_languages)
 
     args = main_parser.parse_args()