Mypy fixes

This commit is contained in:
Nick Mowen 2023-04-25 09:04:53 -06:00
parent 34767270bd
commit 06b08e1a77
2 changed files with 18 additions and 10 deletions

View File

@ -8,6 +8,7 @@ import threading
from pathlib import Path from pathlib import Path
from peewee import DoesNotExist from peewee import DoesNotExist
from multiprocessing.synchronize import Event as MpEvent
from frigate.config import RetainModeEnum, FrigateConfig from frigate.config import RetainModeEnum, FrigateConfig
from frigate.const import RECORD_DIR, SECONDS_IN_DAY from frigate.const import RECORD_DIR, SECONDS_IN_DAY
@ -18,13 +19,15 @@ logger = logging.getLogger(__name__)
class RecordingCleanup(threading.Thread): class RecordingCleanup(threading.Thread):
def __init__(self, config: FrigateConfig, stop_event): """Cleanup existing recordings based on retention config."""
def __init__(self, config: FrigateConfig, stop_event: MpEvent) -> None:
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.name = "recording_cleanup" self.name = "recording_cleanup"
self.config = config self.config = config
self.stop_event = stop_event self.stop_event = stop_event
def clean_tmp_clips(self): def clean_tmp_clips(self) -> None:
# delete any clips more than 5 minutes old # delete any clips more than 5 minutes old
for p in Path("/tmp/cache").rglob("clip_*.mp4"): for p in Path("/tmp/cache").rglob("clip_*.mp4"):
logger.debug(f"Checking tmp clip {p}.") logger.debug(f"Checking tmp clip {p}.")
@ -36,7 +39,7 @@ class RecordingCleanup(threading.Thread):
pass pass
p.unlink(missing_ok=True) p.unlink(missing_ok=True)
def expire_recordings(self): def expire_recordings(self) -> None:
logger.debug("Start expire recordings (new).") logger.debug("Start expire recordings (new).")
logger.debug("Start deleted cameras.") logger.debug("Start deleted cameras.")
@ -151,7 +154,7 @@ class RecordingCleanup(threading.Thread):
logger.debug("End all cameras.") logger.debug("End all cameras.")
logger.debug("End expire recordings (new).") logger.debug("End expire recordings (new).")
def expire_files(self): def expire_files(self) -> None:
logger.debug("Start expire files (legacy).") logger.debug("Start expire files (legacy).")
default_expire = ( default_expire = (
@ -197,7 +200,7 @@ class RecordingCleanup(threading.Thread):
logger.debug("End expire files (legacy).") logger.debug("End expire files (legacy).")
def sync_recordings(self): def sync_recordings(self) -> None:
logger.debug("Start sync recordings.") logger.debug("Start sync recordings.")
# get all recordings in the db # get all recordings in the db
@ -228,7 +231,7 @@ class RecordingCleanup(threading.Thread):
logger.debug("End sync recordings.") logger.debug("End sync recordings.")
def run(self): def run(self) -> None:
# on startup sync recordings with disk (disabled due to too much CPU usage) # on startup sync recordings with disk (disabled due to too much CPU usage)
# self.sync_recordings() # self.sync_recordings()

View File

@ -9,11 +9,12 @@ import random
import string import string
import subprocess as sp import subprocess as sp
import threading import threading
from collections import defaultdict
from pathlib import Path
import psutil import psutil
from collections import defaultdict
from multiprocessing.synchronize import Event as MpEvent
from pathlib import Path
from frigate.config import RetainModeEnum, FrigateConfig from frigate.config import RetainModeEnum, FrigateConfig
from frigate.const import CACHE_DIR, MAX_SEGMENT_DURATION, RECORD_DIR from frigate.const import CACHE_DIR, MAX_SEGMENT_DURATION, RECORD_DIR
from frigate.models import Event, Recordings from frigate.models import Event, Recordings
@ -23,8 +24,12 @@ logger = logging.getLogger(__name__)
class RecordingMaintainer(threading.Thread): class RecordingMaintainer(threading.Thread):
def __init__( def __init__(
self, config: FrigateConfig, recordings_info_queue: mp.Queue, stop_event self,
config: FrigateConfig,
recordings_info_queue: mp.Queue,
stop_event: MpEvent,
): ):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.name = "recording_maint" self.name = "recording_maint"