From bab1e502a8f6d0574c9368676e0d4547d431bc94 Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Tue, 25 Apr 2023 09:32:49 -0600
Subject: [PATCH] Fix mypy

---
 frigate/record/maintainer.py | 40 +++++++++++++++++++-----------------
 frigate/record/record.py     |  6 ++++--
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/frigate/record/maintainer.py b/frigate/record/maintainer.py
index 974dd3495..b2b467ae6 100644
--- a/frigate/record/maintainer.py
+++ b/frigate/record/maintainer.py
@@ -14,6 +14,7 @@ import psutil
 from collections import defaultdict
 from multiprocessing.synchronize import Event as MpEvent
 from pathlib import Path
+from typing import Any, Tuple
 
 from frigate.config import RetainModeEnum, FrigateConfig
 from frigate.const import CACHE_DIR, MAX_SEGMENT_DURATION, RECORD_DIR
@@ -24,7 +25,6 @@ logger = logging.getLogger(__name__)
 
 
 class RecordingMaintainer(threading.Thread):
-
     def __init__(
         self,
         config: FrigateConfig,
@@ -36,10 +36,10 @@ class RecordingMaintainer(threading.Thread):
         self.config = config
         self.recordings_info_queue = recordings_info_queue
         self.stop_event = stop_event
-        self.recordings_info = defaultdict(list)
-        self.end_time_cache = {}
+        self.recordings_info: dict[str, Any] = defaultdict(list)
+        self.end_time_cache: dict[str, Tuple[datetime.datetime, float]] = {}
 
-    def move_files(self):
+    def move_files(self) -> None:
         cache_files = sorted(
             [
                 d
@@ -64,14 +64,14 @@ class RecordingMaintainer(threading.Thread):
                 continue
 
         # group recordings by camera
-        grouped_recordings = defaultdict(list)
-        for f in cache_files:
+        grouped_recordings: defaultdict[str, list[dict[str, Any]]] = defaultdict(list)
+        for cache in cache_files:
             # Skip files currently in use
-            if f in files_in_use:
+            if cache in files_in_use:
                 continue
 
-            cache_path = os.path.join(CACHE_DIR, f)
-            basename = os.path.splitext(f)[0]
+            cache_path = os.path.join(CACHE_DIR, cache)
+            basename = os.path.splitext(cache)[0]
             camera, date = basename.rsplit("-", maxsplit=1)
             start_time = datetime.datetime.strptime(date, "%Y%m%d%H%M%S")
 
@@ -91,8 +91,8 @@ class RecordingMaintainer(threading.Thread):
                     f"Unable to keep up with recording segments in cache for {camera}. Keeping the {keep_count} most recent segments out of {segment_count} and discarding the rest..."
                 )
                 to_remove = grouped_recordings[camera][:-keep_count]
-                for f in to_remove:
-                    cache_path = f["cache_path"]
+                for rec in to_remove:
+                    cache_path = rec["cache_path"]
                     Path(cache_path).unlink(missing_ok=True)
                     self.end_time_cache.pop(cache_path, None)
                 grouped_recordings[camera] = grouped_recordings[camera][-keep_count:]
@@ -157,7 +157,7 @@ class RecordingMaintainer(threading.Thread):
                     else:
                         if duration == -1:
                             logger.warning(
-                                f"Failed to probe corrupt segment {cache_path}: {p.returncode} - {p.stderr}"
+                                f"Failed to probe corrupt segment {cache_path} : {p.returncode} - {str(p.stderr)}"
                             )
 
                         logger.warning(
@@ -228,7 +228,9 @@ class RecordingMaintainer(threading.Thread):
                         camera, start_time, end_time, duration, cache_path, record_mode
                     )
 
-    def segment_stats(self, camera, start_time, end_time):
+    def segment_stats(
+        self, camera: str, start_time: datetime.datetime, end_time: datetime.datetime
+    ) -> Tuple[int, int]:
         active_count = 0
         motion_count = 0
         for frame in self.recordings_info[camera]:
@@ -253,13 +255,13 @@ class RecordingMaintainer(threading.Thread):
 
     def store_segment(
         self,
-        camera,
+        camera: str,
         start_time: datetime.datetime,
         end_time: datetime.datetime,
-        duration,
-        cache_path,
+        duration: float,
+        cache_path: str,
         store_mode: RetainModeEnum,
-    ):
+    ) -> None:
         motion_count, active_count = self.segment_stats(camera, start_time, end_time)
 
         # check if the segment shouldn't be stored
@@ -350,9 +352,9 @@ class RecordingMaintainer(threading.Thread):
         # clear end_time cache
         self.end_time_cache.pop(cache_path, None)
 
-    def run(self):
+    def run(self) -> None:
         # Check for new files every 5 seconds
-        wait_time = 5
+        wait_time = 5.0
         while not self.stop_event.wait(wait_time):
             run_start = datetime.datetime.now().timestamp()
 
diff --git a/frigate/record/record.py b/frigate/record/record.py
index a63a18a7c..0669479ed 100644
--- a/frigate/record/record.py
+++ b/frigate/record/record.py
@@ -6,6 +6,8 @@ import signal
 import threading
 
 from setproctitle import setproctitle
+from types import FrameType
+from typing import Optional
 
 from playhouse.sqliteq import SqliteQueueDatabase
 
@@ -21,10 +23,10 @@ logger = logging.getLogger(__name__)
 def manage_recordings(
     config: FrigateConfig,
     recordings_info_queue: mp.Queue,
-):
+) -> None:
     stop_event = mp.Event()
 
-    def receiveSignal(signalNumber, frame):
+    def receiveSignal(signalNumber: int, frame: Optional[FrameType]) -> None:
         stop_event.set()
 
     signal.signal(signal.SIGTERM, receiveSignal)