X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=24db982fafb1b4cf80ef45741e0ec1d5b76380f5;hb=63bb5df8cf2595bbe106031911666fb7061a03aa;hp=2f5767bc9408553e4ce4c4c74e7c247dccb10ffb;hpb=51132595d65c48a10906e266b64e696bc3b3f87d;p=m_librarian.git diff --git a/scripts/ml-search.py b/scripts/ml-search.py index 2f5767b..24db982 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 os 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, \ @@ -12,7 +15,19 @@ from m_librarian.search import mk_search_conditions, \ search_extensions, search_genres, search_languages from m_librarian.translations import translations -_ = translations.ugettext +_ = getattr(translations, 'ugettext', None) or translations.gettext + + +def decode(value): + if isinstance(value, bytes): + return value.decode(default_encoding) + return value + + +def encode(value): + if bytes is str and not isinstance(value, bytes): + return value.encode(default_encoding, errors='replace') + return value def _get_values(args, *columns): @@ -20,7 +35,8 @@ def _get_values(args, *columns): for column in columns: value = getattr(args, column) if value: - values[column] = unicode(value, default_encoding) + value = decode(value) + values[column] = value return values @@ -32,7 +48,7 @@ def _guess_case_sensitivity(values): def print_count(count): - print _("Found").encode(default_encoding), ":", count + print(encode(_("Found")), ":", count) def _search_authors(case_sensitive, search_type, args): @@ -49,7 +65,7 @@ def _search_authors(case_sensitive, search_type, args): expressions.append(( CONCAT(Author.q.surname, ' ', Author.q.name, ' ', Author.q.misc_name), - unicode(value, default_encoding) + decode(value) )) if case_sensitive is None: case_sensitive = _guess_case_sensitivity(values) @@ -60,19 +76,21 @@ 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(encode(author.fullname), + encode((u"(%s: %d)" % (_('books'), author.count))), end=' ') if args.verbose >= 1: - print "(id=%d)" % author.id, - print + 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: @@ -97,7 +115,7 @@ def _search_books(case_sensitive, search_type, args): expressions.append(( CONCAT(Author.q.surname, ' ', Author.q.name, ' ', Author.q.misc_name), - unicode(value, default_encoding) + decode(value) )) conditions = mk_search_conditions( Author, search_type, case_sensitive, avalues, expressions) @@ -116,7 +134,7 @@ def _search_books(case_sensitive, search_type, args): for column in 'name', 'title': value = getattr(args, 'g' + column) if value: - gvalues[column] = unicode(value, default_encoding) + gvalues[column] = decode(value) if args.gid: gvalues['id'] = args.gid if gvalues: @@ -135,56 +153,58 @@ def _search_books(case_sensitive, search_type, args): Language, search_type, case_sensitive, lvalues) join_expressions.extend(conditions) books = search_books(search_type, case_sensitive, values, join_expressions, - orderBy=('series', 'ser_no', 'title')) + orderBy=('series', 'ser_no', 'title'), + use_filters=args.filters) 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)) - return count = 0 for book in books: - print book.title.encode(default_encoding), + print(encode(book.title), end=' ') if args.verbose >= 1: - print "(id=%d)" % book.id, - print + print("(id=%d)" % book.id, end=' ') + print() if args.verbose >= 1: - print " ", _("Author(s)").encode(default_encoding), ":", + print(" ", encode(_("Author(s)")), ":", 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 - print " ", _("Genre(s)").encode(default_encoding), ":", + print(encode(author.fullname), end=' ') + print() + print(" ", encode(_("Genre(s)")), ":", end=' ') for genre in book.genres: - print (genre.title or genre.name).encode(default_encoding), - print + print((encode(genre.title or genre.name)), end=' ') + print() if book.series: - print " ", _("Series").encode(default_encoding), ":", - print book.series.encode(default_encoding), \ - "(%d)" % book.ser_no + print(" ", encode(_("Series")), ":", end=' ') + print(encode(book.series), "(%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(" ", encode(_("Date")), ":", book.date) + print(" ", encode(_("Language")), ":", encode(book.language.name)) 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(" ", encode(_("Archive")), ":", book.archive) + print(" ", encode(_("File")), ":", book.file) + print(" ", encode(_("Extension")), ":", + encode(book.extension.name)) + print(" ", encode(_("Size")), ":", + book.size, encode(_("bytes"))) + print(" ", encode(_("Deleted")), ":", + encode(_(str(book.deleted)))) + if args.get or args.get_many: + download_to = args.download_to + if download_to is None: + download_to = get_config().getpath('download', 'path') + download(book, download_to, args.path, args.format) count += 1 print_count(count) @@ -202,11 +222,12 @@ def _search_extensions(case_sensitive, search_type, args): return count = 0 for ext in extensions: - print ext.name.encode(default_encoding), \ - (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding), + print(encode(ext.name), + encode((u"(%s: %d)" % (_('books'), ext.count))), + end=' ') if args.verbose >= 1: - print "(id=%d)" % ext.id, - print + print("(id=%d)" % ext.id, end=' ') + print() count += 1 print_count(count) @@ -223,11 +244,12 @@ 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), \ - (u"(%s: %d)" % (_('books'), genre.count)).encode(default_encoding), + print(encode(fullname), + encode((u"(%s: %d)" % (_('books'), genre.count))), + end=' ') if args.verbose >= 1: - print "(id=%d)" % genre.id, - print + print("(id=%d)" % genre.id, end=' ') + print() count += 1 print_count(count) @@ -245,18 +267,20 @@ def _search_languages(case_sensitive, search_type, args): return count = 0 for lang in languages: - print lang.name.encode(default_encoding), \ - (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding), + print(encode(lang.name), + encode((u"(%s: %d)" % (_('books'), lang.count))), + end=' ') if args.verbose >= 1: - print "(id=%d)" % lang.id, - print + print("(id=%d)" % lang.id, end=' ') + print() count += 1 print_count(count) 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)') @@ -271,7 +295,7 @@ if __name__ == '__main__': help='match the entire string') main_parser.add_argument('-c', '--count', action='store_true', help='count instead of output') - main_parser.add_argument('-v', '--verbose', action='count', + main_parser.add_argument('-v', '--verbose', action='count', default=0, help='output more details about books; ' 'repeat for even more details') subparsers = main_parser.add_subparsers(help='Commands') @@ -280,7 +304,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) @@ -289,41 +313,54 @@ 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('--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('--filters', action='store_true', + help='use filters from config') + parser.add_argument('-P', '--path', help='path to the library archives') + parser.add_argument('--download-to', nargs='?', + const=None, default=os.path.curdir, + help='download directory') + 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(