from m_lib.defenc import default_encoding
from m_librarian.db import Author, open_db
from m_librarian.search import search_authors, search_extensions, \
- search_genres
+ search_genres, search_languages
from m_librarian.translations import translations
_ = translations.ugettext
if case_sensitive is None:
case_sensitive = _guess_case_sensitivity(values)
for author in search_authors(args.search_type, case_sensitive, values,
- expressions):
+ 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), \
def _search_extensions(case_sensitive, args):
- values = {'name': args.name}
- if case_sensitive is None:
- case_sensitive = _guess_case_sensitivity(values)
- for ext in search_extensions(args.search_type, case_sensitive, values):
+ 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,
+ orderBy='name'):
print ext.name.encode(default_encoding), \
(u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding)
def _search_genres(case_sensitive, args):
values = {}
- expressions = []
for column in 'name', 'title':
value = getattr(args, column)
if value:
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(args.search_type, case_sensitive, values,
+ orderBy='name'):
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)
+def _search_languages(case_sensitive, 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,
+ orderBy='name'):
+ print lang.name.encode(default_encoding), \
+ (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding)
+
+
if __name__ == '__main__':
main_parser = argparse.ArgumentParser(description='Search')
main_parser.add_argument('-i', '--ignore-case',
parser.set_defaults(func=_search_authors)
parser = subparsers.add_parser('ext', help='Search extensions')
- parser.add_argument('name', help='search by name')
+ parser.add_argument('name', nargs='?', help='search by name')
parser.set_defaults(func=_search_extensions)
parser = subparsers.add_parser('genres', help='Search genres')
parser.add_argument('-t', '--title', help='search by title')
parser.set_defaults(func=_search_genres)
+ parser = subparsers.add_parser('lang', help='Search languages')
+ parser.add_argument('name', nargs='?', help='search by name')
+ parser.set_defaults(func=_search_languages)
+
args = main_parser.parse_args()
if args.case_sensitive:
if args.ignore_case: