From 2613e74f97996a754800ab9329e2999589df48d6 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sun, 15 Nov 2020 08:50:49 -0600 Subject: [PATCH] add bas64 encoded thumbnail to the database --- frigate/events.py | 3 ++- frigate/models.py | 1 + frigate/object_processing.py | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frigate/events.py b/frigate/events.py index 7d36d4cfc..a6c7cd9f2 100644 --- a/frigate/events.py +++ b/frigate/events.py @@ -180,7 +180,8 @@ class EventProcessor(threading.Thread): end_time=event_data['end_time'], top_score=event_data['top_score'], false_positive=event_data['false_positive'], - zones=list(event_data['entered_zones']) + zones=list(event_data['entered_zones']), + thumbnail=event_data['thumbnail'] ) if len(self.cached_clips) > 0 and not event_data['false_positive']: diff --git a/frigate/models.py b/frigate/models.py index 2cf5bc697..cef807538 100644 --- a/frigate/models.py +++ b/frigate/models.py @@ -11,3 +11,4 @@ class Event(Model): top_score = FloatField() false_positive = BooleanField() zones = JSONField() + thumbnail = TextField() diff --git a/frigate/object_processing.py b/frigate/object_processing.py index d935be068..266c3c1df 100644 --- a/frigate/object_processing.py +++ b/frigate/object_processing.py @@ -1,4 +1,5 @@ import copy +import base64 import datetime import hashlib import itertools @@ -138,7 +139,7 @@ class TrackedObject(): self.current_zones = current_zones - def to_dict(self): + def to_dict(self, include_thumbnail: bool = False): return { 'id': self.obj_data['id'], 'camera': self.camera, @@ -153,7 +154,8 @@ class TrackedObject(): 'area': self.obj_data['area'], 'region': self.obj_data['region'], 'current_zones': self.current_zones.copy(), - 'entered_zones': list(self.entered_zones).copy() + 'entered_zones': list(self.entered_zones).copy(), + 'thumbnail': base64.b64encode(self.get_jpg_bytes()).decode('utf-8') if include_thumbnail else None } def get_jpg_bytes(self): @@ -405,7 +407,7 @@ class TrackedObjectProcessor(threading.Thread): thumbnail_file_name = f"{camera}-{obj.obj_data['id']}.jpg" with open(os.path.join(self.config.save_clips.clips_dir, thumbnail_file_name), 'wb') as f: f.write(obj.get_jpg_bytes()) - self.event_queue.put(('end', camera, obj.to_dict())) + self.event_queue.put(('end', camera, obj.to_dict(include_thumbnail=True))) def snapshot(camera, obj: TrackedObject): self.client.publish(f"{self.topic_prefix}/{camera}/{obj.obj_data['label']}/snapshot", obj.get_jpg_bytes(), retain=True)