X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=a6fe3e5e076c0d893748f0967db284acbf4cba6a;hb=8d0cd0faf04cf7a988b77d6fe2a4285444a2f3ea;hp=b257084a749d03a487f2f0889b656b57639d35dc;hpb=b0c1d9a111696fd1f4b8d6d79e472047d53c8957;p=m_librarian.git diff --git a/scripts/ml-search.py b/scripts/ml-search.py index b257084..a6fe3e5 100755 --- a/scripts/ml-search.py +++ b/scripts/ml-search.py @@ -20,13 +20,15 @@ def _get_values(args, *columns): for column in columns: value = getattr(args, column) if value: - values[column] = unicode(value, default_encoding) + if isinstance(value, basestring): + 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, basestring) and not value.islower(): return True return False @@ -60,9 +62,7 @@ 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), \ + print author.fullname.encode(default_encoding), \ (u"(%s: %d)" % (_('books'), author.count))\ .encode(default_encoding), if args.verbose >= 1: @@ -73,6 +73,11 @@ def _search_authors(case_sensitive, search_type, args): 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,16 +144,16 @@ 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), @@ -158,10 +163,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: @@ -186,6 +188,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) + if args.get or args.get_many: + download(book, args.path, args.format) count += 1 print_count(count) @@ -281,7 +285,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) @@ -291,37 +295,40 @@ if __name__ == '__main__': 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('--id', help='search by database id') + 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') 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.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()