Allow to set download format

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

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 1cda3f55eb8fd1aad326178677e86674caba48e1..d19c5b4f6408b8ce4d629fe7913e2fd816cf63a2 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -6,6 +6,7 @@ from sqlobject.sqlbuilder import CONCAT
 
 from m_lib.defenc import default_encoding
 from m_librarian.db import Author, Book, Extension, Genre, Language, open_db
+from m_librarian.download import download
 from m_librarian.search import mk_search_conditions, \
     search_authors, search_books, \
     search_extensions, search_genres, search_languages
@@ -30,8 +31,8 @@ def _guess_case_sensitivity(values):
     return False
 
 
-def print_count(query):
-    print _("Found").encode(default_encoding), ":", query.count()
+def print_count(count):
+    print _("Found").encode(default_encoding), ":", count
 
 
 def _search_authors(case_sensitive, search_type, args):
@@ -55,18 +56,18 @@ 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_count(authors)
+        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)
-        print fullname.encode(default_encoding), \
+        print author.fullname.encode(default_encoding), \
             (u"(%s: %d)" % (_('books'), author.count))\
             .encode(default_encoding),
         if args.verbose >= 1:
             print "(id=%d)" % author.id,
         print
-    print_count(authors)
+        count += 1
+    print_count(count)
 
 
 def _search_books(case_sensitive, search_type, args):
@@ -134,8 +135,18 @@ 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_count(books)
+        print_count(books.count())
+        return
+    if args.get:
+        count = books.count()
+        if count != 1:
+            sys.stderr.write("There must be exactly 1 book for --get; "
+                             "(found %d).\n" % count)
+            sys.exit(1)
+        book = books[0]
+        download(book, args.path)
         return
+    count = 0
     for book in books:
         print book.title.encode(default_encoding),
         if args.verbose >= 1:
@@ -144,10 +155,7 @@ def _search_books(case_sensitive, search_type, args):
         if args.verbose >= 1:
             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 author.fullname.encode(default_encoding),
             print
             print " ", _("Genre(s)").encode(default_encoding), ":",
             for genre in book.genres:
@@ -172,7 +180,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)
-    print_count(books)
+        count += 1
+    print_count(count)
 
 
 def _search_extensions(case_sensitive, search_type, args):
@@ -184,15 +193,17 @@ def _search_extensions(case_sensitive, search_type, args):
     extensions = search_extensions(search_type, case_sensitive, values,
                                    orderBy='name')
     if args.count:
-        print_count(extensions)
+        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
-    print_count(extensions)
+        count += 1
+    print_count(count)
 
 
 def _search_genres(case_sensitive, search_type, args):
@@ -201,8 +212,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_count(genres)
+        print_count(genres.count())
         return
+    count = 0
     for genre in genres:
         names = filter(None, (genre.name, genre.title))
         fullname = u' '.join(names)
@@ -211,7 +223,8 @@ def _search_genres(case_sensitive, search_type, args):
         if args.verbose >= 1:
             print "(id=%d)" % genre.id,
         print
-    print_count(genres)
+        count += 1
+    print_count(count)
 
 
 def _search_languages(case_sensitive, search_type, args):
@@ -223,15 +236,17 @@ def _search_languages(case_sensitive, search_type, args):
     languages = search_languages(search_type, case_sensitive, values,
                                  orderBy='name')
     if args.count:
-        print_count(languages)
+        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
-    print_count(languages)
+        count += 1
+    print_count(count)
 
 
 if __name__ == '__main__':
@@ -269,6 +284,9 @@ 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('-p', '--path', help='path to the library archives')
+    parser.add_argument('--get', action='store_true',
+                        help='download exactly one book')
     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')