LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-05 05:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DeviceMgr: scan_devices can work without hid

Browse source
This commit is contained in:
SomberNight 2018-03-16 00:55:45 +01:00
parent aabd9f01ee
commit c0ae266d39
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/plugins.py
View file

@ -506,17 +506,15 @@ class DeviceMgr(ThreadJob, PrintError):
handler.win.wallet.save_keystore() handler.win.wallet.save_keystore()
return info return info
def scan_devices(self): def _scan_devices_with_hid(self):
# All currently supported hardware libraries use hid, so we try:
# assume it here. This can be easily abstracted if necessary. import hid
# Note this import must be local so those without hardware except ImportError:
# wallet libraries are not affected. return []
import hid
self.print_error("scanning devices...")
with self.hid_lock: with self.hid_lock:
hid_list = hid.enumerate(0, 0) hid_list = hid.enumerate(0, 0)
# First see what's connected that we know about
devices = [] devices = []
for d in hid_list: for d in hid_list:
product_key = (d['vendor_id'], d['product_id']) product_key = (d['vendor_id'], d['product_id'])
@ -530,6 +528,13 @@ class DeviceMgr(ThreadJob, PrintError):
id_ += str(interface_number) + str(usage_page) id_ += str(interface_number) + str(usage_page)
devices.append(Device(d['path'], interface_number, devices.append(Device(d['path'], interface_number,
id_, product_key, usage_page)) id_, product_key, usage_page))
return devices
def scan_devices(self):
self.print_error("scanning devices...")
# First see what's connected that we know about
devices = self._scan_devices_with_hid()
# Let plugin handlers enumerate devices we don't know about # Let plugin handlers enumerate devices we don't know about
for f in self.enumerate_func: for f in self.enumerate_func:
@ -541,7 +546,7 @@ class DeviceMgr(ThreadJob, PrintError):
else: else:
devices.extend(new_devices) devices.extend(new_devices)
# Now find out what was disconnected # find out what was disconnected
pairs = [(dev.path, dev.id_) for dev in devices] pairs = [(dev.path, dev.id_) for dev in devices]
disconnected_ids = [] disconnected_ids = []
with self.lock: with self.lock: