administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-08 20:25:26 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Ensure safe filename and improve sorting

Browse Source
This commit is contained in:
Nicolas Mowen 2024-02-23 09:01:01 -07:00
parent a3460712c6
commit dab15233b7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frigate/http.py
View File

@ -2300,9 +2300,10 @@ def preview_hour(year_month, day, hour, camera_name, tz_name):
@bp.route("/preview/<file_name>/thumbnail.jpg") @bp.route("/preview/<file_name>/thumbnail.jpg")
def preview_thumbnail(file_name: str): def preview_thumbnail(file_name: str):
"""Get a thumbnail from the cached preview jpgs.""" """Get a thumbnail from the cached preview jpgs."""
safe_file_name_current = secure_filename(export_filename_check_extension(file_name))
preview_dir = os.path.join(CACHE_DIR, "preview_frames") preview_dir = os.path.join(CACHE_DIR, "preview_frames")
with open(os.path.join(preview_dir, file_name), "rb") as image_file: with open(os.path.join(preview_dir, safe_file_name_current), "rb") as image_file:
jpg_bytes = image_file.read() jpg_bytes = image_file.read()
response = make_response(jpg_bytes) response = make_response(jpg_bytes)
@ -2414,6 +2415,7 @@ def review():
review = ( review = (
ReviewSegment.select() ReviewSegment.select()
.where(reduce(operator.and_, clauses)) .where(reduce(operator.and_, clauses))
.order_by(ReviewSegment.severity.asc())
.order_by(ReviewSegment.start_time.desc()) .order_by(ReviewSegment.start_time.desc())
.limit(limit) .limit(limit)
.dicts() .dicts()