X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=7cc32e187d9b913d46010e0b06b9cc275c4bb383;hb=5932dd9301f9820b2b103545593606909f8eceb8;hp=39d3dabfc9484bbff19e51e915a4658c22cb64f3;hpb=0229b7096af32d8a06d016ffda7f52c8e53ef24c;p=m_librarian.git diff --git a/scripts/ml-search.py b/scripts/ml-search.py index 39d3dab..7cc32e1 100755 --- a/scripts/ml-search.py +++ b/scripts/ml-search.py @@ -1,16 +1,47 @@ #! /usr/bin/env python +from __future__ import print_function import argparse +try: + from configparser import NoSectionError, NoOptionError +except ImportError: # Python 2 + from ConfigParser import NoSectionError, NoOptionError +import os import sys from sqlobject.sqlbuilder import CONCAT from m_lib.defenc import default_encoding -from m_librarian.db import Author, open_db -from m_librarian.search import search_authors, search_books, \ +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, \ + search_authors, search_books, \ 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): + values = {} + for column in columns: + value = getattr(args, column) + if value: + value = decode(value) + values[column] = value + return values def _guess_case_sensitivity(values): @@ -20,109 +51,243 @@ def _guess_case_sensitivity(values): return False +def print_count(count): + print(encode(_("Found")), ":", count) + + def _search_authors(case_sensitive, search_type, args): if (args.surname or args.name or args.misc_name) and args.fullname: sys.stderr.write( "Cannot search by names and full name at the same time\n") main_parser.print_help() sys.exit(1) - values = {} expressions = [] - for column in 'surname', 'name', 'misc_name': - value = getattr(args, column) - if value: - values[column] = unicode(value, default_encoding) + values = _get_values(args, 'surname', 'name', 'misc_name', 'id') if not values: value = args.fullname if value: 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) - for author in search_authors(search_type, case_sensitive, values, - expressions, - orderBy=('surname', 'name', 'misc_name')): - 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) + authors = search_authors(search_type, case_sensitive, values, expressions, + orderBy=('surname', 'name', 'misc_name')) + if args.count: + print_count(authors.count()) + return + count = 0 + for author in authors: + print(encode(author.fullname), + encode((u"(%s: %d)" % (_('books'), author.count))), end=' ') + if args.verbose >= 1: + print("(id=%d)" % author.id, end=' ') + print() + count += 1 + print_count(count) def _search_books(case_sensitive, search_type, args): - values = {} - for column in 'title', 'series', 'archive', 'file': - value = getattr(args, column) - if value: - values[column] = unicode(value, default_encoding) + 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: - case_sensitive = _guess_case_sensitivity(values) - for book in search_books(search_type, case_sensitive, values, - orderBy='title'): - print book.title.encode(default_encoding) - if args.details > 0: - print " ", _("Author(s)"), ":", + test_values = values.copy() + test_values.update(_get_values(args, 'surname', 'name', 'misc_name', + 'fullname', 'ext', 'gname', 'gtitle', + 'lang')) + case_sensitive = _guess_case_sensitivity(test_values) + avalues = _get_values(args, 'surname', 'name', 'misc_name', 'fullname') + if args.aid: + avalues['id'] = args.aid + if avalues: + if (args.surname or args.name or args.misc_name) and args.fullname: + sys.stderr.write( + "Cannot search by names and full name at the same time\n") + main_parser.print_help() + sys.exit(1) + expressions = [] + join_expressions.append(Book.j.authors) + value = args.fullname + if value: + expressions.append(( + CONCAT(Author.q.surname, ' ', Author.q.name, ' ', + Author.q.misc_name), + decode(value) + )) + conditions = mk_search_conditions( + Author, search_type, case_sensitive, avalues, expressions) + join_expressions.extend(conditions) + evalues = {} + if args.ext: + evalues['name'] = args.ext + if args.eid: + evalues['id'] = args.eid + if evalues: + join_expressions.append(Book.j.extension) + conditions = mk_search_conditions( + Extension, search_type, case_sensitive, evalues) + join_expressions.extend(conditions) + gvalues = {} + for column in 'name', 'title': + value = getattr(args, 'g' + column) + if value: + gvalues[column] = decode(value) + if args.gid: + gvalues['id'] = args.gid + if gvalues: + join_expressions.append(Book.j.genres) + conditions = mk_search_conditions( + Genre, search_type, case_sensitive, gvalues) + join_expressions.extend(conditions) + lvalues = {} + if args.lang: + lvalues['name'] = args.lang + if args.lid: + lvalues['id'] = args.lid + if lvalues: + join_expressions.append(Book.j.language) + conditions = mk_search_conditions( + 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'), + use_filters=args.filters) + if args.count: + print_count(books.count()) + return + 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) + count = 0 + for book in books: + print(encode(book.title), end=' ') + if args.verbose >= 1: + print("(id=%d)" % book.id, end=' ') + print() + if args.verbose >= 1: + 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)"), ":", + 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"), ":", - print book.series.encode(default_encoding) + print(" ", encode(_("Series")), ":", end=' ') + print(encode(book.series), "(%d)" % book.ser_no) + + if args.verbose >= 2: + print(" ", encode(_("Date")), ":", book.date) + print(" ", encode(_("Language")), ":", encode(book.language.name)) + + if args.verbose >= 3: + 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: + try: + download_to = get_config().get('download', 'path') + except (NoSectionError, NoOptionError): + download_to = os.path.curdir + download(book, download_to, args.path, args.format) + count += 1 + print_count(count) def _search_extensions(case_sensitive, search_type, args): - if args.name: - values = {'name': args.name} - if case_sensitive is None: - case_sensitive = _guess_case_sensitivity(values) + values = _get_values(args, 'name', 'id') + if case_sensitive is None: + case_sensitive = _guess_case_sensitivity(values) else: values = {} - for ext in search_extensions(search_type, case_sensitive, values, - orderBy='name'): - print ext.name.encode(default_encoding), \ - (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding) + extensions = search_extensions(search_type, case_sensitive, values, + orderBy='name') + if args.count: + print_count(extensions.count()) + return + count = 0 + for ext in extensions: + print(encode(ext.name), + encode((u"(%s: %d)" % (_('books'), ext.count))), + end=' ') + if args.verbose >= 1: + print("(id=%d)" % ext.id, end=' ') + print() + count += 1 + print_count(count) def _search_genres(case_sensitive, search_type, args): - values = {} - for column in 'name', 'title': - value = getattr(args, column) - if value: - values[column] = unicode(value, default_encoding) + values = _get_values(args, 'name', 'title', 'id') if case_sensitive is None: case_sensitive = _guess_case_sensitivity(values) - for genre in search_genres(search_type, case_sensitive, values, - orderBy='name'): + genres = search_genres(search_type, case_sensitive, values, orderBy='name') + if args.count: + print_count(genres.count()) + return + count = 0 + 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, end=' ') + print() + count += 1 + print_count(count) def _search_languages(case_sensitive, search_type, args): - if args.name: - values = {'name': args.name} - if case_sensitive is None: - case_sensitive = _guess_case_sensitivity(values) + values = _get_values(args, 'name', 'id') + if case_sensitive is None: + case_sensitive = _guess_case_sensitivity(values) else: values = {} - for lang in search_languages(search_type, case_sensitive, values, - orderBy='name'): - print lang.name.encode(default_encoding), \ - (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding) + languages = search_languages(search_type, case_sensitive, values, + orderBy='name') + if args.count: + print_count(languages.count()) + return + count = 0 + for lang in languages: + print(encode(lang.name), + encode((u"(%s: %d)" % (_('books'), lang.count))), + end=' ') + if args.verbose >= 1: + 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('-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)') @@ -135,12 +300,18 @@ if __name__ == '__main__': help='search substring anywhere') main_parser.add_argument('-f', '--full', action='store_true', 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', default=0, + help='output more details about books; ' + 'repeat for even more details') subparsers = main_parser.add_subparsers(help='Commands') parser = subparsers.add_parser('authors', help='Search authors') 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', type=int, help='search by database id') parser.add_argument('fullname', nargs='?', help='search by full name') parser.set_defaults(func=_search_authors) @@ -149,26 +320,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('-d', '--details', action='count', - help='output more details about books; ' - 'repeat for even more details') + 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', type=int, help='search by author\'s id') + parser.add_argument('-e', '--ext', help='search by file extension') + 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', 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('--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', 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', 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', 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( @@ -198,5 +397,5 @@ if __name__ == '__main__': else: search_type = 'start' - open_db() + open_db(args.database) args.func(case_sensitive, search_type, args)