mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
Support timezones (#11434)
* Handle offset timezones * Fix previews loading * Cleanup * remove unused
This commit is contained in:
parent
bca01cb43c
commit
4c87ef56c7
@ -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 { isCurrentHour } from "@/utils/dateUtil";
|
import { getUTCOffset, 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,11 +41,14 @@ export default function PreviewPlayer({
|
|||||||
const [currentHourFrame, setCurrentHourFrame] = useState<string>();
|
const [currentHourFrame, setCurrentHourFrame] = useState<string>();
|
||||||
|
|
||||||
const currentPreview = useMemo(() => {
|
const currentPreview = useMemo(() => {
|
||||||
|
const timeRangeOffset =
|
||||||
|
(getUTCOffset(new Date(timeRange.before * 1000)) % 60) * 60;
|
||||||
|
|
||||||
return cameraPreviews.find(
|
return cameraPreviews.find(
|
||||||
(preview) =>
|
(preview) =>
|
||||||
preview.camera == camera &&
|
preview.camera == camera &&
|
||||||
Math.round(preview.start) >= timeRange.after &&
|
Math.round(preview.start) >= timeRange.after + timeRangeOffset &&
|
||||||
Math.floor(preview.end) <= timeRange.before,
|
Math.floor(preview.end) <= timeRange.before + timeRangeOffset,
|
||||||
);
|
);
|
||||||
}, [cameraPreviews, camera, timeRange]);
|
}, [cameraPreviews, camera, timeRange]);
|
||||||
|
|
||||||
@ -230,11 +233,14 @@ function PreviewVideoPlayer({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const timeRangeOffset =
|
||||||
|
getUTCOffset(new Date(timeRange.before * 1000)) % 60;
|
||||||
|
|
||||||
const preview = cameraPreviews.find(
|
const preview = cameraPreviews.find(
|
||||||
(preview) =>
|
(preview) =>
|
||||||
preview.camera == camera &&
|
preview.camera == camera &&
|
||||||
Math.round(preview.start) >= timeRange.after &&
|
Math.round(preview.start) >= timeRange.after + timeRangeOffset &&
|
||||||
Math.floor(preview.end) <= timeRange.before,
|
Math.floor(preview.end) <= timeRange.before + timeRangeOffset,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (preview != currentPreview) {
|
if (preview != currentPreview) {
|
||||||
|
@ -12,6 +12,7 @@ import ActivityIndicator from "@/components/indicators/activity-indicator";
|
|||||||
import { VideoResolutionType } from "@/types/live";
|
import { VideoResolutionType } from "@/types/live";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
import { getUTCOffset } from "@/utils/dateUtil";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Dynamically switches between video playback and scrubbing preview player.
|
* Dynamically switches between video playback and scrubbing preview player.
|
||||||
@ -148,9 +149,12 @@ export default function DynamicVideoPlayer({
|
|||||||
// state of playback player
|
// state of playback player
|
||||||
|
|
||||||
const recordingParams = useMemo(() => {
|
const recordingParams = useMemo(() => {
|
||||||
|
const timeRangeOffset =
|
||||||
|
(getUTCOffset(new Date(timeRange.before * 1000)) % 60) * 60;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
before: timeRange.before,
|
before: timeRange.before + timeRangeOffset,
|
||||||
after: timeRange.after,
|
after: timeRange.after + timeRangeOffset,
|
||||||
};
|
};
|
||||||
}, [timeRange]);
|
}, [timeRange]);
|
||||||
const { data: recordings } = useSWR<Recording[]>(
|
const { data: recordings } = useSWR<Recording[]>(
|
||||||
@ -168,7 +172,7 @@ export default function DynamicVideoPlayer({
|
|||||||
}
|
}
|
||||||
|
|
||||||
setSource(
|
setSource(
|
||||||
`${apiHost}vod/${camera}/start/${timeRange.after}/end/${timeRange.before}/master.m3u8`,
|
`${apiHost}vod/${camera}/start/${recordingParams.after}/end/${recordingParams.before}/master.m3u8`,
|
||||||
);
|
);
|
||||||
setLoadingTimeout(setTimeout(() => setIsLoading(true), 1000));
|
setLoadingTimeout(setTimeout(() => setIsLoading(true), 1000));
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@ import {
|
|||||||
ReviewSeverity,
|
ReviewSeverity,
|
||||||
ReviewSummary,
|
ReviewSummary,
|
||||||
} from "@/types/review";
|
} from "@/types/review";
|
||||||
|
import { getUTCOffset } 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";
|
||||||
@ -166,6 +167,8 @@ export default function Events() {
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const timezoneMinuteOffset = (getUTCOffset(new Date()) % 60) * 60;
|
||||||
|
|
||||||
const startDate = new Date();
|
const startDate = new Date();
|
||||||
startDate.setMinutes(0, 0, 0);
|
startDate.setMinutes(0, 0, 0);
|
||||||
|
|
||||||
@ -173,8 +176,8 @@ export default function Events() {
|
|||||||
endDate.setHours(0, 0, 0, 0);
|
endDate.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
after: startDate.getTime() / 1000,
|
after: startDate.getTime() / 1000 + timezoneMinuteOffset,
|
||||||
before: endDate.getTime() / 1000,
|
before: endDate.getTime() / 1000 + timezoneMinuteOffset,
|
||||||
};
|
};
|
||||||
}, [reviews]);
|
}, [reviews]);
|
||||||
|
|
||||||
|
@ -235,7 +235,10 @@ export const getDurationFromTimestamps = (
|
|||||||
* @param timezone string representation of the timezone the user is requesting
|
* @param timezone string representation of the timezone the user is requesting
|
||||||
* @returns number of minutes offset from UTC
|
* @returns number of minutes offset from UTC
|
||||||
*/
|
*/
|
||||||
export const getUTCOffset = (date: Date, timezone: string): number => {
|
export const getUTCOffset = (
|
||||||
|
date: Date,
|
||||||
|
timezone: string = getResolvedTimeZone(),
|
||||||
|
): number => {
|
||||||
// If timezone is in UTC±HH:MM format, parse it to get offset
|
// If timezone is in UTC±HH:MM format, parse it to get offset
|
||||||
const utcOffsetMatch = timezone.match(/^UTC([+-])(\d{2}):(\d{2})$/);
|
const utcOffsetMatch = timezone.match(/^UTC([+-])(\d{2}):(\d{2})$/);
|
||||||
if (utcOffsetMatch) {
|
if (utcOffsetMatch) {
|
||||||
@ -259,10 +262,10 @@ export const getUTCOffset = (date: Date, timezone: string): number => {
|
|||||||
target = new Date(`${iso}+000`);
|
target = new Date(`${iso}+000`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return Math.round(
|
||||||
(target.getTime() - utcDate.getTime() - date.getTimezoneOffset()) /
|
(target.getTime() - utcDate.getTime() - date.getTimezoneOffset()) /
|
||||||
60 /
|
60 /
|
||||||
1000
|
1000,
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ import {
|
|||||||
MdOutlinePictureInPictureAlt,
|
MdOutlinePictureInPictureAlt,
|
||||||
} from "react-icons/md";
|
} from "react-icons/md";
|
||||||
import { FaBicycle } from "react-icons/fa";
|
import { FaBicycle } from "react-icons/fa";
|
||||||
import { endOfHourOrCurrentTime } from "./dateUtil";
|
import { endOfHourOrCurrentTime, getUTCOffset } from "./dateUtil";
|
||||||
import { TimeRange, Timeline } from "@/types/timeline";
|
import { TimeRange, Timeline } from "@/types/timeline";
|
||||||
|
|
||||||
export function getTimelineIcon(timelineItem: Timeline) {
|
export function getTimelineIcon(timelineItem: Timeline) {
|
||||||
@ -131,12 +131,25 @@ 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);
|
const timezoneMinuteOffset =
|
||||||
|
getUTCOffset(new Date(timeRange.before * 1000)) % 60;
|
||||||
|
|
||||||
|
if (timezoneMinuteOffset == 0) {
|
||||||
|
startDay.setMinutes(0, 0, 0);
|
||||||
|
} else {
|
||||||
|
startDay.setSeconds(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,
|
||||||
|
Math.abs(timezoneMinuteOffset),
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
|
||||||
if (startDay > endOfThisHour) {
|
if (startDay > endOfThisHour) {
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user