Fix blocking code (#20)

examples/bluetooth_scan_network.py

@@ -1,6 +1,7 @@
 """Example usage of googledevices."""
 import asyncio
 import json
+import time
 import aiohttp
 from googledevices.api.bluetooth import Bluetooth
 from googledevices.api.device_info import DeviceInfo
@@ -31,6 +32,7 @@ async def bluetooth_scan():
             async with aiohttp.ClientSession() as session:
                 googledevices = Bluetooth(LOOP, session, host['host'])
                 await googledevices.scan_for_devices_multi_run()
+                time.sleep(5)
                 await googledevices.get_scan_result()
                 for device in googledevices.devices:
                     mac = device['mac_address']

examples/bluetooth_scan_unit.py

@@ -1,5 +1,6 @@
 """Example usage of googledevices."""
 import asyncio
+import time
 import aiohttp
 from googledevices.api.bluetooth import Bluetooth
 
@@ -11,6 +12,7 @@ async def bluetooth_scan():
     async with aiohttp.ClientSession() as session:
         googledevices = Bluetooth(LOOP, session, IPADDRESS)
         await googledevices.scan_for_devices()  # Start device scan
+        time.sleep(5)
         await googledevices.get_scan_result()  # Returns the result
 
         print("Device info:", googledevices.devices)

googledevices/api/bluetooth.py

@@ -8,7 +8,6 @@
 import logging
 import json
 import socket
-import time
 
 import aiohttp
 import async_timeout
@@ -58,7 +57,7 @@ async def set_discovery_enabled(self):
             _LOGGER.error('Error connecting to %s - %s', self._ipaddress,
                           error)
 
-    async def scan_for_devices(self, sleep=5):
+    async def scan_for_devices(self):
         """Scan for bluetooth devices."""
         endpoint = '/setup/bluetooth/scan'
         data = {"enable": True, "clear_results": True, "timeout": 5}
@@ -74,7 +73,6 @@ async def scan_for_devices(self, sleep=5):
                 aiohttp.ClientError, socket.gaierror) as error:
             _LOGGER.error('Error connecting to %s - %s', self._ipaddress,
                           error)
-        time.sleep(sleep)
 
     async def get_scan_result(self):
         """Scan for bluetooth devices."""

googledevices/cli/commands.py

@@ -1,6 +1,7 @@
 """CLI commands."""
 import asyncio
 import json
+import time
 import click
 import aiohttp
 
@@ -37,6 +38,7 @@ async def bluetooth_scan():
         async with aiohttp.ClientSession() as session:
             googledevices = Bluetooth(LOOP, session, ip_address)
             await googledevices.scan_for_devices()
+            time.sleep(5)
             await googledevices.get_scan_result()
             print(json.dumps(googledevices.devices, indent=4, sort_keys=True))
     LOOP.run_until_complete(bluetooth_scan())
@@ -63,14 +65,15 @@ async def bluetooth_scan():
             googledevices = NetworkScan(LOOP, session)
             result = await googledevices.scan_for_units(ipscope)
         for host in result:
-            if host['assistant']:
+            if host['bluetooth']:
                 async with aiohttp.ClientSession() as session:
                     googledevices = DeviceInfo(LOOP, session, host['host'])
                     await googledevices.get_device_info()
                     ghname = googledevices.device_info.get('name')
                 async with aiohttp.ClientSession() as session:
                     googledevices = Bluetooth(LOOP, session, host['host'])
                     await googledevices.scan_for_devices_multi_run()
+                    time.sleep(5)
                     await googledevices.get_scan_result()
                     for device in googledevices.devices:
                         mac = device['mac_address']