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

Include current hour and fix scrubbing bugginess

Browse Source
This commit is contained in:
Nick Mowen 2024-01-13 08:04:32 -07:00
parent f02ef78d03
commit 2d3ff15cc1
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/camera/DynamicCameraImage.tsx
View File

@ -72,7 +72,7 @@ export default function DynamicCameraImage({
}, },
loadTime > loadInterval ? 1 : loadInterval loadTime > loadInterval ? 1 : loadInterval
); );
}, [hasActiveObjects, key]); }, [key]);
return ( return (
<AspectRatio <AspectRatio

5
web/src/utils/historyUtil.ts
View File

@ -108,7 +108,8 @@ export function getTimelineHoursForDay(
allPreviews: Preview[], allPreviews: Preview[],
timestamp: number timestamp: number
): HistoryTimeline { ): HistoryTimeline {
const now = new Date(); const endOfThisHour = new Date();
endOfThisHour.setHours(endOfThisHour.getHours() + 1, 0, 0, 0);
const data: TimelinePlayback[] = []; const data: TimelinePlayback[] = [];
const startDay = new Date(timestamp * 1000); const startDay = new Date(timestamp * 1000);
startDay.setHours(23, 59, 59, 999); startDay.setHours(23, 59, 59, 999);
@ -143,7 +144,7 @@ export function getTimelineHoursForDay(
for (let i = 0; i < 24; i++) { for (let i = 0; i < 24; i++) {
startDay.setHours(startDay.getHours() + 1); startDay.setHours(startDay.getHours() + 1);
if (startDay > now) { if (startDay > endOfThisHour) {
break; break;
} }

12
web/src/views/history/DesktopTimelineView.tsx
View File

@ -126,6 +126,11 @@ export default function DesktopTimelineView({
return; return;
} }
if (timeToSeek && !scrubbing) {
setScrubbing(true);
playerRef.current?.pause();
}
if (timeToSeek && timeToSeek != previewRef.current?.currentTime()) { if (timeToSeek && timeToSeek != previewRef.current?.currentTime()) {
setSeeking(true); setSeeking(true);
previewRef.current?.currentTime(timeToSeek); previewRef.current?.currentTime(timeToSeek);
@ -329,7 +334,7 @@ export default function DesktopTimelineView({
<ActivityScrubber <ActivityScrubber
items={[]} items={[]}
timeBars={ timeBars={
isSelected && selectedPlayback.relevantPreview isSelected
? [ ? [
{ {
time: new Date( time: new Date(
@ -351,11 +356,6 @@ export default function DesktopTimelineView({
return; return;
} }
if (playerRef.current?.paused() == false) {
setScrubbing(true);
playerRef.current?.pause();
}
const seekTimestamp = data.time.getTime() / 1000; const seekTimestamp = data.time.getTime() / 1000;
const seekTime = const seekTime =
seekTimestamp - timeline.relevantPreview.start; seekTimestamp - timeline.relevantPreview.start;