X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=1aad934555c609c773376dde5522a67f121c6e7d;hb=061a45aba1f91ec167eb9ac283a4c0a0afb52798;hp=a6fe3e5e076c0d893748f0967db284acbf4cba6a;hpb=8d0cd0faf04cf7a988b77d6fe2a4285444a2f3ea;p=m_librarian.git diff --git a/scripts/ml-search.py b/scripts/ml-search.py index a6fe3e5..1aad934 100755 --- a/scripts/ml-search.py +++ b/scripts/ml-search.py @@ -1,10 +1,12 @@ #! /usr/bin/env python +from __future__ import print_function import argparse 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, \ @@ -34,7 +36,7 @@ def _guess_case_sensitivity(values): def print_count(count): - print _("Found").encode(default_encoding), ":", count + print(_("Found").encode(default_encoding), ":", count) def _search_authors(case_sensitive, search_type, args): @@ -62,11 +64,11 @@ def _search_authors(case_sensitive, search_type, args): return count = 0 for author in authors: - print author.fullname.encode(default_encoding), \ - (u"(%s: %d)" % (_('books'), author.count))\ - .encode(default_encoding), + print(author.fullname.encode(default_encoding), + (u"(%s: %d)" % (_('books'), author.count)) + .encode(default_encoding), end='') if args.verbose >= 1: - print "(id=%d)" % author.id, + print("(id=%d)" % author.id, end='') print count += 1 print_count(count) @@ -156,38 +158,38 @@ def _search_books(case_sensitive, search_type, args): sys.exit(1) count = 0 for book in books: - print book.title.encode(default_encoding), + print(book.title.encode(default_encoding), end='') if args.verbose >= 1: - print "(id=%d)" % book.id, + print("(id=%d)" % book.id, end='') print if args.verbose >= 1: - print " ", _("Author(s)").encode(default_encoding), ":", + print(" ", _("Author(s)").encode(default_encoding), ":", end='') for author in book.authors: - print author.fullname.encode(default_encoding), + print(author.fullname.encode(default_encoding), end='') print - print " ", _("Genre(s)").encode(default_encoding), ":", + print(" ", _("Genre(s)").encode(default_encoding), ":", end='') for genre in book.genres: - print (genre.title or genre.name).encode(default_encoding), + print((genre.title or genre.name).encode(default_encoding), end='') print if book.series: - print " ", _("Series").encode(default_encoding), ":", - print book.series.encode(default_encoding), \ - "(%d)" % book.ser_no + print(" ", _("Series").encode(default_encoding), ":", end='') + print(book.series.encode(default_encoding), + "(%d)" % book.ser_no) if args.verbose >= 2: - print " ", _("Date").encode(default_encoding), ":", book.date - print " ", _("Language").encode(default_encoding), ":", \ - book.language.name.encode(default_encoding) + print(" ", _("Date").encode(default_encoding), ":", book.date) + print(" ", _("Language").encode(default_encoding), ":", + book.language.name.encode(default_encoding)) if args.verbose >= 3: - 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) + 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)) if args.get or args.get_many: download(book, args.path, args.format) count += 1 @@ -207,10 +209,11 @@ def _search_extensions(case_sensitive, search_type, args): return count = 0 for ext in extensions: - print ext.name.encode(default_encoding), \ + print(ext.name.encode(default_encoding), (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding), + end='') if args.verbose >= 1: - print "(id=%d)" % ext.id, + print("(id=%d)" % ext.id, end='') print count += 1 print_count(count) @@ -228,10 +231,11 @@ def _search_genres(case_sensitive, search_type, args): for genre in genres: names = filter(None, (genre.name, genre.title)) fullname = u' '.join(names) - print fullname.encode(default_encoding), \ + print(fullname.encode(default_encoding), (u"(%s: %d)" % (_('books'), genre.count)).encode(default_encoding), + end='') if args.verbose >= 1: - print "(id=%d)" % genre.id, + print("(id=%d)" % genre.id, end='') print count += 1 print_count(count) @@ -250,10 +254,11 @@ def _search_languages(case_sensitive, search_type, args): return count = 0 for lang in languages: - print lang.name.encode(default_encoding), \ + print(lang.name.encode(default_encoding), (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding), + end='') if args.verbose >= 1: - print "(id=%d)" % lang.id, + print("(id=%d)" % lang.id, end='') print count += 1 print_count(count) @@ -261,7 +266,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,12 +300,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('--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.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') @@ -313,6 +313,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') @@ -333,6 +340,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(