X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fml-search.py;h=bae79cb93f1ccf2e6c023f3b627a36e915cb24e8;hb=51aa2c71d5bebc4be0c98f00c97d2f47fcde4d3a;hp=b257084a749d03a487f2f0889b656b57639d35dc;hpb=b0c1d9a111696fd1f4b8d6d79e472047d53c8957;p=m_librarian.git diff --git a/scripts/ml-search.py b/scripts/ml-search.py index b257084..bae79cb 100755 --- a/scripts/ml-search.py +++ b/scripts/ml-search.py @@ -1,10 +1,13 @@ #! /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.compat import string_type +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, \ @@ -20,19 +23,21 @@ def _get_values(args, *columns): for column in columns: value = getattr(args, column) if value: - values[column] = unicode(value, default_encoding) + if isinstance(value, string_type): + value = unicode(value, default_encoding) + values[column] = value return values def _guess_case_sensitivity(values): for value in values.values(): - if not value.islower(): + if isinstance(value, string_type) and not value.islower(): return True return False def print_count(count): - print _("Found").encode(default_encoding), ":", count + print(_("Found").encode(default_encoding), ":", count) def _search_authors(case_sensitive, search_type, args): @@ -60,19 +65,22 @@ def _search_authors(case_sensitive, search_type, args): 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), \ - (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) def _search_books(case_sensitive, search_type, args): + if args.get and args.get_many: + sys.stderr.write( + "Cannot get one book and many books at the same time\n") + main_parser.print_help() + sys.exit(1) join_expressions = [] values = _get_values(args, 'title', 'series', 'archive', 'file', 'id') if case_sensitive is None: @@ -139,53 +147,52 @@ def _search_books(case_sensitive, search_type, args): if args.count: print_count(books.count()) return - if args.get: + if args.get_many: + books = books[:args.get_many] + elif args.get: count = books.count() if count != 1: sys.stderr.write("There must be exactly 1 book for --get; " "(found %d).\n" % count) + sys.stderr.write("Use --get-many N to download more than one " + "book.\n") sys.exit(1) - book = books[0] - download(book.archive, '%s.%s' % (book.file, book.extension.name), - book.date, args.path) - return 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: - 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), 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 print_count(count) @@ -203,10 +210,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) @@ -224,10 +232,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) @@ -246,10 +255,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) @@ -257,7 +267,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)') @@ -281,7 +292,7 @@ if __name__ == '__main__': parser.add_argument('-s', '--surname', help='search by surname') parser.add_argument('-n', '--name', help='search by name') parser.add_argument('-m', '--misc-name', help='search by misc. name') - parser.add_argument('--id', help='search by database id') + parser.add_argument('--id', type=int, help='search by database id') parser.add_argument('fullname', nargs='?', help='search by full name') parser.set_defaults(func=_search_authors) @@ -290,42 +301,49 @@ 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('--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') 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('--aid', type=int, 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('--eid', type=int, 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('--gid', type=int, 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.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') parser.add_argument('name', nargs='?', help='search by name') - parser.add_argument('--id', help='search by database id') + parser.add_argument('--id', type=int, help='search by database id') parser.set_defaults(func=_search_extensions) parser = subparsers.add_parser('genres', help='Search genres') parser.add_argument('-n', '--name', help='search by name') parser.add_argument('-t', '--title', help='search by title') - parser.add_argument('--id', help='search by database id') + parser.add_argument('--id', type=int, help='search by database id') parser.set_defaults(func=_search_genres) parser = subparsers.add_parser('lang', help='Search languages') parser.add_argument('name', nargs='?', help='search by name') - parser.add_argument('--id', help='search by database id') + parser.add_argument('--id', type=int, help='search by database id') parser.set_defaults(func=_search_languages) 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(