X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fml-search.py;h=4757628807985ed55ade487dab79e5df88059762;hb=87957f1a6b6e55664837f6493981094868b76cc1;hp=fa85f9097b93fb7ef9fc30ae18a2b1560684204a;hpb=315ee1386d04a3ff44088b19d9ce1c1d79218111;p=m_librarian.git diff --git a/scripts/ml-search.py b/scripts/ml-search.py index fa85f90..4757628 100755 --- a/scripts/ml-search.py +++ b/scripts/ml-search.py @@ -5,8 +5,9 @@ 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.db import Author, Book, Extension, Language, open_db +from m_librarian.search import mk_search_conditions, \ + search_authors, search_books, \ search_extensions, search_genres, search_languages from m_librarian.translations import translations @@ -20,7 +21,7 @@ def _guess_case_sensitivity(values): return False -def _search_authors(case_sensitive, args): +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") @@ -42,7 +43,7 @@ def _search_authors(case_sensitive, args): )) if case_sensitive is None: case_sensitive = _guess_case_sensitivity(values) - for author in search_authors(args.search_type, case_sensitive, 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)) @@ -51,18 +52,37 @@ def _search_authors(case_sensitive, args): (u"(%s: %d)" % (_('books'), author.count)).encode(default_encoding) -def _search_books(case_sensitive, args): +def _search_books(case_sensitive, search_type, args): values = {} + join_expressions = [] for column in 'title', 'series', 'archive', 'file': value = getattr(args, column) if value: values[column] = unicode(value, default_encoding) if case_sensitive is None: - case_sensitive = _guess_case_sensitivity(values) - for book in search_books(args.search_type, case_sensitive, values, - orderBy='title'): + test_values = values.copy() + for column in 'ext', 'lang': + value = getattr(args, column) + if value: + test_values[column] = unicode(value, default_encoding) + case_sensitive = _guess_case_sensitivity(test_values) + if args.ext: + join_expressions.append(Book.j.extension) + conditions = mk_search_conditions( + Extension, search_type, case_sensitive, + {'name': args.ext}) + join_expressions.extend(conditions) + if args.lang: + join_expressions.append(Book.j.language) + conditions = mk_search_conditions( + Language, search_type, case_sensitive, + {'name': args.lang}) + join_expressions.extend(conditions) + for book in search_books(search_type, case_sensitive, values, + join_expressions, + orderBy=('series', 'ser_no', 'title')): print book.title.encode(default_encoding) - if args.details > 0: + if args.details >= 1: print " ", _("Author(s)"), ":", for author in book.authors: names = filter(None, @@ -70,22 +90,41 @@ def _search_books(case_sensitive, args): fullname = u' '.join(names) print fullname.encode(default_encoding), print + print " ", _("Genre(s)"), ":", + for genre in book.genres: + print (genre.title or genre.name).encode(default_encoding), + print + if book.series: + print " ", _("Series"), ":", + print book.series.encode(default_encoding), \ + "(%d)" % book.ser_no + + if args.details >= 2: + print " ", _("Date"), ":", book.date + print " ", _("Language"), ":", book.language.name + if args.details >= 3: + print " ", _("Archive"), ":", book.archive + print " ", _("File"), ":", book.file + print " ", _("Extension"), ":", book.extension.name + print " ", _("Size"), ":", book.size, _("bytes") + print " ", _("Deleted"), ":", _(str(book.deleted)) -def _search_extensions(case_sensitive, args): + +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) else: values = {} - for ext in search_extensions(args.search_type, case_sensitive, 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) -def _search_genres(case_sensitive, args): +def _search_genres(case_sensitive, search_type, args): values = {} for column in 'name', 'title': value = getattr(args, column) @@ -93,7 +132,7 @@ def _search_genres(case_sensitive, args): values[column] = unicode(value, default_encoding) if case_sensitive is None: case_sensitive = _guess_case_sensitivity(values) - for genre in search_genres(args.search_type, case_sensitive, values, + for genre in search_genres(search_type, case_sensitive, values, orderBy='name'): names = filter(None, (genre.name, genre.title)) fullname = u' '.join(names) @@ -101,14 +140,14 @@ def _search_genres(case_sensitive, args): (u"(%s: %d)" % (_('books'), genre.count)).encode(default_encoding) -def _search_languages(case_sensitive, args): +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) else: values = {} - for lang in search_languages(args.search_type, case_sensitive, 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) @@ -116,19 +155,18 @@ def _search_languages(case_sensitive, args): if __name__ == '__main__': main_parser = argparse.ArgumentParser(description='Search') - main_parser.add_argument('-i', '--ignore-case', - action='store_true', + main_parser.add_argument('-i', '--ignore-case', action='store_true', help='ignore case ' '(default is to guess)') - main_parser.add_argument('-I', '--case-sensitive', - action='store_true', - help='don\'t ignore case ') - main_parser.add_argument('-t', '--search-type', - choices=['exact', 'start', 'substring'], - default='start', - help='search type: ' - 'exact match, substring at the start ' - '(this is the default), substring anywhere') + main_parser.add_argument('-I', '--case-sensitive', action='store_true', + help='don\'t ignore case') + main_parser.add_argument('-t', '--start', action='store_true', + help='search substring at the start ' + '(this is the default)') + main_parser.add_argument('-s', '--substring', action='store_true', + help='search substring anywhere') + main_parser.add_argument('-f', '--full', action='store_true', + help='match the entire string') subparsers = main_parser.add_subparsers(help='Commands') parser = subparsers.add_parser('authors', help='Search authors') @@ -146,6 +184,8 @@ if __name__ == '__main__': parser.add_argument('-d', '--details', action='count', help='output more details about books; ' 'repeat for even more details') + parser.add_argument('-e', '--ext', help='search by file extension') + parser.add_argument('-l', '--lang', help='search by language') parser.set_defaults(func=_search_books) parser = subparsers.add_parser('ext', help='Search extensions') @@ -162,6 +202,7 @@ if __name__ == '__main__': parser.set_defaults(func=_search_languages) args = main_parser.parse_args() + if args.case_sensitive: if args.ignore_case: sys.stderr.write( @@ -175,5 +216,21 @@ if __name__ == '__main__': case_sensitive = False else: case_sensitive = None # guess case sensitivity + + if int(args.start) + int(args.substring) + int(args.full) > 1: + sys.stderr.write( + "Cannot search case sensitive and case insensitive " + "at the same time\n") + main_parser.print_help() + sys.exit(1) + if args.start: + search_type = 'start' + elif args.substring: + search_type = 'substring' + elif args.full: + search_type = 'full' + else: + search_type = 'start' + open_db() - args.func(case_sensitive, args) + args.func(case_sensitive, search_type, args)