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

Improve preview loading #11469

Merged
merged 2 commits into from
May 21, 2024
Merged

Improve preview loading #11469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2498f4
Improve preview loading
NickM-27 May 21, 2024
c9050b5
Ensure it works when selecting dates
NickM-27 May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 1 addition & 24 deletions web/src/hooks/use-camera-previews.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,8 @@ export function useCameraPreviews(
fetchPreviews
? `preview/${camera}/start/${Math.round(timeRange.after)}/end/${Math.round(timeRange.before)}`
: null,
{ revalidateOnFocus: false, revalidateOnReconnect: false },
{ revalidateOnFocus: autoRefresh, revalidateOnReconnect: autoRefresh },
);

// Set a timeout to update previews on the hour
useEffect(() => {
if (!autoRefresh || !fetchPreviews || !allPreviews) {
return;
}

const callback = () => {
const nextPreviewStart = new Date(
allPreviews[allPreviews.length - 1].end * 1000,
);
nextPreviewStart.setHours(nextPreviewStart.getHours() + 1);

if (Date.now() > nextPreviewStart.getTime()) {
setTimeRange({ after: timeRange.after, before: Date.now() / 1000 });
}
};
document.addEventListener("focusin", callback);

return () => {
document.removeEventListener("focusin", callback);
};
}, [allPreviews, autoRefresh, fetchPreviews, timeRange]);

return allPreviews;
}
12 changes: 4 additions & 8 deletions web/src/pages/Events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,24 +163,20 @@ export default function Events() {

// preview videos
const previewTimes = useMemo(() => {
if (!reviews || reviews.length == 0) {
return undefined;
}

// offset by timezone minutes
const timestampOffset = getTimestampOffset(Date.now() / 1000);

const startDate = new Date();
const startDate = new Date(selectedTimeRange.after * 1000);
startDate.setMinutes(0, 0, 0);

const endDate = new Date(reviews.at(-1)?.end_time || 0);
endDate.setHours(0, 0, 0, 0);
const endDate = new Date(selectedTimeRange.before * 1000);
endDate.setHours(endDate.getHours() + 1, 0, 0, 0);

return {
after: startDate.getTime() / 1000 + timestampOffset,
before: endDate.getTime() / 1000 + timestampOffset,
};
}, [reviews]);
}, [selectedTimeRange]);

const allPreviews = useCameraPreviews(
previewTimes ?? { after: 0, before: 0 },
Expand Down