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

Simplify timezone math (#11586)

Browse Source 
* Use utc minutes

* Cleanup
This commit is contained in:
Nicolas Mowen 2024-05-28 08:09:17 -06:00 committed by GitHub
parent 2fda383782
commit 8546d3d315
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/components/player/PreviewPlayer.tsx
View File

@ -10,7 +10,7 @@ import useSWR from "swr";
import { FrigateConfig } from "@/types/frigateConfig"; import { FrigateConfig } from "@/types/frigateConfig";
import { Preview } from "@/types/preview"; import { Preview } from "@/types/preview";
import { PreviewPlayback } from "@/types/playback"; import { PreviewPlayback } from "@/types/playback";
import { getTimestampOffset, isCurrentHour } from "@/utils/dateUtil"; import { isCurrentHour } from "@/utils/dateUtil";
import { baseUrl } from "@/api/baseUrl"; import { baseUrl } from "@/api/baseUrl";
import { isAndroid, isChrome, isMobile } from "react-device-detect"; import { isAndroid, isChrome, isMobile } from "react-device-detect";
import { TimeRange } from "@/types/timeline"; import { TimeRange } from "@/types/timeline";
@ -41,13 +41,11 @@ export default function PreviewPlayer({
const [currentHourFrame, setCurrentHourFrame] = useState<string>(); const [currentHourFrame, setCurrentHourFrame] = useState<string>();
const currentPreview = useMemo(() => { const currentPreview = useMemo(() => {
const timeRangeOffset = getTimestampOffset(timeRange.before);
return cameraPreviews.find( return cameraPreviews.find(
(preview) => (preview) =>
preview.camera == camera && preview.camera == camera &&
Math.round(preview.start) >= timeRange.after + timeRangeOffset && Math.round(preview.start) >= timeRange.after &&
Math.floor(preview.end) <= timeRange.before + timeRangeOffset, Math.floor(preview.end) <= timeRange.before,
); );
}, [cameraPreviews, camera, timeRange]); }, [cameraPreviews, camera, timeRange]);
@ -242,14 +240,11 @@ function PreviewVideoPlayer({
return; return;
} }
// account for minutes offset in timezone
const timeRangeOffset = getTimestampOffset(timeRange.before);
const preview = cameraPreviews.find( const preview = cameraPreviews.find(
(preview) => (preview) =>
preview.camera == camera && preview.camera == camera &&
Math.round(preview.start) >= timeRange.after + timeRangeOffset && Math.round(preview.start) >= timeRange.after &&
Math.floor(preview.end) <= timeRange.before + timeRangeOffset, Math.floor(preview.end) <= timeRange.before,
); );
if (preview != currentPreview) { if (preview != currentPreview) {

10
web/src/pages/Events.tsx
View File

@ -12,7 +12,6 @@ import {
ReviewSummary, ReviewSummary,
SegmentedReviewData, SegmentedReviewData,
} from "@/types/review"; } from "@/types/review";
import { getTimestampOffset } from "@/utils/dateUtil";
import EventView from "@/views/events/EventView"; import EventView from "@/views/events/EventView";
import { RecordingView } from "@/views/events/RecordingView"; import { RecordingView } from "@/views/events/RecordingView";
import axios from "axios"; import axios from "axios";
@ -224,18 +223,15 @@ export default function Events() {
// preview videos // preview videos
const previewTimes = useMemo(() => { const previewTimes = useMemo(() => {
// offset by timezone minutes
const timestampOffset = getTimestampOffset(Date.now() / 1000);
const startDate = new Date(selectedTimeRange.after * 1000); const startDate = new Date(selectedTimeRange.after * 1000);
startDate.setMinutes(0, 0, 0); startDate.setUTCMinutes(0, 0, 0);
const endDate = new Date(selectedTimeRange.before * 1000); const endDate = new Date(selectedTimeRange.before * 1000);
endDate.setHours(endDate.getHours() + 1, 0, 0, 0); endDate.setHours(endDate.getHours() + 1, 0, 0, 0);
return { return {
after: startDate.getTime() / 1000 + timestampOffset, after: startDate.getTime() / 1000,
before: endDate.getTime() / 1000 + timestampOffset, before: endDate.getTime() / 1000,
}; };
}, [selectedTimeRange]); }, [selectedTimeRange]);

15
web/src/utils/dateUtil.ts
View File

@ -269,15 +269,6 @@ export const getUTCOffset = (
); );
}; };
/**
* Gets the minute offset in seconds of the current timezone from UTC.
* Any timezones with an offset in hours will return 0,
* any timezones with an offset of 30 or 45 minutes will return that amount in seconds.
*/
export function getTimestampOffset(timestamp: number) {
return (getUTCOffset(new Date(timestamp * 1000)) % 60) * 60;
}
export function getRangeForTimestamp(timestamp: number) { export function getRangeForTimestamp(timestamp: number) {
const date = new Date(timestamp * 1000); const date = new Date(timestamp * 1000);
date.setMinutes(0, 0, 0); date.setMinutes(0, 0, 0);
@ -301,9 +292,7 @@ export function getEndOfDayTimestamp(date: Date) {
export function isCurrentHour(timestamp: number) { export function isCurrentHour(timestamp: number) {
const now = new Date(); const now = new Date();
now.setMinutes(0, 0, 0); now.setUTCMinutes(0, 0, 0);
const timeShift = getTimestampOffset(timestamp); return timestamp > now.getTime() / 1000;
return timestamp + timeShift > now.getTime() / 1000;
} }

5
web/src/utils/timelineUtil.tsx
View File

@ -131,13 +131,12 @@ export function getChunkedTimeDay(timeRange: TimeRange): TimeRange[] {
endOfThisHour.setSeconds(0, 0); endOfThisHour.setSeconds(0, 0);
const data: TimeRange[] = []; const data: TimeRange[] = [];
const startDay = new Date(timeRange.after * 1000); const startDay = new Date(timeRange.after * 1000);
startDay.setMinutes(0, 0, 0); startDay.setUTCMinutes(0, 0, 0);
let start = startDay.getTime() / 1000; let start = startDay.getTime() / 1000;
let end = 0; let end = 0;
for (let i = 0; i < 24; i++) { for (let i = 0; i < 24; i++) {
startDay.setHours(startDay.getHours() + 1, 0, 0, 0); startDay.setHours(startDay.getHours() + 1);
if (startDay > endOfThisHour) { if (startDay > endOfThisHour) {
break; break;