arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-30 12:48:46 +00:00
Code Issues Releases Wiki Activity

Reworked get_transport for hid/bridge.

Browse Source
This commit is contained in:
slush0 2016-06-30 16:47:17 +02:00
parent 3b4f226d48
commit 39e827a90a
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
trezorctl
View File

@ -65,15 +65,9 @@ def get_transport(transport_string, path, **kwargs):
if transport_string == 'usb': if transport_string == 'usb':
from trezorlib.transport_hid import HidTransport from trezorlib.transport_hid import HidTransport
if path == '':
try:
path = list_usb()[0][0]
except IndexError:
raise Exception("No TREZOR found on USB")
for d in HidTransport.enumerate(): for d in HidTransport.enumerate():
# Two-tuple of (normal_interface, debug_interface) # Two-tuple of (normal_interface, debug_interface)
if path in d: if path == '' or path in d:
return HidTransport(d, **kwargs) return HidTransport(d, **kwargs)
raise Exception("Device not found") raise Exception("Device not found")
@ -88,7 +82,13 @@ def get_transport(transport_string, path, **kwargs):
if transport_string == 'bridge': if transport_string == 'bridge':
from trezorlib.transport_bridge import BridgeTransport from trezorlib.transport_bridge import BridgeTransport
return BridgeTransport({'path': path}, **kwargs)
devices = BridgeTransport.enumerate()
for d in devices:
if path == '' or d['path'] == binascii.hexlify(path):
return BridgeTransport(d, **kwargs)
raise Exception("Device not found")
raise NotImplementedError("Unknown transport") raise NotImplementedError("Unknown transport")

3
trezorlib/transport_bridge.py
View File

@ -2,7 +2,6 @@
import json import json
import requests import requests
import binascii
from . import protobuf_json from . import protobuf_json
from . import messages_pb2 as proto from . import messages_pb2 as proto
from .transport import TransportV1 from .transport import TransportV1
@ -17,7 +16,7 @@ class BridgeTransport(TransportV1):
def __init__(self, device, *args, **kwargs): def __init__(self, device, *args, **kwargs):
self.configure() self.configure()
self.path = binascii.hexlify(device['path']) self.path = device['path']
self.session = None self.session = None
self.response = None self.response = None