Fix handling of missing -segment_time

This commit is contained in:
George Tsiamasiotis 2024-09-21 13:31:36 +03:00
parent 1959d24908
commit bcdacb3fae
2 changed files with 8 additions and 10 deletions

View File

@ -1359,17 +1359,15 @@ def verify_recording_segments_setup_with_reasonable_time(
if record_args[0].startswith("preset"): if record_args[0].startswith("preset"):
return return
try:
seg_arg_index = record_args.index("-segment_time") seg_arg_index = record_args.index("-segment_time")
except ValueError:
if seg_arg_index < 0: raise ValueError(f"Camera {camera_config.name} has no segment_time in \
raise ValueError( recording output args, segment args are required for record.")
f"Camera {camera_config.name} has no segment_time in recording output args, segment args are required for record."
)
if int(record_args[seg_arg_index + 1]) > 60: if int(record_args[seg_arg_index + 1]) > 60:
raise ValueError( raise ValueError(f"Camera {camera_config.name} has invalid segment_time output arg, \
f"Camera {camera_config.name} has invalid segment_time output arg, segment_time must be 60 or less." segment_time must be 60 or less.")
)
def verify_zone_objects_are_tracked(camera_config: CameraConfig) -> None: def verify_zone_objects_are_tracked(camera_config: CameraConfig) -> None:

View File

@ -134,7 +134,7 @@ class TestFfmpegPresets(unittest.TestCase):
def test_ffmpeg_output_record_not_preset(self): def test_ffmpeg_output_record_not_preset(self):
self.default_ffmpeg["cameras"]["back"]["ffmpeg"]["output_args"]["record"] = ( self.default_ffmpeg["cameras"]["back"]["ffmpeg"]["output_args"]["record"] = (
"-some output" "-some output -segment_time 10"
) )
frigate_config = FrigateConfig(**self.default_ffmpeg) frigate_config = FrigateConfig(**self.default_ffmpeg)
assert "-some output" in ( assert "-some output" in (