Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Show bbox on in_progress events (#8785)

Browse Source 
* fix default value in docs

* use default snapshot config for in progress
This commit is contained in:
Blake Blackshear 2023-11-29 23:37:53 +00:00 committed by GitHub
parent 9b003e175d
commit f00ced5a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docs/configuration/index.md
View File

@ -408,7 +408,7 @@ snapshots:
# Optional: print a timestamp on the snapshots (default: shown below) # Optional: print a timestamp on the snapshots (default: shown below)
timestamp: False timestamp: False
# Optional: draw bounding box on the snapshots (default: shown below) # Optional: draw bounding box on the snapshots (default: shown below)
bounding_box: False bounding_box: True
# Optional: crop the snapshot (default: shown below) # Optional: crop the snapshot (default: shown below)
crop: False crop: False
# Optional: height to resize the snapshot to (default: original size) # Optional: height to resize the snapshot to (default: original size)

32
web/src/routes/Events.jsx
View File

@ -123,12 +123,21 @@ export default function Events({ path, ...props }) {
[searchParams] [searchParams]
); );
const { data: ongoingEvents, mutate: refreshOngoingEvents } = useSWR(['events', { in_progress: 1, include_thumbnails: 0 }]); const { data: ongoingEvents, mutate: refreshOngoingEvents } = useSWR([
const { data: eventPages, mutate: refreshEvents, size, setSize, isValidating } = useSWRInfinite(getKey, eventsFetcher); 'events',
{ in_progress: 1, include_thumbnails: 0 },
]);
const {
data: eventPages,
mutate: refreshEvents,
size,
setSize,
isValidating,
} = useSWRInfinite(getKey, eventsFetcher);
const mutate = () => { const mutate = () => {
refreshEvents(); refreshEvents();
refreshOngoingEvents(); refreshOngoingEvents();
} };
const { data: allLabels } = useSWR(['labels']); const { data: allLabels } = useSWR(['labels']);
const { data: allSubLabels } = useSWR(['sub_labels', { split_joined: 1 }]); const { data: allSubLabels } = useSWR(['sub_labels', { split_joined: 1 }]);
@ -283,15 +292,12 @@ export default function Events({ path, ...props }) {
[path, searchParams, setSearchParams] [path, searchParams, setSearchParams]
); );
const onClickFilterSubmitted = useCallback( const onClickFilterSubmitted = useCallback(() => {
() => { if (++searchParams.is_submitted > 1) {
if( ++searchParams.is_submitted > 1 ) { searchParams.is_submitted = -1;
searchParams.is_submitted = -1; }
} onFilter('is_submitted', searchParams.is_submitted);
onFilter('is_submitted', searchParams.is_submitted); }, [searchParams, onFilter]);
},
[searchParams, onFilter]
);
const isDone = (eventPages?.[eventPages.length - 1]?.length ?? 0) < API_LIMIT; const isDone = (eventPages?.[eventPages.length - 1]?.length ?? 0) < API_LIMIT;
@ -918,7 +924,7 @@ function Event({
className="flex-grow-0" className="flex-grow-0"
src={ src={
event.has_snapshot event.has_snapshot
? `${apiHost}api/events/${event.id}/snapshot.jpg` ? `${apiHost}api/events/${event.id}/snapshot.jpg?bbox=1`
: `${apiHost}api/events/${event.id}/thumbnail.jpg` : `${apiHost}api/events/${event.id}/thumbnail.jpg`
} }
alt={`${event.label} at ${((event?.data?.top_score || event.top_score) * 100).toFixed( alt={`${event.label} at ${((event?.data?.top_score || event.top_score) * 100).toFixed(