Skip to content

Commit

Permalink
Leverage data from UDP discovery to initialize device structure (#132)
Browse files Browse the repository at this point in the history
* avoid talking to devices after UDP discovery

* formatting fix

* more formatting

* more formatting changes

* undo gitignore changes

* fixing git ignore for black

Co-authored-by: dlee1j1 <dlee1j@yahoo.comm>
  • Loading branch information
dlee1j1 and dlee1j1 committed Feb 6, 2021
1 parent 98b40b5 commit d4a361d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 1 addition & 2 deletions kasa/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,12 @@ async def dump_discover(ctx, scrub):
async def discover(ctx, timeout, discover_only, dump_raw):
"""Discover devices in the network."""
target = ctx.parent.params["target"]
click.echo(f"Discovering devices for {timeout} seconds")
click.echo(f"Discovering devices on {target} for {timeout} seconds")
found_devs = await Discover.discover(
target=target, timeout=timeout, return_raw=dump_raw
)
if not discover_only:
for ip, dev in found_devs.items():
await dev.update()
if dump_raw:
click.echo(dev)
continue
Expand Down
2 changes: 1 addition & 1 deletion kasa/discover.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def datagram_received(self, data, addr) -> None:

device_class = Discover._get_device_class(info)
device = device_class(ip)
asyncio.ensure_future(device.update())
device.update_from_discover_info(info)

self.discovered_devices[ip] = device
self.discovered_devices_raw[ip] = info
Expand Down
5 changes: 5 additions & 0 deletions kasa/smartdevice.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@ async def update(self):
# TODO: keep accessible for tests
self._sys_info = self._last_update["system"]["get_sysinfo"]

def update_from_discover_info(self, info):
"""Update state from info from the discover call."""
self._last_update = info
self._sys_info = info["system"]["get_sysinfo"]

@property # type: ignore
@requires_update
def sys_info(self) -> Dict[str, Any]:
Expand Down

0 comments on commit d4a361d

Please sign in to comment.