X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=camera_utils.py;h=63ab7f813eeb16f76da2f4589469e1f8b414b189;hb=2966ecdb8c49266d491a1f75791868920d68a510;hp=9e17c4263f844b921f8b35e5152e3d49be310a2b;hpb=ceeb92a63c65599ec4e8b21549ec5320378aca43;p=python_utils.git

diff --git a/camera_utils.py b/camera_utils.py
index 9e17c42..63ab7f8 100644
--- a/camera_utils.py
+++ b/camera_utils.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+# © Copyright 2021-2022, Scott Gasch
+
 """Utilities for dealing with webcam images."""
 
 import logging
@@ -15,6 +17,7 @@ import requests
 
 import decorator_utils
 import exceptions
+import scott_secrets
 
 logger = logging.getLogger(__name__)
 
@@ -65,11 +68,10 @@ def fetch_camera_image_from_video_server(
     camera_name: str, *, width: int = 256, quality: int = 70
 ) -> Optional[bytes]:
     """Fetch the raw webcam image from the video server."""
+
     camera_name = camera_name.replace(".house", "")
     camera_name = camera_name.replace(".cabin", "")
-    url = (
-        f"http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/jpeg/GKlT2FfiSQ/{camera_name}/s.jpg"
-    )
+    url = f"http://10.0.0.226:8080/{scott_secrets.SHINOBI_KEY1}/jpeg/{scott_secrets.SHINOBI_KEY2}/{camera_name}/s.jpg"
     logger.debug('Fetching image from %s', url)
     try:
         response = requests.get(url, stream=False, timeout=10.0)
@@ -116,8 +118,8 @@ def camera_name_to_hostname(camera_name: str) -> str:
 
     >>> camera_name_to_hostname('cabin_driveway')
     'driveway.cabin'
-
     """
+
     mapping = {
         "driveway": "driveway.house",
         "backyard": "backyard.house",
@@ -135,8 +137,9 @@ def camera_name_to_hostname(camera_name: str) -> str:
 @decorator_utils.retry_if_none(tries=2, delay_sec=1, backoff=1.1)
 def fetch_camera_image_from_rtsp_stream(camera_name: str, *, width: int = 256) -> Optional[bytes]:
     """Fetch the raw webcam image straight from the webcam's RTSP stream."""
+
     hostname = camera_name_to_hostname(camera_name)
-    stream = f"rtsp://camera:IaLaIok@{hostname}:554/live"
+    stream = f"rtsp://camera:{scott_secrets.CAMERA_PASSWORD}@{hostname}:554/live"
     logger.debug('Fetching image from RTSP stream %s', stream)
     try:
         cmd = [
@@ -169,7 +172,10 @@ def fetch_camera_image_from_rtsp_stream(camera_name: str, *, width: int = 256) -
 @decorator_utils.timeout(seconds=30, use_signals=False)
 def _fetch_camera_image(camera_name: str, *, width: int = 256, quality: int = 70) -> RawJpgHsv:
     """Fetch a webcam image given the camera name."""
+
     logger.debug("Trying to fetch camera image from video server")
+    if camera_name == 'frontdoor':
+        camera_name = 'front_door'
     raw = fetch_camera_image_from_video_server(camera_name, width=width, quality=quality)
     if raw is None:
         logger.debug("Reading from video server failed; trying direct RTSP stream")
@@ -190,6 +196,8 @@ def _fetch_camera_image(camera_name: str, *, width: int = 256, quality: int = 70
 
 
 def fetch_camera_image(camera_name: str, *, width: int = 256, quality: int = 70) -> RawJpgHsv:
+    """Fetch an image given the camera_name."""
+
     try:
         return _fetch_camera_image(camera_name, width=width, quality=quality)
     except exceptions.TimeoutError: