Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure output of calibredb list is always sorted

Browse Source
This commit is contained in:
Kovid Goyal 2015-07-23 07:03:37 +05:30
parent f785c132ad
commit 0ebb813f8b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/library/cli.py
View File

@ -70,8 +70,9 @@ def get_db(dbpath, options):
def do_list(db, fields, afields, sort_by, ascending, search_text, line_width, separator, def do_list(db, fields, afields, sort_by, ascending, search_text, line_width, separator,
prefix, limit, for_machine=False): prefix, limit, for_machine=False):
from calibre.utils.terminal import ColoredStream, geometry from calibre.utils.terminal import ColoredStream, geometry
if sort_by: if sort_by is None:
db.sort(sort_by, ascending) ascending = True
db.sort(sort_by or 'id', ascending)
if search_text: if search_text:
db.search(search_text) db.search(search_text)
data = db.get_data_as_dict(prefix, authors_as_string=True, convert_to_local_tz=False) data = db.get_data_as_dict(prefix, authors_as_string=True, convert_to_local_tz=False)
@ -192,7 +193,7 @@ List the books available in the calibre database.
' special field "all" can be used to select all fields.' ' special field "all" can be used to select all fields.'
)%', '.join(sorted(fields))) )%', '.join(sorted(fields)))
parser.add_option('--sort-by', default=None, parser.add_option('--sort-by', default=None,
help=_('The field by which to sort the results.\nAvailable fields: %s\nDefault: %%default')%', '.join(sorted(FIELDS))) help=_('The field by which to sort the results.\nAvailable fields: {0}\nDefault: {1}').format(', '.join(sorted(FIELDS)), 'id'))
parser.add_option('--ascending', default=False, action='store_true', parser.add_option('--ascending', default=False, action='store_true',
help=_('Sort results in ascending order')) help=_('Sort results in ascending order'))
parser.add_option('-s', '--search', default=None, parser.add_option('-s', '--search', default=None,