administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-18 09:04:28 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

camera level notifications in dispatcher

Browse Source
This commit is contained in:
Josh Hawkins 2024-12-16 10:59:19 -06:00
parent abba6d2573
commit c4d59f7a43
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
frigate/comms/dispatcher.py
View File

@ -77,13 +77,14 @@ class Dispatcher:
"motion": self._on_motion_command, "motion": self._on_motion_command,
"motion_contour_area": self._on_motion_contour_area_command, "motion_contour_area": self._on_motion_contour_area_command,
"motion_threshold": self._on_motion_threshold_command, "motion_threshold": self._on_motion_threshold_command,
"notifications": self._on_camera_notification_command,
"recordings": self._on_recordings_command, "recordings": self._on_recordings_command,
"snapshots": self._on_snapshots_command, "snapshots": self._on_snapshots_command,
"birdseye": self._on_birdseye_command, "birdseye": self._on_birdseye_command,
"birdseye_mode": self._on_birdseye_mode_command, "birdseye_mode": self._on_birdseye_mode_command,
} }
self._global_settings_handlers: dict[str, Callable] = { self._global_settings_handlers: dict[str, Callable] = {
"notifications": self._on_notification_command, "notifications": self._on_global_notification_command,
} }
for comm in self.comms: for comm in self.comms:
@ -369,16 +370,18 @@ class Dispatcher:
self.config_updater.publish(f"config/motion/{camera_name}", motion_settings) self.config_updater.publish(f"config/motion/{camera_name}", motion_settings)
self.publish(f"{camera_name}/motion_threshold/state", payload, retain=True) self.publish(f"{camera_name}/motion_threshold/state", payload, retain=True)
def _on_notification_command(self, payload: str) -> None: def _on_global_notification_command(self, payload: str) -> None:
"""Callback for notification topic.""" """Callback for global notification topic."""
if payload != "ON" and payload != "OFF": if payload != "ON" and payload != "OFF":
f"Received unsupported value for notification: {payload}" f"Received unsupported value for all notification: {payload}"
return return
notification_settings = self.config.notifications notification_settings = self.config.notifications
logger.info(f"Setting notifications: {payload}") logger.info(f"Setting all notifications: {payload}")
notification_settings.enabled = payload == "ON" # type: ignore[union-attr] notification_settings.enabled = payload == "ON" # type: ignore[union-attr]
self.config_updater.publish("config/notifications", notification_settings) self.config_updater.publish(
"config/notifications", {"_global_notifications": notification_settings}
)
self.publish("notifications/state", payload, retain=True) self.publish("notifications/state", payload, retain=True)
def _on_audio_command(self, camera_name: str, payload: str) -> None: def _on_audio_command(self, camera_name: str, payload: str) -> None:
@ -495,3 +498,27 @@ class Dispatcher:
self.config_updater.publish(f"config/birdseye/{camera_name}", birdseye_settings) self.config_updater.publish(f"config/birdseye/{camera_name}", birdseye_settings)
self.publish(f"{camera_name}/birdseye_mode/state", payload, retain=True) self.publish(f"{camera_name}/birdseye_mode/state", payload, retain=True)
def _on_camera_notification_command(self, camera_name: str, payload: str) -> None:
"""Callback for camera level notifications topic."""
notification_settings = self.config.cameras[camera_name].notifications
if payload == "ON":
if not self.config.cameras[camera_name].notifications.enabled_in_config:
logger.error(
"Notifications must be enabled in the config to be turned on via MQTT."
)
return
if not notification_settings.enabled:
logger.info(f"Turning on notifications for {camera_name}")
notification_settings.enabled = True
elif payload == "OFF":
if notification_settings.enabled:
logger.info(f"Turning off notifications for {camera_name}")
notification_settings.enabled = False
self.config_updater.publish(
"config/notifications", {camera_name: notification_settings}
)
self.publish(f"{camera_name}/notifications/state", payload, retain=True)

16
frigate/comms/webpush.py
View File

@ -109,14 +109,22 @@ class WebPushClient(Communicator): # type: ignore[misc]
_, updated_notification_config = self.config_subscriber.check_for_update() _, updated_notification_config = self.config_subscriber.check_for_update()
if updated_notification_config: if updated_notification_config:
self.config.notifications = updated_notification_config for key, value in updated_notification_config.items():
if key == "_global_notifications":
self.config.notifications = value
if not self.config.notifications.enabled: elif key in self.config.cameras:
return self.config.cameras[key].notifications = value
if topic == "reviews": if topic == "reviews":
self.send_alert(json.loads(payload)) decoded = json.loads(payload)
camera = payload["after"]["camera"]
if not self.config.cameras[camera].notifications.enabled:
return
self.send_alert(decoded)
elif topic == "notification_test": elif topic == "notification_test":
if not self.config.notifications.enabled:
return
self.send_notification_test() self.send_notification_test()
def send_push_notification( def send_push_notification(