mirror of
https://github.com/malmeloo/FindMy.py.git
synced 2026-04-17 21:53:57 +02:00
Extract rssi/device type, fix crash, and move device printing
This commit is contained in:
@@ -16,27 +16,6 @@ from findmy import (
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
|
||||
def _print_nearby(device: NearbyOfflineFindingDevice) -> None:
|
||||
print(f"NEARBY Device - {device.mac_address}")
|
||||
print(f" Status byte: {device.status:x}")
|
||||
print(" Extra data:")
|
||||
for k, v in sorted(device.additional_data.items()):
|
||||
print(f" {k:20}: {v}")
|
||||
print()
|
||||
|
||||
|
||||
def _print_separated(device: SeparatedOfflineFindingDevice) -> None:
|
||||
print(f"SEPARATED Device - {device.mac_address}")
|
||||
print(f" Public key: {device.adv_key_b64}")
|
||||
print(f" Lookup key: {device.hashed_adv_key_b64}")
|
||||
print(f" Status byte: {device.status:x}")
|
||||
print(f" Hint byte: {device.hint:x}")
|
||||
print(" Extra data:")
|
||||
for k, v in sorted(device.additional_data.items()):
|
||||
print(f" {k:20}: {v}")
|
||||
print()
|
||||
|
||||
|
||||
async def scan(check_key: KeyPair | FindMyAccessory | None = None) -> bool:
|
||||
scanner = await OfflineFindingScanner.create()
|
||||
|
||||
@@ -46,10 +25,8 @@ async def scan(check_key: KeyPair | FindMyAccessory | None = None) -> bool:
|
||||
scan_device = None
|
||||
|
||||
async for device in scanner.scan_for(10, extend_timeout=True):
|
||||
if isinstance(device, NearbyOfflineFindingDevice):
|
||||
_print_nearby(device)
|
||||
elif isinstance(device, SeparatedOfflineFindingDevice):
|
||||
_print_separated(device)
|
||||
if isinstance(device, (SeparatedOfflineFindingDevice, NearbyOfflineFindingDevice)):
|
||||
device.print_device()
|
||||
else:
|
||||
print(f"Unknown device: {device}")
|
||||
print()
|
||||
|
||||
Reference in New Issue
Block a user