Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-26 19:06:11 +01:00
Code Issues Projects Releases Wiki Activity

Correctly handle camera command in dispatcher (#14273)

Browse Source
This commit is contained in:
Josh Hawkins 2024-10-10 19:48:56 -05:00 committed by GitHub
parent 30b5faebae
commit ee8091ba91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frigate/comms/dispatcher.py
View File

@ -91,14 +91,14 @@ class Dispatcher:
def _receive(self, topic: str, payload: str) -> Optional[Any]: def _receive(self, topic: str, payload: str) -> Optional[Any]:
"""Handle receiving of payload from communicators.""" """Handle receiving of payload from communicators."""
def handle_camera_command(command_type, camera_name, payload): def handle_camera_command(command_type, camera_name, command, payload):
try: try:
if command_type == "set": if command_type == "set":
self._camera_settings_handlers[camera_name](camera_name, payload) self._camera_settings_handlers[command](camera_name, payload)
elif command_type == "ptz": elif command_type == "ptz":
self._on_ptz_command(camera_name, payload) self._on_ptz_command(camera_name, payload)
except KeyError: except KeyError:
logger.error(f"Invalid command type: {command_type}") logger.error(f"Invalid command type or handler: {command_type}")
def handle_restart(): def handle_restart():
restart_frigate() restart_frigate()
@ -203,14 +203,14 @@ class Dispatcher:
# example /cam_name/detect/set payload=ON|OFF # example /cam_name/detect/set payload=ON|OFF
camera_name = parts[-3] camera_name = parts[-3]
command = parts[-2] command = parts[-2]
handle_camera_command("set", camera_name, payload) handle_camera_command("set", camera_name, command, payload)
elif len(parts) == 2 and topic.endswith("set"): elif len(parts) == 2 and topic.endswith("set"):
command = parts[-2] command = parts[-2]
self._global_settings_handlers[command](payload) self._global_settings_handlers[command](payload)
elif len(parts) == 2 and topic.endswith("ptz"): elif len(parts) == 2 and topic.endswith("ptz"):
# example /cam_name/ptz payload=MOVE_UP|MOVE_DOWN|STOP... # example /cam_name/ptz payload=MOVE_UP|MOVE_DOWN|STOP...
camera_name = parts[-2] camera_name = parts[-2]
handle_camera_command("ptz", camera_name, payload) handle_camera_command("ptz", camera_name, "", payload)
except IndexError: except IndexError:
logger.error( logger.error(
f"Received invalid {topic.split('/')[-1]} command: {topic}" f"Received invalid {topic.split('/')[-1]} command: {topic}"