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

prompt user to accept an untrusted keyring (closes #771)

Browse source
This commit is contained in:
Romain Bignon 2015-01-16 12:21:51 +01:00
commit 47232308a9
4 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
weboob/tools/application/console.py
View file

@ -31,7 +31,7 @@ from weboob.capabilities import UserError
from weboob.capabilities.account import CapAccount, Account, AccountRegisterError
from weboob.core.backendscfg import BackendAlreadyExists
from weboob.core.modules import ModuleLoadError
from weboob.core.repositories import ModuleInstallError
from weboob.core.repositories import ModuleInstallError, IProgress
from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, BrowserSSLError
from weboob.tools.value import Value, ValueBool, ValueFloat, ValueInt, ValueBackendPassword
from weboob.tools.misc import to_unicode
@ -55,6 +55,20 @@ class BackendNotFound(Exception):
pass
class ConsoleProgress(IProgress):
def __init__(self, app):
self.app = app
def progress(self, percent, message):
self.app.stdout.write('=== [%3.0f%%] %s\n' % (percent*100, message))
def error(self, message):
self.app.stderr.write('ERROR: %s\n' % message)
def prompt(self, message):
return self.app.ask(message, default=True)
class ConsoleApplication(Application):
"""
Base application class for CLI applications.
@ -289,7 +303,7 @@ class ConsoleApplication(Application):
def install_module(self, name):
try:
self.weboob.repositories.install(name)
self.weboob.repositories.install(name, ConsoleProgress(self))
except ModuleInstallError as e:
print('Unable to install module "%s": %s' % (name, e), file=self.stderr)
return False
@ -564,7 +578,7 @@ class ConsoleApplication(Application):
minfo = self.weboob.repositories.get_module_info(backend.NAME)
if minfo and not minfo.is_local():
self.weboob.repositories.update_repositories()
self.weboob.repositories.update_repositories(ConsoleProgress(self))
# minfo of the new available module
minfo = self.weboob.repositories.get_module_info(backend.NAME)