Nicer CLI help output

This commit is contained in:
Kovid Goyal 2017-12-15 14:49:42 +05:30
parent 1f093b4ff2
commit d3059c09e0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -35,7 +35,6 @@ type=list
default={config_path} default={config_path}
Specify a path to the configuration file(s) to use. Specify a path to the configuration file(s) to use.
Can be specified multiple times to read multiple configuration files in sequence, which are merged. Can be specified multiple times to read multiple configuration files in sequence, which are merged.
Default: |_ %default|
--override -o --override -o
@ -62,7 +61,7 @@ Detach from the controlling terminal, if any
--window-layout --window-layout
type=choices type=choices
choices={window_layout_choices} choices={window_layout_choices}
The window layout to use on startup. Choices are: {window_layout_choices} The window layout to use on startup.
--session --session
@ -281,9 +280,17 @@ def print_help_for_seq(seq, usage, message, appname):
a('{}:'.format(title(opt))) a('{}:'.format(title(opt)))
continue continue
a(' ' + ', '.join(map(green, sorted(opt['aliases'])))) a(' ' + ', '.join(map(green, sorted(opt['aliases']))))
if not opt.get('type', '').startswith('bool-'):
blocks[-1] += '={}'.format(italic(opt['dest'].upper()))
if opt.get('help'): if opt.get('help'):
t = opt['help'].replace('%default', str(opt.get('default'))) defval = opt.get('default')
wa(prettify(t), indent=4) t = opt['help'].replace('%default', str(defval))
wa(prettify(t.strip()), indent=4)
if defval is not None:
wa('Default: {}'.format(defval), indent=4)
if 'choices' in opt:
wa('Choices: {}'.format(', '.join(opt['choices'])), indent=4)
a('')
text = '\n'.join(blocks) + '\n\n' + version() text = '\n'.join(blocks) + '\n\n' + version()
if sys.stdout.isatty(): if sys.stdout.isatty():