Merge pull request #210 from AGaylord6/feat/extract-scanner-info

Scanner Update

Author: malmeloo

examples/scanner.py

@@ -8,35 +8,12 @@
 from findmy import (
     FindMyAccessory,
     KeyPair,
-    NearbyOfflineFindingDevice,
     OfflineFindingScanner,
-    SeparatedOfflineFindingDevice,
 )
 
 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()
 
@@ -45,16 +22,12 @@ 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)
-        else:
-            print(f"Unknown device: {device}")
-            print()
-            continue
+    scan_out_file = Path("scan_results.jsonl")
+    # Clear previous scan results
+    if scan_out_file.exists():
+        scan_out_file.unlink()
 
+    async for device in scanner.scan_for(10, extend_timeout=True, print_summary=True):
         if check_key and device.is_from(check_key):
             scan_device = device