Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-30 04:22:40 +01:00
Code Issues Projects Releases Wiki Activity

Override implicit OR explicit default if require=True for input_option().

Browse source
This commit is contained in:
Tai Lee 2013-02-06 12:43:08 +11:00
parent 976bc20900
commit 8e38e5ae84
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
beets/ui/__init__.py
View file

@ -134,10 +134,9 @@ def input_options(options, require=False, prompt=None, fallback_prompt=None,
a particular shortcut is desired; in that case, only that letter
should be capitalized.
By default, the first option is the default. If `require` is
provided, then there is no default. `default` can be provided to
override this. The prompt and fallback prompt are also inferred but
can be overridden.
By default, the first option is the default. `default` can be provided to
override this. If `require` is provided, then there is no default. The
prompt and fallback prompt are also inferred but can be overridden.
If numrange is provided, it is a pair of `(high, low)` (both ints)
indicating that, in addition to `options`, the user may enter an
@ -173,9 +172,9 @@ def input_options(options, require=False, prompt=None, fallback_prompt=None,
index = option.index(found_letter)
# Mark the option's shortcut letter for display.
if (not require and default is None and not numrange and first) \
or (isinstance(default, basestring) and
found_letter.lower() == default.lower()):
if not require and ((default is None and not numrange and first) or
(isinstance(default, basestring) and
found_letter.lower() == default.lower())):
# The first option is the default; mark it.
show_letter = '[%s]' % found_letter.upper()
is_default = True
@ -196,10 +195,10 @@ def input_options(options, require=False, prompt=None, fallback_prompt=None,
first = False
# The default is just the first option if unspecified.
if default is None:
if require:
default = None
elif numrange:
if require:
default = None
elif default is None:
if numrange:
default = numrange[0]
else:
default = display_letters[0].lower()