AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard hw devices: only scan once

Browse Source
This commit is contained in:
SomberNight
2018-03-15 20:03:12 +01:00
parent afa4cbfcbb
commit aabd9f01ee
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/base_wizard.py
View File

@@ -202,14 +202,19 @@ class BaseWizard(object):
# scan devices # scan devices
devices = [] devices = []
devmgr = self.plugins.device_manager devmgr = self.plugins.device_manager
for name, description, plugin in support: try:
try: scanned_devices = devmgr.scan_devices()
# FIXME: side-effect: unpaired_device_info sets client.handler except BaseException as e:
u = devmgr.unpaired_device_infos(None, plugin) devmgr.print_error('error scanning devices: {}'.format(e))
except: else:
devmgr.print_error("error", name) for name, description, plugin in support:
continue try:
devices += list(map(lambda x: (name, x), u)) # FIXME: side-effect: unpaired_device_info sets client.handler
u = devmgr.unpaired_device_infos(None, plugin, devices=scanned_devices)
except BaseException as e:
devmgr.print_error('error getting device infos for {}: {}'.format(name, e))
continue
devices += list(map(lambda x: (name, x), u))
if not devices: if not devices:
msg = ''.join([ msg = ''.join([
_('No hardware device detected.') + '\n', _('No hardware device detected.') + '\n',