Tidy up code/docstrings

This commit is contained in:
zvecr
2022-07-19 00:46:08 +01:00
parent c798395122
commit 819bf2eff8
6 changed files with 151 additions and 81 deletions
+7 -6
View File
@@ -42,14 +42,14 @@ def _list_devices():
"""Dump out available devices
"""
cli.log.info('Available devices:')
devices = XAPClient.list()
for dev in devices:
for dev in XAPClient.devices():
device = XAPClient().connect(dev)
ver = device.version()
data = device.info()
cli.log.info(' %04x:%04x %s %s [API:%s]', dev['vendor_id'], dev['product_id'], dev['manufacturer_string'], dev['product_string'], data['_version']['xap'])
cli.log.info(' %04x:%04x %s %s [API:%s]', dev['vendor_id'], dev['product_id'], dev['manufacturer_string'], dev['product_string'], ver['xap'])
if cli.config.general.verbose:
if cli.args.verbose:
data = device.info()
# TODO: better formatting like 'lsusb -v'?
print_dotted_output(data)
@@ -188,6 +188,7 @@ class XAPShell(cmd.Cmd):
return False
@cli.argument('-v', '--verbose', arg_only=True, action='store_true', help='Turns on verbose output.')
@cli.argument('-d', '--device', help='device to select - uses format <pid>:<vid>.')
@cli.argument('-l', '--list', arg_only=True, action='store_true', help='List available devices.')
@cli.argument('-i', '--interactive', arg_only=True, action='store_true', help='Start interactive shell.')
@@ -200,7 +201,7 @@ def xap(cli):
return _list_devices()
# Connect to first available device
devices = XAPClient.list()
devices = XAPClient.devices()
if not devices:
cli.log.error('No devices found!')
return False