nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ask: if choices are too long, display a list with labels instead of onliner question

Browse source
This commit is contained in:
Romain Bignon 2010-11-17 20:44:33 +01:00
commit d1596e0487
1 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
weboob/tools/application/repl.py
View file

@ -203,7 +203,7 @@ class ReplApplication(Cmd, BaseApplication):
if not edit:
try:
backend = self.weboob.modules_loader.get_or_load_module(name)
except ModuleLoadError, e:
except ModuleLoadError:
backend = None
else:
bname, items = self.weboob.backends_config.get_backend(name)
@ -293,7 +293,7 @@ class ReplApplication(Cmd, BaseApplication):
loaded = 2
else:
loaded += 1
print '%s%d)%s [%s] %s%-15s%s (%s)' % (self.BOLD, len(backends), self.NC, loaded,
print '%s%d)%s [%s] %s%-15s%s %s' % (self.BOLD, len(backends), self.NC, loaded,
self.BOLD, name, self.NC, backend.description)
print '%sq)%s --stop--\n' % (self.BOLD, self.NC)
r = self.ask('Select a backend to add (q to stop)', regexp='^(\d+|q)$')
@ -972,11 +972,24 @@ class ReplApplication(Cmd, BaseApplication):
if v.id:
question = u'[%s] %s' % (v.id, question)
aliases = {}
if isinstance(v, ValueBool):
question = u'%s (%s/%s)' % (question, 'Y' if v.default else 'y', 'n' if v.default else 'N')
elif v.choices:
question = u'%s (%s)' % (question, ' / '.join((s.upper() if s == v.default else s)
for s in (v.choices.iterkeys())))
tiny = True
for key in v.choices.iterkeys():
if len(key) > 5 or ' ' in key:
tiny = False
break
if tiny:
question = u'%s (%s)' % (question, '/'.join((s.upper() if s == v.default else s)
for s in (v.choices.iterkeys())))
else:
for n, (key, value) in enumerate(v.choices.iteritems()):
print '%s%2d)%s %s' % (self.BOLD, n + 1, self.NC, value)
aliases[str(n + 1)] = key
question = u'%s (choose in list)' % question
elif default not in (None, '') and not v.masked:
question = u'%s [%s]' % (question, v.default)
@ -986,12 +999,25 @@ class ReplApplication(Cmd, BaseApplication):
question += ': '
while True:
line = getpass.getpass(question) if v.masked else raw_input(question)
if v.masked:
line = getpass.getpass(question)
else:
self.stdout.write(question)
self.stdout.flush()
line = self.stdin.readline()
if len(line) == 0:
raise EOFError()
else:
line = line.rstrip('\r\n')
if not line and v.default is not None:
line = v.default
if isinstance(line, str):
line = line.decode('utf-8')
if line in aliases:
line = aliases[line]
try:
v.set_value(line)
except ValueError, e: