X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=bd5df8cdf2341d0f2a619bf6d2be178a5d59aa12;hb=fb452b7dbe61dcbd6df0a682a2e88c3b4f5ff181;hp=9f06657e9fe717a03e0bf9a3dba94751c443632e;hpb=f500438f9ec07d6242b6f5c06125a6df7d696919;p=m_librarian.git

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 9f06657..bd5df8c 100755
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -5,6 +5,7 @@ import sys
 from sqlobject.sqlbuilder import CONCAT
 
 from m_lib.defenc import default_encoding
+from m_librarian.config import get_config
 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, \
@@ -189,7 +190,7 @@ def _search_books(case_sensitive, search_type, args):
             print " ", _("Deleted").encode(default_encoding), ":", \
                 _(str(book.deleted)).encode(default_encoding)
         if args.get or args.get_many:
-            download(book, args.path)
+            download(book, args.path, args.format)
         count += 1
     print_count(count)
 
@@ -261,7 +262,8 @@ def _search_languages(case_sensitive, search_type, args):
 
 if __name__ == '__main__':
     main_parser = argparse.ArgumentParser(description='Search')
-    main_parser.add_argument('-d', '--database', help='database URI')
+    main_parser.add_argument('-C', '--config', help='configuration file')
+    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)')
@@ -294,11 +296,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('-p', '--path', help='path to the library archives')
-    parser.add_argument('--get', action='store_true',
-                        help='download exactly one book')
-    parser.add_argument('--get-many', type=int,
-                        help='download at most this many books')
     parser.add_argument('--id', type=int, 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')
@@ -312,6 +309,13 @@ if __name__ == '__main__':
     parser.add_argument('--gid', type=int, help='search by genre\'s id')
     parser.add_argument('-l', '--lang', help='search by language')
     parser.add_argument('--lid', type=int, help='search by language\'s id')
+    parser.add_argument('-P', '--path', help='path to the library archives')
+    parser.add_argument('-F', '--format',
+                        help='download format, default is %f')
+    parser.add_argument('--get', action='store_true',
+                        help='download exactly one book')
+    parser.add_argument('--get-many', type=int,
+                        help='download at most this many books')
     parser.set_defaults(func=_search_books)
 
     parser = subparsers.add_parser('ext', help='Search extensions')
@@ -332,6 +336,9 @@ if __name__ == '__main__':
 
     args = main_parser.parse_args()
 
+    if args.config:
+        get_config(args.config)  # Get and cache config file
+
     if args.case_sensitive:
         if args.ignore_case:
             sys.stderr.write(