浏览代码

default save_clips objects

Blake Blackshear 4 年之前
父节点
当前提交
62728ef7fb
共有 2 个文件被更改,包括 5 次插入7 次删除
  1. 1 1
      frigate/config.py
  2. 4 6
      frigate/events.py

+ 1 - 1
frigate/config.py

@@ -459,7 +459,7 @@ class CameraSaveClipsConfig():
     def __init__(self, global_config, config):
         self._enabled = config['enabled']
         self._pre_capture = config['pre_capture']
-        self._objects = config.get('objects')
+        self._objects = config.get('objects', global_config['objects']['track'])
         self._retain = SaveClipsRetainConfig(global_config['save_clips']['retain'], config['retain'])
     
     @property

+ 4 - 6
frigate/events.py

@@ -170,12 +170,10 @@ class EventProcessor(threading.Thread):
                 continue
 
             # if specific objects are listed for this camera, only save clips for them
-            # TODO: default to all tracked objects rather than checking for None
-            if save_clips_config.objects:
-                if not event_data['label'] in save_clips_config.objects:
-                    if event_type == 'end':
-                        self.event_processed_queue.put((event_data['id'], camera))
-                    continue
+            if not event_data['label'] in save_clips_config.objects:
+                if event_type == 'end':
+                    self.event_processed_queue.put((event_data['id'], camera))
+                continue
 
             if event_type == 'start':
                 self.events_in_process[event_data['id']] = event_data