System page improvements (#4707)

* Catch case where camera is disabled

* Add ffprobe timeout and catch case where camera is disabled
This commit is contained in:
Nicolas Mowen
2022-12-14 16:20:47 -07:00
committed by GitHub
parent b1ec56de29
commit 43c2761308
3 changed files with 18 additions and 11 deletions

View File

@@ -1178,6 +1178,11 @@ def ffprobe():
{"success": False, "message": f"{camera} is not a valid camera."}, "404"
)
if not current_app.frigate_config.cameras[camera].enabled:
return jsonify(
{"success": False, "message": f"{camera} is not enabled."}, "404"
)
paths = map(
lambda input: input.path,
current_app.frigate_config.cameras[camera].ffmpeg.inputs,

View File

@@ -883,6 +883,8 @@ def ffprobe_stream(path: str) -> sp.CompletedProcess:
clean_path = escape_special_characters(path)
ffprobe_cmd = [
"ffprobe",
"-timeout",
"1000000",
"-print_format",
"json",
"-show_entries",