Skip to content

Leverage data from UDP discovery to initialize device structure #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rytilahti merged 6 commits into from
Feb 6, 2021
+7 −3
Merged

Leverage data from UDP discovery to initialize device structure #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47525c4
avoid talking to devices after UDP discovery
Feb 4, 2021
6898453
formatting fix
Feb 5, 2021
339b0db
more formatting
Feb 5, 2021
4e1b1b1
more formatting changes
Feb 5, 2021
285a3be
undo gitignore changes
Feb 5, 2021
a38bb5b
fixing git ignore for black
Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions kasa/cli.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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