Mirrored_Repos/python-kasa
1
0
Fork 0
mirror of https://github.com/python-kasa/python-kasa.git synced 2024-12-23 03:33:35 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow using alias instead of IP address or hostname (#127)

Browse Source 
* Added option to control devices by device name

* set unused ip address to dont-care

* spend less time discovering by devicename, removed command

* consistent use of alias instead of device name

* processed review comments

* Return when no device with alias has been found
This commit is contained in:
kwazel 2018-08-30 22:22:23 +02:00 committed by Teemu R
parent ab103c3a1a
commit ce89c0d800
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pyHS100/cli.py
View File

@ -24,11 +24,14 @@ pass_dev = click.make_pass_decorator(SmartDevice)
'instead.') 'instead.')
@click.option('--host', envvar="PYHS100_HOST", required=False, @click.option('--host', envvar="PYHS100_HOST", required=False,
help='The host name or IP address of the device to connect to.') help='The host name or IP address of the device to connect to.')
@click.option('--alias', envvar="PYHS100_NAME", required=False,
help='The device name, or alias, of the device to connect to.')
@click.option('--debug/--normal', default=False) @click.option('--debug/--normal', default=False)
@click.option('--bulb', default=False, is_flag=True) @click.option('--bulb', default=False, is_flag=True)
@click.option('--plug', default=False, is_flag=True) @click.option('--plug', default=False, is_flag=True)
@click.pass_context @click.pass_context
def cli(ctx, ip, host, debug, bulb, plug): def cli(ctx, ip, host, alias, debug, bulb, plug):
"""A cli tool for controlling TP-Link smart home plugs.""" """A cli tool for controlling TP-Link smart home plugs."""
if debug: if debug:
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
@ -41,11 +44,20 @@ def cli(ctx, ip, host, debug, bulb, plug):
if ip is not None and host is None: if ip is not None and host is None:
host = ip host = ip
if alias is not None and host is None:
click.echo("Alias is given, using discovery to find host %s" %
alias)
host = find_host_from_alias(alias=alias)
if host:
click.echo("Found hostname is {}".format(host))
else:
click.echo("No device with name {} found".format(alias))
return
if host is None: if host is None:
click.echo("No host name given, trying discovery..") click.echo("No host name given, trying discovery..")
ctx.invoke(discover) ctx.invoke(discover)
return return
else: else:
if not bulb and not plug: if not bulb and not plug:
click.echo("No --bulb nor --plug given, discovering..") click.echo("No --bulb nor --plug given, discovering..")
@ -80,6 +92,21 @@ def discover(ctx, timeout, discover_only):
return found_devs return found_devs
def find_host_from_alias(alias, timeout=1, attempts=3):
"""Discover a device identified by its alias"""
host = None
click.echo("Trying to discover %s using %s attempts of %s seconds" %
(alias, attempts, timeout))
for attempt in range(1, attempts):
click.echo("Attempt %s of %s" % (attempt, attempts))
found_devs = Discover.discover(timeout=timeout).items()
for ip, dev in found_devs:
if dev.alias.lower() == alias.lower():
host = dev.host
return host
return None
@cli.command() @cli.command()
@pass_dev @pass_dev
def sysinfo(dev): def sysinfo(dev):