From 21f00b3858293f06ddceb02da375ea0aed3dc03f Mon Sep 17 00:00:00 2001 From: Chris OBryan <13701027+cobryan05@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:26:55 -0500 Subject: [PATCH] Format changes with Black --- frigate/comms/dispatcher.py | 4 ++-- frigate/util.py | 2 +- frigate/video.py | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py index ba5cd1c08..2c8b26ed2 100644 --- a/frigate/comms/dispatcher.py +++ b/frigate/comms/dispatcher.py @@ -98,14 +98,14 @@ class Dispatcher: def _on_capture_command(self, camera_name: str, payload: str) -> None: """Callback for detect topic.""" logger.info(f"Received capture command [{payload}] for [{camera_name}]") - capture_proc = self.camera_metrics[camera_name]['capture_process'] + capture_proc = self.camera_metrics[camera_name]["capture_process"] # Send SIGUSR1 to resume, SIGUSR2 to pause new_state = True if payload == "ON" else False if payload == "OFF" else None if new_state is not None: sig = signal.SIGUSR1 if new_state else signal.SIGUSR2 self.config.cameras[camera_name].capture_enabled = new_state - os.kill( capture_proc.pid, sig ) + os.kill(capture_proc.pid, sig) self.publish(f"{camera_name}/capture/state", payload, retain=True) def _on_detect_command(self, camera_name: str, payload: str) -> None: diff --git a/frigate/util.py b/frigate/util.py index 4b3a56671..e284e3b1f 100755 --- a/frigate/util.py +++ b/frigate/util.py @@ -641,7 +641,7 @@ def terminate_process( proc: sp.Popen, logger_inst: logging.Logger = None, timeout: float = 30.0 ): logger_inst = logger_inst or logger - if proc is not None and proc.poll() == None: + if proc is not None and proc.poll() is None: proc_name: str = proc.args[0] logger_inst.info(f"Terminating the existing {proc_name} process...") proc.terminate() diff --git a/frigate/video.py b/frigate/video.py index a08f66a46..eb191cf3f 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -113,10 +113,11 @@ def create_tensor_input(frame, model_config, region): # Expand dimensions since the model expects images to have shape: [1, height, width, 3] return np.expand_dims(cropped_frame, axis=0) + def start_or_restart_ffmpeg( ffmpeg_cmd, logger, logpipe: LogPipe, frame_size=None, ffmpeg_process=None ): - terminate_process( ffmpeg_process, logger_inst=logger ) + terminate_process(ffmpeg_process, logger_inst=logger) if frame_size is None: process = sp.Popen( @@ -386,12 +387,12 @@ def capture_camera(name, config: CameraConfig, process_info): def receiveSignal(signalNumber, frame): logger.info(f"{name} Received signal {signalNumber}") - sig_queue.put( signalNumber ) + sig_queue.put(signalNumber) if signalNumber in (stop_sigs + pause_sigs): stop_event.set() signal.signal(signal.SIGTERM, receiveSignal) - signal.signal(signal.SIGINT, receiveSignal) + signal.signal(signal.SIGINT, receiveSignal) signal.signal(signal.SIGUSR1, receiveSignal) signal.signal(signal.SIGUSR2, receiveSignal) @@ -407,7 +408,7 @@ def capture_camera(name, config: CameraConfig, process_info): # Pause here until stopped or resumed while not sig_queue.empty() or prev_sig not in resume_sigs: # Abort on a STOP signal - if( prev_sig := sig_queue.get() ) in stop_sigs: + if (prev_sig := sig_queue.get()) in stop_sigs: break logger.info(f"{name}: capture starting")