Let's be explicit with asserts; there was a bug in histogram

[python_utils.git] / smart_home / chromecasts.py

diff --git a/smart_home/chromecasts.py b/smart_home/chromecasts.py
index 7480cecc36826932ba90d69ecc83f70cf1a43a97..bec8461a4d764ce97a812f1af08f4a5087fd8869 100644 (file)
--- a/smart_home/chromecasts.py
+++ b/smart_home/chromecasts.py
@@ -5,45 +5,53 @@
 import atexit
 import datetime
 import logging
+import threading
+from typing import Any, List
 
 import pychromecast
 
-from decorator_utils import memoized
 import smart_home.device as dev
+from decorator_utils import memoized
 
 logger = logging.getLogger(__name__)
 
 
 class BaseChromecast(dev.Device):
-    ccasts = []
+    ccasts: List[Any] = []
     refresh_ts = None
     browser = None
+    lock = threading.Lock()
 
     def __init__(self, name: str, mac: str, keywords: str = "") -> None:
         super().__init__(name.strip(), mac.strip(), keywords)
         ip = self.get_ip()
         now = datetime.datetime.now()
-        if (
+        with BaseChromecast.lock:
+            if (
                 BaseChromecast.refresh_ts is None
                 or (now - BaseChromecast.refresh_ts).total_seconds() > 60
-        ):
-            logger.debug('Refreshing the shared chromecast info list')
-            if BaseChromecast.browser is not None:
-                BaseChromecast.browser.stop_discovery()
-            BaseChromecast.ccasts, BaseChromecast.browser = pychromecast.get_chromecasts(
-                timeout=10.0
-            )
-            atexit.register(BaseChromecast.browser.stop_discovery)
-            BaseChromecast.refresh_ts = now
+            ):
+                logger.debug('Refreshing the shared chromecast info list')
+                if BaseChromecast.browser is not None:
+                    BaseChromecast.browser.stop_discovery()
+                (
+                    BaseChromecast.ccasts,
+                    BaseChromecast.browser,
+                ) = pychromecast.get_chromecasts(timeout=15.0)
+                assert BaseChromecast.browser is not None
+                atexit.register(BaseChromecast.browser.stop_discovery)
+                BaseChromecast.refresh_ts = now
 
         self.cast = None
         for cc in BaseChromecast.ccasts:
-            if cc.cast_info.host == ip:
+            if cc.cast_info.host == ip and cc.cast_info.cast_type != 'group':
                 logger.debug(f'Found chromecast at {ip}: {cc}')
                 self.cast = cc
                 self.cast.wait(timeout=1.0)
         if self.cast is None:
-            raise Exception(f'Can\'t find ccast device at {ip}, is that really a ccast device?')
+            raise Exception(
+                f'Can\'t find ccast device at {ip}, is that really a ccast device?'
+            )
 
     def is_idle(self):
         return self.cast.is_idle
@@ -110,4 +118,3 @@ class BaseChromecast(dev.Device):
             f"Chromecast({self.cast.socket_client.host!r}, port={self.cast.socket_client.port!r}, "
             f"device={self.cast.cast_info.friendly_name!r})"
         )
-