arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-17 03:48:09 +00:00
Code Issues Releases Wiki Activity

update trezorctl to use prefix search correctly

Browse Source 
first, try exact path
second, try prefix search
last, fail :) with reporting used path (for people like me who forget to unset TREZOR_PATH
This commit is contained in:
matejcik 2018-03-02 18:24:05 +01:00
parent 6519657808
commit 2a706a751a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
trezorctl
View File

@ -29,7 +29,7 @@ import os
import sys import sys
from trezorlib.client import TrezorClient, TrezorClientVerbose, CallException from trezorlib.client import TrezorClient, TrezorClientVerbose, CallException
from trezorlib.device import TrezorDevice from trezorlib.transport import get_transport, enumerate_devices, TransportException
from trezorlib import messages as proto from trezorlib import messages as proto
from trezorlib import protobuf from trezorlib import protobuf
from trezorlib.coins import coins_txapi from trezorlib.coins import coins_txapi
@ -72,9 +72,24 @@ CHOICE_OUTPUT_SCRIPT_TYPE = ChoiceType({
def cli(ctx, path, verbose, is_json): def cli(ctx, path, verbose, is_json):
if ctx.invoked_subcommand != 'list': if ctx.invoked_subcommand != 'list':
if verbose: if verbose:
ctx.obj = lambda: TrezorClientVerbose(TrezorDevice.find_by_path(path)) cls = TrezorClientVerbose
else: else:
ctx.obj = lambda: TrezorClient(TrezorDevice.find_by_path(path)) cls = TrezorClient
def get_device():
try:
device = get_transport(path, prefix_search=False)
except:
try:
device = get_transport(path, prefix_search=True)
except:
click.echo("Failed to find a TREZOR device.")
if path is not None:
click.echo("Using path: {}".format(path))
sys.exit(1)
return cls(device)
ctx.obj = get_device
@cli.resultcallback() @cli.resultcallback()
@ -106,7 +121,7 @@ def print_result(res, path, verbose, is_json):
@cli.command(name='list', help='List connected TREZOR devices.') @cli.command(name='list', help='List connected TREZOR devices.')
def ls(): def ls():
return TrezorDevice.enumerate() return enumerate_devices()
@cli.command(help='Show version of trezorctl/trezorlib.') @cli.command(help='Show version of trezorctl/trezorlib.')