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

Miscellaneous minor fixes to dump_devinfo (#1382)

Browse Source 
Fixes:
 - Decrypted discovery data saved under `discovery_result` instead of `result`
 - `smart` child data not redacted
 - `smartcam` child component list `device_id` not `SCRUBBED`
This commit is contained in:
Steven B. 2024-12-16 13:00:28 +00:00 committed by GitHub
parent 62345be916
commit e206d9b4df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devtools/dump_devinfo.py
View File

@ -329,7 +329,7 @@ async def cli(
) )
discovery_info = raw_discovery[device.host] discovery_info = raw_discovery[device.host]
if decrypted_data := device._discovery_info.get("decrypted_data"): if decrypted_data := device._discovery_info.get("decrypted_data"):
discovery_info["decrypted_data"] = decrypted_data discovery_info["result"]["decrypted_data"] = decrypted_data
await handle_device( await handle_device(
basedir, basedir,
autosave, autosave,
@ -353,7 +353,7 @@ async def cli(
for dev in devices.values(): for dev in devices.values():
discovery_info = raw_discovery[dev.host] discovery_info = raw_discovery[dev.host]
if decrypted_data := dev._discovery_info.get("decrypted_data"): if decrypted_data := dev._discovery_info.get("decrypted_data"):
discovery_info["decrypted_data"] = decrypted_data discovery_info["result"]["decrypted_data"] = decrypted_data
await handle_device( await handle_device(
basedir, basedir,
@ -936,6 +936,7 @@ async def get_smart_fixtures(
and (child_model := response["get_device_info"].get("model")) and (child_model := response["get_device_info"].get("model"))
and child_model != parent_model and child_model != parent_model
): ):
response = redact_data(response, _wrap_redactors(SMART_REDACTORS))
fixture_results.append(get_smart_child_fixture(response)) fixture_results.append(get_smart_child_fixture(response))
else: else:
cd = final.setdefault("child_devices", {}) cd = final.setdefault("child_devices", {})
@ -951,13 +952,16 @@ async def get_smart_fixtures(
child["device_id"] = scrubbed_device_ids[device_id] child["device_id"] = scrubbed_device_ids[device_id]
# Scrub the device ids in the parent for the smart camera protocol # Scrub the device ids in the parent for the smart camera protocol
if gc := final.get("getChildDeviceList"): if gc := final.get("getChildDeviceComponentList"):
for child in gc["child_device_list"]: for child in gc["child_component_list"]:
device_id = child["device_id"]
child["device_id"] = scrubbed_device_ids[device_id]
for child in final["getChildDeviceList"]["child_device_list"]:
if device_id := child.get("device_id"): if device_id := child.get("device_id"):
child["device_id"] = scrubbed_device_ids[device_id] child["device_id"] = scrubbed_device_ids[device_id]
continue continue
if device_id := child.get("dev_id"): elif dev_id := child.get("dev_id"):
child["dev_id"] = scrubbed_device_ids[device_id] child["dev_id"] = scrubbed_device_ids[dev_id]
continue continue
_LOGGER.error("Could not find a device for the child device: %s", child) _LOGGER.error("Could not find a device for the child device: %s", child)