Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add API and WebUI to export recordings #6550

Merged
merged 20 commits into from
Jun 8, 2023
Merged

Add API and WebUI to export recordings #6550

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
63d95fa
Add ability to export frigate clips
NickM-27 May 20, 2023
3649dd3
Add http endpoint
NickM-27 May 20, 2023
9c32404
Add dir to nginx
NickM-27 May 20, 2023
b1115fb
Add webUI
NickM-27 May 20, 2023
0111c57
Formatting
NickM-27 May 20, 2023
7a66ffc
Cleanup unused
NickM-27 May 20, 2023
a70ebaa
Optimize timelapse
NickM-27 May 20, 2023
38c5feb
Fix pts
NickM-27 May 20, 2023
3c75272
Use JSON body for params
NickM-27 May 20, 2023
6acfecf
Use hwaccel to encode when available
NickM-27 May 20, 2023
08c89f7
Print ffmpeg command when fail
NickM-27 May 20, 2023
355c9df
Print ffmpeg command when fail
NickM-27 May 20, 2023
6c26217
Add separate ffmpeg preset for timelapse
NickM-27 May 20, 2023
c656f26
Add docs outlining the export directory
NickM-27 May 26, 2023
ca3cb14
Add export docs
NickM-27 May 26, 2023
652d277
Use ''
NickM-27 May 26, 2023
ce2b5ee
Fix playlist max time
NickM-27 May 28, 2023
dd86d6f
Lower max playlist time
NickM-27 May 28, 2023
4a4a745
Add api docs for export
NickM-27 May 28, 2023
73b5129
isort fixes
NickM-27 Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add dir to nginx
  • Loading branch information
@NickM-27
NickM-27 committed Jun 7, 2023
commit 9c32404e91b028bbcb37243ba1ce249db428b00c
21 changes: 21 additions & 0 deletions docker/rootfs/usr/local/nginx/conf/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,27 @@ http {
root /media/frigate;
}

location /exports/ {
add_header 'Access-Control-Allow-Origin' "$http_origin" always;
add_header 'Access-Control-Allow-Credentials' 'true';
add_header 'Access-Control-Expose-Headers' 'Content-Length';
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' "$http_origin";
add_header 'Access-Control-Max-Age' 1728000;
add_header 'Content-Type' 'text/plain charset=UTF-8';
add_header 'Content-Length' 0;
return 204;
}

types {
video/mp4 mp4;
}

autoindex on;
autoindex_format json;
root /media/frigate;
}

location /ws {
proxy_pass http:https://mqtt_ws/;
proxy_http_version 1.1;
Expand Down
2 changes: 0 additions & 2 deletions frigate/record/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ def run(self) -> None:
p = sp.run(
ffmpeg_cmd,
input="\n".join(playlist_lines)
if len(playlist_lines) > 1
else playlist_lines,
encoding="ascii",
capture_output=True,
)
Expand Down