X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=b35d7eba546c375b85eaf8ad72d24db172c1ff9e;hb=2792dae0b23c3fe2f982651cdb31db622615ec81;hp=5e26ab5fdb7424c300bead413aad9e34c984eb56;hpb=cf773e9ae70a7a1cbdd27e234db3834c3c07d649;p=m_librarian.git diff --git a/scripts/ml-search.py b/scripts/ml-search.py index 5e26ab5..b35d7eb 100755 --- a/scripts/ml-search.py +++ b/scripts/ml-search.py @@ -30,6 +30,10 @@ def _guess_case_sensitivity(values): return False +def print_count(count): + print _("Found").encode(default_encoding), ":", 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( @@ -37,7 +41,7 @@ def _search_authors(case_sensitive, search_type, args): main_parser.print_help() sys.exit(1) expressions = [] - values = _get_values(args, 'surname', 'name', 'misc_name') + values = _get_values(args, 'surname', 'name', 'misc_name', 'id') if not values: value = args.fullname if value: @@ -51,17 +55,20 @@ def _search_authors(case_sensitive, search_type, args): authors = search_authors(search_type, case_sensitive, values, expressions, orderBy=('surname', 'name', 'misc_name')) if args.count: - print authors.count() + print_count(authors.count()) 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), - if args.details >= 1: + if args.verbose >= 1: print "(id=%d)" % author.id, print + count += 1 + print_count(count) def _search_books(case_sensitive, search_type, args): @@ -129,14 +136,15 @@ def _search_books(case_sensitive, search_type, args): books = search_books(search_type, case_sensitive, values, join_expressions, orderBy=('series', 'ser_no', 'title')) if args.count: - print books.count() + print_count(books.count()) return + count = 0 for book in books: print book.title.encode(default_encoding), - if args.details >= 1: + if args.verbose >= 1: print "(id=%d)" % book.id, print - if args.details >= 1: + if args.verbose >= 1: print " ", _("Author(s)").encode(default_encoding), ":", for author in book.authors: names = filter(None, @@ -153,12 +161,12 @@ def _search_books(case_sensitive, search_type, args): print book.series.encode(default_encoding), \ "(%d)" % book.ser_no - if args.details >= 2: + if args.verbose >= 2: print " ", _("Date").encode(default_encoding), ":", book.date print " ", _("Language").encode(default_encoding), ":", \ book.language.name.encode(default_encoding) - if args.details >= 3: + if args.verbose >= 3: print " ", _("Archive").encode(default_encoding), ":", book.archive print " ", _("File").encode(default_encoding), ":", book.file print " ", _("Extension").encode(default_encoding), ":", \ @@ -167,64 +175,78 @@ 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) + 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 = {} extensions = search_extensions(search_type, case_sensitive, values, orderBy='name') if args.count: - print extensions.count() + print_count(extensions.count()) return + count = 0 for ext in extensions: print ext.name.encode(default_encoding), \ (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding), - if args.details >= 1: + if args.verbose >= 1: print "(id=%d)" % ext.id, print + count += 1 + print_count(count) def _search_genres(case_sensitive, search_type, args): - values = _get_values(args, 'name', 'title') + values = _get_values(args, 'name', 'title', 'id') if case_sensitive is None: case_sensitive = _guess_case_sensitivity(values) genres = search_genres(search_type, case_sensitive, values, orderBy='name') if args.count: - print genres.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), - if args.details >= 1: + if args.verbose >= 1: print "(id=%d)" % genre.id, 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'): + 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 lang.name.encode(default_encoding), \ (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding), - if args.details >= 1: + if args.verbose >= 1: print "(id=%d)" % lang.id, 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('-i', '--ignore-case', action='store_true', help='ignore case ' '(default is to guess)') @@ -237,17 +259,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('-d', '--details', action='count', - help='output more details about books; ' - 'repeat for even more details') main_parser.add_argument('-c', '--count', action='store_true', help='count instead of output') + main_parser.add_argument('-v', '--verbose', action='count', + 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', help='search by database id') parser.add_argument('fullname', nargs='?', help='search by full name') parser.set_defaults(func=_search_authors) @@ -273,15 +296,18 @@ if __name__ == '__main__': 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.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.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.set_defaults(func=_search_languages) args = main_parser.parse_args() @@ -315,5 +341,5 @@ if __name__ == '__main__': else: search_type = 'start' - open_db() + open_db(args.database) args.func(case_sensitive, search_type, args)