Hammer on that run_tests.py thing again.

[python_utils.git] / smart_home / cameras.py

diff --git a/smart_home/cameras.py b/smart_home/cameras.py
index e7705b29ab9d5b1ced6723bb94418e0062c259c5..e8f164b3c0a6f1529347c79400b1036623a87d58 100644 (file)
--- a/smart_home/cameras.py
+++ b/smart_home/cameras.py
@@ -5,7 +5,9 @@
 """Utilities for dealing with the webcams."""
 
 import logging
+from typing import Optional
 
+import scott_secrets
 import smart_home.device as dev
 
 logger = logging.getLogger(__name__)
@@ -28,12 +30,13 @@ class BaseCamera(dev.Device):
         super().__init__(name.strip(), mac.strip(), keywords)
         self.camera_name = BaseCamera.camera_mapping.get(name, None)
 
-    def get_stream_url(self) -> str:
+    def get_stream_url(self) -> Optional[str]:
+        """Get the URL for the webcam's live stream.  Return None on error."""
+
         name = self.camera_name
-        assert name is not None
+        if not name:
+            return None
         if name == 'driveway':
-            return 'http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/mjpeg/GKlT2FfiSQ/driveway'
+            return f'http://10.0.0.226:8080/{scott_secrets.SHINOBI_KEY1}/mjpeg/{scott_secrets.SHINOBI_KEY2}/driveway'
         else:
-            return (
-                f'http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/mp4/GKlT2FfiSQ/{name}/s.mp4'
-            )
+            return f'http://10.0.0.226:8080/{scott_secrets.SHINOBI_KEY1}/mp4/{scott_secrets.SHINOBI_KEY2}/{name}/s.mp4'