Merge branch 'main' of github.com:NickM-27/swatch

Author: NickM-27

docs/config.md

@@ -67,7 +67,7 @@ cameras:
       # REQUIRED: Name of the zone.
       street:
         # REQUIRED: Coordinates to crop the zone by.
-        # NOTE: The order of the coordinates are: y, y+h, x, x+w starting in the top left corner as 0, 0.
+        # NOTE: The order of the coordinates are: x, y, x+w, y+h starting in the top left corner as 0, 0.
         coordinates: 225, 540, 350, 620
         # REQUIRED: List of objects that may be in this zone. These correspond to
         # the objects list defined previously and are matched by name.

swatch/app.py

@@ -26,6 +26,16 @@ def __init__(self) -> None:
         """Init SwatchApp."""
         print("Starting SwatchApp")
         self.stop_event = multiprocessing.Event()
+        # startup nginx
+        os.system("/usr/local/nginx/sbin/nginx &")
+
+        # startup internal processes
+        self.__init_config__()
+        self.__init_db__()
+        self.__init_processing__()
+        self.__init_snapshot_cleanup__()
+        self.__init_detection_cleanup__()
+        self.__init_web_server__()
 
     def __init_config__(self) -> None:
         """Init SwatchApp with saved config file."""
@@ -90,17 +100,6 @@ def __init_web_server__(self) -> None:
     def start(self) -> None:
         """Start SwatchApp."""
 
-        # startup nginx
-        os.system("/usr/local/nginx/sbin/nginx &")
-
-        # startup internal processes
-        self.__init_config__()
-        self.__init_db__()
-        self.__init_processing__()
-        self.__init_snapshot_cleanup__()
-        self.__init_detection_cleanup__()
-        self.__init_web_server__()
-
         def receiveSignal(signalNumber: int, frame: Optional[FrameType]) -> None:
             self.stop()
             sys.exit()

swatch/snapshot.py

@@ -36,6 +36,7 @@ class SnapshotProcessor:
 
     def __init__(self, config: SwatchConfig) -> None:
         self.config = config
+        self.media_dir = os.environ.get("MEDIA_DIR", CONST_MEDIA_DIR)
 
     def save_snapshot(
         self,
@@ -47,7 +48,7 @@ def save_snapshot(
         """Saves the file snapshot to the correct snapshot dir."""
         time = datetime.datetime.now()
 
-        file_dir = f"{CONST_MEDIA_DIR}/snapshots/{time.strftime('%m-%d')}/{camera_name}"
+        file_dir = f"{self.media_dir}/snapshots/{time.strftime('%m-%d')}/{camera_name}"
 
         if not os.path.exists(file_dir):
             print(f"{file_dir} doesn't exist, creating...")
@@ -87,10 +88,10 @@ def save_snapshot(
 
     def get_detection_snapshot(self, detection: Detection) -> Any:
         """Get file snapshot for a specific detection."""
-        file_dir = f"{CONST_MEDIA_DIR}/snapshots/{datetime.datetime.fromtimestamp(detection.start_time).strftime('%m-%d')}/{detection.camera}"
+        file_dir = f"{self.media_dir}/snapshots/{datetime.datetime.fromtimestamp(detection.start_time).strftime('%m-%d')}/{detection.camera}"
 
         if not os.path.exists(file_dir):
-            file_dir = f"{CONST_MEDIA_DIR}/snapshots/{datetime.datetime.fromtimestamp(detection.end_time).strftime('%m-%d')}/{detection.camera}"
+            file_dir = f"{self.media_dir}/snapshots/{datetime.datetime.fromtimestamp(detection.end_time).strftime('%m-%d')}/{detection.camera}"
 
         if not os.path.exists(file_dir):
             return None
@@ -142,7 +143,7 @@ def get_latest_zone_snapshot(
 
     def get_latest_detection_snapshot(self, camera_name: str) -> Any:
         """Get the latest file snapshot for a <camera_name> detection."""
-        snaps_dir = f"{CONST_MEDIA_DIR}/snapshots"
+        snaps_dir = f"{self.media_dir}/snapshots"
         recent_folder = max(
             [os.path.join(snaps_dir, basename) for basename in os.listdir(snaps_dir)]
         )
@@ -173,6 +174,7 @@ def __init__(
         threading.Thread.__init__(self)
         self.name = "snapshot_cleanup"
         self.config = config
+        self.media_dir = os.environ.get("MEDIA_DIR", CONST_MEDIA_DIR)
         self.stop_event = stop_event
 
     def cleanup_snapshots(self, camera_config: CameraConfig):
@@ -182,9 +184,9 @@ def cleanup_snapshots(self, camera_config: CameraConfig):
         )
         valid_month, _, valid_day = retain_days_ago.strftime("%m-%d").partition("-")
 
-        for snap_dir in os.listdir(f"{CONST_MEDIA_DIR}/snapshots/"):
+        for snap_dir in os.listdir(f"{self.media_dir}/snapshots/"):
             if not os.path.isdir(
-                os.path.join(f"{CONST_MEDIA_DIR}/snapshots/", snap_dir)
+                os.path.join(f"{self.media_dir}/snapshots/", snap_dir)
             ):
                 continue
 
@@ -193,11 +195,11 @@ def cleanup_snapshots(self, camera_config: CameraConfig):
 
             if month == valid_month and valid_day >= day:
                 delete_dir(
-                    f"{CONST_MEDIA_DIR}/snapshots/{month}-{day}", camera_config.name
+                    f"{self.media_dir}/snapshots/{month}-{day}", camera_config.name
                 )
             elif valid_month > month and (int(day) - int(valid_day)) <= 24:
                 delete_dir(
-                    f"{CONST_MEDIA_DIR}/snapshots/{month}-{day}", camera_config.name
+                    f"{self.media_dir}/snapshots/{month}-{day}", camera_config.name
                 )
 
     def run(self):