mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-08 20:25:26 +03:00
initial implementation of review timeline
This commit is contained in:
parent
b960b7c41b
commit
97a3cea308
@ -126,7 +126,7 @@ export default function PreviewThumbnailPlayer({
|
|||||||
playerRef={playerRef}
|
playerRef={playerRef}
|
||||||
review={review}
|
review={review}
|
||||||
relevantPreview={relevantPreview}
|
relevantPreview={relevantPreview}
|
||||||
isVisible={visible}
|
isVisible={isMobile ? visible : true}
|
||||||
isMobile={isMobile}
|
isMobile={isMobile}
|
||||||
setProgress={setProgress}
|
setProgress={setProgress}
|
||||||
setReviewed={setReviewed}
|
setReviewed={setReviewed}
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
import PreviewThumbnailPlayer from "@/components/player/PreviewThumbnailPlayer";
|
import PreviewThumbnailPlayer from "@/components/player/PreviewThumbnailPlayer";
|
||||||
|
import EventReviewTimeline from "@/components/timeline/EventReviewTimeline";
|
||||||
import ActivityIndicator from "@/components/ui/activity-indicator";
|
import ActivityIndicator from "@/components/ui/activity-indicator";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Calendar } from "@/components/ui/calendar";
|
import { Calendar } from "@/components/ui/calendar";
|
||||||
@ -12,7 +13,7 @@ import { FrigateConfig } from "@/types/frigateConfig";
|
|||||||
import { ReviewSegment, ReviewSeverity } from "@/types/review";
|
import { ReviewSegment, ReviewSeverity } from "@/types/review";
|
||||||
import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
|
import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { useCallback, useMemo, useRef, useState } from "react";
|
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||||
import { LuCalendar, LuFilter, LuVideo } from "react-icons/lu";
|
import { LuCalendar, LuFilter, LuVideo } from "react-icons/lu";
|
||||||
import { MdCircle } from "react-icons/md";
|
import { MdCircle } from "react-icons/md";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
@ -23,6 +24,7 @@ const API_LIMIT = 100;
|
|||||||
export default function Events() {
|
export default function Events() {
|
||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
const [severity, setSeverity] = useState<ReviewSeverity>("alert");
|
const [severity, setSeverity] = useState<ReviewSeverity>("alert");
|
||||||
|
const contentRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
|
||||||
// review paging
|
// review paging
|
||||||
|
|
||||||
@ -63,12 +65,15 @@ export default function Events() {
|
|||||||
} = useSWRInfinite<ReviewSegment[]>(getKey, reviewSegmentFetcher);
|
} = useSWRInfinite<ReviewSegment[]>(getKey, reviewSegmentFetcher);
|
||||||
|
|
||||||
const reviewItems = useMemo(() => {
|
const reviewItems = useMemo(() => {
|
||||||
|
const all: ReviewSegment[] = [];
|
||||||
const alerts: ReviewSegment[] = [];
|
const alerts: ReviewSegment[] = [];
|
||||||
const detections: ReviewSegment[] = [];
|
const detections: ReviewSegment[] = [];
|
||||||
const motion: ReviewSegment[] = [];
|
const motion: ReviewSegment[] = [];
|
||||||
|
|
||||||
reviewPages?.forEach((page) => {
|
reviewPages?.forEach((page) => {
|
||||||
page.forEach((segment) => {
|
page.forEach((segment) => {
|
||||||
|
all.push(segment);
|
||||||
|
|
||||||
switch (segment.severity) {
|
switch (segment.severity) {
|
||||||
case "alert":
|
case "alert":
|
||||||
alerts.push(segment);
|
alerts.push(segment);
|
||||||
@ -83,7 +88,12 @@ export default function Events() {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
return { alert: alerts, detection: detections, significant_motion: motion };
|
return {
|
||||||
|
all: all,
|
||||||
|
alert: alerts,
|
||||||
|
detection: detections,
|
||||||
|
significant_motion: motion,
|
||||||
|
};
|
||||||
}, [reviewPages]);
|
}, [reviewPages]);
|
||||||
|
|
||||||
const isDone = useMemo(
|
const isDone = useMemo(
|
||||||
@ -91,18 +101,20 @@ export default function Events() {
|
|||||||
[reviewPages]
|
[reviewPages]
|
||||||
);
|
);
|
||||||
|
|
||||||
const observer = useRef<IntersectionObserver | null>();
|
// review interaction
|
||||||
|
|
||||||
|
const pagingObserver = useRef<IntersectionObserver | null>();
|
||||||
const lastReviewRef = useCallback(
|
const lastReviewRef = useCallback(
|
||||||
(node: HTMLElement | null) => {
|
(node: HTMLElement | null) => {
|
||||||
if (isValidating) return;
|
if (isValidating) return;
|
||||||
if (observer.current) observer.current.disconnect();
|
if (pagingObserver.current) pagingObserver.current.disconnect();
|
||||||
try {
|
try {
|
||||||
observer.current = new IntersectionObserver((entries) => {
|
pagingObserver.current = new IntersectionObserver((entries) => {
|
||||||
if (entries[0].isIntersecting && !isDone) {
|
if (entries[0].isIntersecting && !isDone) {
|
||||||
setSize(size + 1);
|
setSize(size + 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (node) observer.current.observe(node);
|
if (node) pagingObserver.current.observe(node);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// no op
|
// no op
|
||||||
}
|
}
|
||||||
@ -110,6 +122,68 @@ export default function Events() {
|
|||||||
[isValidating, isDone]
|
[isValidating, isDone]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const [minimap, setMinimap] = useState<string[]>([]);
|
||||||
|
const minimapObserver = useRef<IntersectionObserver | null>();
|
||||||
|
useEffect(() => {
|
||||||
|
if (!contentRef.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const visibleTimestamps = new Set<string>();
|
||||||
|
minimapObserver.current = new IntersectionObserver(
|
||||||
|
(entries) => {
|
||||||
|
entries.forEach((entry) => {
|
||||||
|
const start = (entry.target as HTMLElement).dataset.start;
|
||||||
|
|
||||||
|
if (!start) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (entry.isIntersecting) {
|
||||||
|
visibleTimestamps.add(start);
|
||||||
|
} else {
|
||||||
|
visibleTimestamps.delete(start);
|
||||||
|
}
|
||||||
|
|
||||||
|
setMinimap([...visibleTimestamps]);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
{ root: contentRef.current }
|
||||||
|
);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
minimapObserver.current?.disconnect();
|
||||||
|
};
|
||||||
|
}, [contentRef]);
|
||||||
|
const minimapRef = useCallback(
|
||||||
|
(node: HTMLElement | null) => {
|
||||||
|
if (!minimapObserver.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (node) minimapObserver.current.observe(node);
|
||||||
|
} catch (e) {
|
||||||
|
// no op
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[minimapObserver.current]
|
||||||
|
);
|
||||||
|
const minimapBounds = useMemo(() => {
|
||||||
|
const data = {
|
||||||
|
start: Math.floor(Date.now() / 1000) - 35 * 60,
|
||||||
|
end: Math.floor(Date.now() / 1000) - 21 * 60,
|
||||||
|
};
|
||||||
|
const list = minimap.sort();
|
||||||
|
|
||||||
|
if (list.length > 0) {
|
||||||
|
data.end = parseFloat(list.at(-1)!!);
|
||||||
|
data.start = parseFloat(list[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}, [minimap]);
|
||||||
|
|
||||||
// review status
|
// review status
|
||||||
|
|
||||||
const setReviewed = useCallback(
|
const setReviewed = useCallback(
|
||||||
@ -156,8 +230,8 @@ export default function Events() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<div className="relative w-full h-full overflow-hidden">
|
||||||
<div className="w-full flex justify-between">
|
<div className="absolute flex justify-between left-0 top-0 right-0">
|
||||||
<ToggleGroup
|
<ToggleGroup
|
||||||
type="single"
|
type="single"
|
||||||
defaultValue="alert"
|
defaultValue="alert"
|
||||||
@ -208,7 +282,10 @@ export default function Events() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2 mt-2">
|
<div
|
||||||
|
ref={contentRef}
|
||||||
|
className="absolute left-0 top-12 bottom-0 right-28 flex flex-wrap content-start gap-2 overflow-y-auto no-scrollbar"
|
||||||
|
>
|
||||||
{reviewItems[severity]?.map((value, segIdx) => {
|
{reviewItems[severity]?.map((value, segIdx) => {
|
||||||
const lastRow = segIdx == reviewItems[severity].length - 1;
|
const lastRow = segIdx == reviewItems[severity].length - 1;
|
||||||
const relevantPreview = Object.values(allPreviews || []).find(
|
const relevantPreview = Object.values(allPreviews || []).find(
|
||||||
@ -219,11 +296,12 @@ export default function Events() {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div key={value.id}>
|
|
||||||
<div
|
<div
|
||||||
ref={lastRow ? lastReviewRef : null}
|
key={value.id}
|
||||||
className="relative h-[234px] aspect-video rounded-lg overflow-hidden"
|
ref={lastRow ? lastReviewRef : minimapRef}
|
||||||
|
data-start={value.start_time}
|
||||||
>
|
>
|
||||||
|
<div className="h-[234px] aspect-video rounded-lg overflow-hidden">
|
||||||
<PreviewThumbnailPlayer
|
<PreviewThumbnailPlayer
|
||||||
review={value}
|
review={value}
|
||||||
relevantPreview={relevantPreview}
|
relevantPreview={relevantPreview}
|
||||||
@ -236,7 +314,21 @@ export default function Events() {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
</>
|
<div className="absolute top-0 right-0 bottom-0">
|
||||||
|
<EventReviewTimeline
|
||||||
|
segmentDuration={60} // seconds per segment
|
||||||
|
timestampSpread={15} // minutes between each major timestamp
|
||||||
|
timelineStart={Math.floor(Date.now() / 1000)} // start of the timeline - all times are numeric, not Date objects
|
||||||
|
timelineDuration={24 * 60 * 60} // in minutes, defaults to 24 hours
|
||||||
|
showMinimap // show / hide the minimap
|
||||||
|
minimapStartTime={minimapBounds.start} // start time of the minimap - the earlier time (eg 1:00pm)
|
||||||
|
minimapEndTime={minimapBounds.end} // end of the minimap - the later time (eg 3:00pm)
|
||||||
|
events={reviewItems.all} // events, including new has_been_reviewed and severity properties
|
||||||
|
severityType={severity} // choose the severity type for the middle line - all other severity types are to the right
|
||||||
|
contentRef={contentRef} // optional content ref where previews are, can be used for observing/scrolling later
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -117,6 +117,7 @@ function UIPlayground() {
|
|||||||
useMemo(() => {
|
useMemo(() => {
|
||||||
const initialEvents = Array.from({ length: 50 }, generateRandomEvent);
|
const initialEvents = Array.from({ length: 50 }, generateRandomEvent);
|
||||||
setMockEvents(initialEvents);
|
setMockEvents(initialEvents);
|
||||||
|
console.log(initialEvents);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -11,10 +11,11 @@ export interface ReviewSegment {
|
|||||||
|
|
||||||
export type ReviewSeverity = "alert" | "detection" | "significant_motion";
|
export type ReviewSeverity = "alert" | "detection" | "significant_motion";
|
||||||
|
|
||||||
type ReviewData = {
|
export type ReviewData = {
|
||||||
audio: string[];
|
audio: string[];
|
||||||
detections: string[];
|
detections: string[];
|
||||||
objects: string[];
|
objects: string[];
|
||||||
|
sub_labels?: [string, number][];
|
||||||
significant_motion_areas: number[];
|
significant_motion_areas: number[];
|
||||||
zones: string[];
|
zones: string[];
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user