administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-13 06:35:24 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix comparison and preview retrieval

Browse Source
This commit is contained in:
Nicolas Mowen 2024-06-04 06:35:56 -06:00
parent 6fd5b2c8b7
commit 95385c8aa7
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frigate/api/export.py
View File

@ -155,7 +155,6 @@ def export_delete(id: str):
except psutil.Error: except psutil.Error:
continue continue
logger.error(f"comparing {export.video_path.split('/')[-1]} to {files_in_use}")
if export.video_path.split("/")[-1] in files_in_use: if export.video_path.split("/")[-1] in files_in_use:
return make_response( return make_response(
jsonify( jsonify(

46
frigate/record/export.py
View File

@ -11,6 +11,8 @@ import threading
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
from peewee import DoesNotExist
from frigate.config import FrigateConfig from frigate.config import FrigateConfig
from frigate.const import ( from frigate.const import (
CACHE_DIR, CACHE_DIR,
@ -72,30 +74,32 @@ class RecordingExporter(threading.Thread):
if datetime.datetime.fromtimestamp( if datetime.datetime.fromtimestamp(
self.start_time self.start_time
) < datetime.datetime.now().replace(minute=0, second=0): ) < datetime.datetime.now().astimezone(datetime.timezone.dst).replace(
minute=0, second=0, microsecond=0
):
# has preview mp4 # has preview mp4
preview: Previews = ( try:
Previews.select( preview: Previews = (
Previews.camera, Previews.select(
Previews.path, Previews.camera,
Previews.duration, Previews.path,
Previews.start_time, Previews.duration,
Previews.end_time, Previews.start_time,
) Previews.end_time,
.where(
Previews.start_time.between(self.start_time, self.end_time)
| Previews.end_time.between(self.start_time, self.end_time)
| (
(self.start_time > Previews.start_time)
& (self.end_time < Previews.end_time)
) )
.where(
Previews.start_time.between(self.start_time, self.end_time)
| Previews.end_time.between(self.start_time, self.end_time)
| (
(self.start_time > Previews.start_time)
& (self.end_time < Previews.end_time)
)
)
.where(Previews.camera == self.camera)
.limit(1)
.get()
) )
.where(Previews.camera == self.camera) except DoesNotExist:
.limit(1)
.get()
)
if not preview:
return "" return ""
diff = self.start_time - preview.start_time diff = self.start_time - preview.start_time