mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-05-09 15:05:26 +03:00
Compare commits
3 Commits
dd9497baf2
...
e8b9225175
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e8b9225175 | ||
|
|
119137c4fe | ||
|
|
9cbd80d981 |
@ -105,9 +105,9 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
|
|||||||
# install legacy and standard intel icd and level-zero-gpu
|
# install legacy and standard intel icd and level-zero-gpu
|
||||||
# see https://github.com/intel/compute-runtime/blob/master/LEGACY_PLATFORMS.md for more info
|
# see https://github.com/intel/compute-runtime/blob/master/LEGACY_PLATFORMS.md for more info
|
||||||
# needed core package
|
# needed core package
|
||||||
wget https://github.com/intel/compute-runtime/releases/download/24.52.32224.5/libigdgmm12_22.5.5_amd64.deb
|
wget https://github.com/intel/compute-runtime/releases/download/25.13.33276.19/libigdgmm12_22.7.0_amd64.deb
|
||||||
dpkg -i libigdgmm12_22.5.5_amd64.deb
|
dpkg -i libigdgmm12_22.7.0_amd64.deb
|
||||||
rm libigdgmm12_22.5.5_amd64.deb
|
rm libigdgmm12_22.7.0_amd64.deb
|
||||||
|
|
||||||
# legacy packages
|
# legacy packages
|
||||||
wget https://github.com/intel/compute-runtime/releases/download/24.35.30872.36/intel-opencl-icd-legacy1_24.35.30872.36_amd64.deb
|
wget https://github.com/intel/compute-runtime/releases/download/24.35.30872.36/intel-opencl-icd-legacy1_24.35.30872.36_amd64.deb
|
||||||
@ -115,18 +115,19 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
|
|||||||
wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-opencl_1.0.17537.24_amd64.deb
|
wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-opencl_1.0.17537.24_amd64.deb
|
||||||
wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-core_1.0.17537.24_amd64.deb
|
wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-core_1.0.17537.24_amd64.deb
|
||||||
# standard packages
|
# standard packages
|
||||||
wget https://github.com/intel/compute-runtime/releases/download/24.52.32224.5/intel-opencl-icd_24.52.32224.5_amd64.deb
|
wget https://github.com/intel/compute-runtime/releases/download/25.13.33276.19/intel-opencl-icd_25.13.33276.19_amd64.deb
|
||||||
wget https://github.com/intel/compute-runtime/releases/download/24.52.32224.5/intel-level-zero-gpu_1.6.32224.5_amd64.deb
|
wget https://github.com/intel/compute-runtime/releases/download/25.13.33276.19/intel-level-zero-gpu_1.6.33276.19_amd64.deb
|
||||||
wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.5.6/intel-igc-opencl-2_2.5.6+18417_amd64.deb
|
wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.10.10/intel-igc-opencl-2_2.10.10+18926_amd64.deb
|
||||||
wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.5.6/intel-igc-core-2_2.5.6+18417_amd64.deb
|
wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.10.10/intel-igc-core-2_2.10.10+18926_amd64.deb
|
||||||
# npu packages
|
# npu packages
|
||||||
wget https://github.com/oneapi-src/level-zero/releases/download/v1.21.9/level-zero_1.21.9+u22.04_amd64.deb
|
wget https://github.com/oneapi-src/level-zero/releases/download/v1.28.2/level-zero_1.28.2+u22.04_amd64.deb
|
||||||
wget https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-driver-compiler-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb
|
wget https://github.com/intel/linux-npu-driver/releases/download/v1.19.0/intel-driver-compiler-npu_1.19.0.20250707-16111289554_ubuntu22.04_amd64.deb
|
||||||
wget https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-fw-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb
|
wget https://github.com/intel/linux-npu-driver/releases/download/v1.19.0/intel-fw-npu_1.19.0.20250707-16111289554_ubuntu22.04_amd64.deb
|
||||||
wget https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-level-zero-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb
|
wget https://github.com/intel/linux-npu-driver/releases/download/v1.19.0/intel-level-zero-npu_1.19.0.20250707-16111289554_ubuntu22.04_amd64.deb
|
||||||
|
|
||||||
dpkg -i *.deb
|
dpkg -i *.deb
|
||||||
rm *.deb
|
rm *.deb
|
||||||
|
apt-get -qq install -f -y
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${TARGETARCH}" == "arm64" ]]; then
|
if [[ "${TARGETARCH}" == "arm64" ]]; then
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
"""Recording APIs."""
|
"""Recording APIs."""
|
||||||
|
|
||||||
|
import datetime as dt
|
||||||
import logging
|
import logging
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from functools import reduce
|
from functools import reduce
|
||||||
@ -97,45 +98,22 @@ def all_recordings_summary(
|
|||||||
days: dict[str, bool] = {}
|
days: dict[str, bool] = {}
|
||||||
|
|
||||||
for period_start, period_end, period_offset in dst_periods:
|
for period_start, period_end, period_offset in dst_periods:
|
||||||
hours_offset = int(period_offset / 60 / 60)
|
day_expr = ((Recordings.start_time + period_offset) / 86400).cast("int")
|
||||||
minutes_offset = int(period_offset / 60 - hours_offset * 60)
|
|
||||||
period_hour_modifier = f"{hours_offset} hour"
|
|
||||||
period_minute_modifier = f"{minutes_offset} minute"
|
|
||||||
|
|
||||||
period_query = (
|
period_query = (
|
||||||
Recordings.select(
|
Recordings.select(day_expr.alias("day_idx"))
|
||||||
fn.strftime(
|
|
||||||
"%Y-%m-%d",
|
|
||||||
fn.datetime(
|
|
||||||
Recordings.start_time,
|
|
||||||
"unixepoch",
|
|
||||||
period_hour_modifier,
|
|
||||||
period_minute_modifier,
|
|
||||||
),
|
|
||||||
).alias("day")
|
|
||||||
)
|
|
||||||
.where(
|
.where(
|
||||||
(Recordings.camera << camera_list)
|
(Recordings.camera << camera_list)
|
||||||
& (Recordings.end_time >= period_start)
|
& (Recordings.end_time >= period_start)
|
||||||
& (Recordings.start_time <= period_end)
|
& (Recordings.start_time <= period_end)
|
||||||
)
|
)
|
||||||
.group_by(
|
.distinct()
|
||||||
fn.strftime(
|
|
||||||
"%Y-%m-%d",
|
|
||||||
fn.datetime(
|
|
||||||
Recordings.start_time,
|
|
||||||
"unixepoch",
|
|
||||||
period_hour_modifier,
|
|
||||||
period_minute_modifier,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.order_by(Recordings.start_time.desc())
|
|
||||||
.namedtuples()
|
.namedtuples()
|
||||||
)
|
)
|
||||||
|
|
||||||
for g in period_query:
|
for g in period_query:
|
||||||
days[g.day] = True
|
day_str = (dt.date(1970, 1, 1) + dt.timedelta(days=g.day_idx)).isoformat()
|
||||||
|
days[day_str] = True
|
||||||
|
|
||||||
return JSONResponse(content=dict(sorted(days.items())))
|
return JSONResponse(content=dict(sorted(days.items())))
|
||||||
|
|
||||||
|
|||||||
@ -80,6 +80,9 @@
|
|||||||
"back": "Back",
|
"back": "Back",
|
||||||
"empty": "No previews available",
|
"empty": "No previews available",
|
||||||
"noPreview": "Preview unavailable",
|
"noPreview": "Preview unavailable",
|
||||||
"seekAria": "Seek {{camera}} player to {{time}}"
|
"seekAria": "Seek {{camera}} player to {{time}}",
|
||||||
|
"filter": "Filter",
|
||||||
|
"filterDesc": "Select areas to only show clips with motion in those regions.",
|
||||||
|
"filterClear": "Clear"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
150
web/src/components/filter/MotionRegionFilterGrid.tsx
Normal file
150
web/src/components/filter/MotionRegionFilterGrid.tsx
Normal file
@ -0,0 +1,150 @@
|
|||||||
|
import { baseUrl } from "@/api/baseUrl";
|
||||||
|
import { useCallback, useRef } from "react";
|
||||||
|
|
||||||
|
const GRID_SIZE = 16;
|
||||||
|
|
||||||
|
type MotionRegionFilterGridProps = {
|
||||||
|
cameraName: string;
|
||||||
|
selectedCells: Set<number>;
|
||||||
|
onCellsChange: (cells: Set<number>) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function MotionRegionFilterGrid({
|
||||||
|
cameraName,
|
||||||
|
selectedCells,
|
||||||
|
onCellsChange,
|
||||||
|
}: MotionRegionFilterGridProps) {
|
||||||
|
const paintingRef = useRef<{ active: boolean; adding: boolean }>({
|
||||||
|
active: false,
|
||||||
|
adding: true,
|
||||||
|
});
|
||||||
|
const lastCellRef = useRef<number>(-1);
|
||||||
|
const gridRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
|
const toggleCell = useCallback(
|
||||||
|
(index: number, forceAdd?: boolean) => {
|
||||||
|
const next = new Set(selectedCells);
|
||||||
|
|
||||||
|
if (forceAdd !== undefined) {
|
||||||
|
if (forceAdd) {
|
||||||
|
next.add(index);
|
||||||
|
} else {
|
||||||
|
next.delete(index);
|
||||||
|
}
|
||||||
|
} else if (next.has(index)) {
|
||||||
|
next.delete(index);
|
||||||
|
} else {
|
||||||
|
next.add(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
onCellsChange(next);
|
||||||
|
},
|
||||||
|
[selectedCells, onCellsChange],
|
||||||
|
);
|
||||||
|
|
||||||
|
const getCellFromPoint = useCallback(
|
||||||
|
(clientX: number, clientY: number): number | null => {
|
||||||
|
const grid = gridRef.current;
|
||||||
|
|
||||||
|
if (!grid) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rect = grid.getBoundingClientRect();
|
||||||
|
const x = clientX - rect.left;
|
||||||
|
const y = clientY - rect.top;
|
||||||
|
|
||||||
|
if (x < 0 || y < 0 || x >= rect.width || y >= rect.height) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const col = Math.floor((x / rect.width) * GRID_SIZE);
|
||||||
|
const row = Math.floor((y / rect.height) * GRID_SIZE);
|
||||||
|
|
||||||
|
return row * GRID_SIZE + col;
|
||||||
|
},
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handlePointerDown = useCallback(
|
||||||
|
(e: React.PointerEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
const index = getCellFromPoint(e.clientX, e.clientY);
|
||||||
|
|
||||||
|
if (index === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const adding = !selectedCells.has(index);
|
||||||
|
paintingRef.current = { active: true, adding };
|
||||||
|
lastCellRef.current = index;
|
||||||
|
toggleCell(index, adding);
|
||||||
|
},
|
||||||
|
[selectedCells, toggleCell, getCellFromPoint],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handlePointerMove = useCallback(
|
||||||
|
(e: React.PointerEvent) => {
|
||||||
|
if (!paintingRef.current.active) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const index = getCellFromPoint(e.clientX, e.clientY);
|
||||||
|
|
||||||
|
if (index === null || index === lastCellRef.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastCellRef.current = index;
|
||||||
|
toggleCell(index, paintingRef.current.adding);
|
||||||
|
},
|
||||||
|
[toggleCell, getCellFromPoint],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handlePointerUp = useCallback(() => {
|
||||||
|
paintingRef.current.active = false;
|
||||||
|
lastCellRef.current = -1;
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<div
|
||||||
|
className="relative aspect-video w-full select-none overflow-hidden rounded-lg"
|
||||||
|
style={{ touchAction: "none" }}
|
||||||
|
onPointerUp={handlePointerUp}
|
||||||
|
onPointerLeave={handlePointerUp}
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
src={`${baseUrl}api/${cameraName}/latest.jpg?h=500`}
|
||||||
|
className="absolute inset-0 size-full object-contain"
|
||||||
|
draggable={false}
|
||||||
|
alt=""
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
ref={gridRef}
|
||||||
|
className="absolute inset-0 grid"
|
||||||
|
style={{
|
||||||
|
gridTemplateColumns: `repeat(${GRID_SIZE}, 1fr)`,
|
||||||
|
gridTemplateRows: `repeat(${GRID_SIZE}, 1fr)`,
|
||||||
|
}}
|
||||||
|
onPointerDown={handlePointerDown}
|
||||||
|
onPointerMove={handlePointerMove}
|
||||||
|
>
|
||||||
|
{Array.from({ length: GRID_SIZE * GRID_SIZE }, (_, index) => {
|
||||||
|
const isSelected = selectedCells.has(index);
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={index}
|
||||||
|
className={
|
||||||
|
isSelected
|
||||||
|
? "border border-severity_alert/60 bg-severity_alert/40"
|
||||||
|
: "border border-transparent hover:bg-white/20"
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -3,7 +3,7 @@ import { Calendar } from "../ui/calendar";
|
|||||||
import { ButtonHTMLAttributes, useEffect, useMemo, useRef } from "react";
|
import { ButtonHTMLAttributes, useEffect, useMemo, useRef } from "react";
|
||||||
import { FaCircle } from "react-icons/fa";
|
import { FaCircle } from "react-icons/fa";
|
||||||
import { getUTCOffset } from "@/utils/dateUtil";
|
import { getUTCOffset } from "@/utils/dateUtil";
|
||||||
import { type DayButtonProps, TZDate } from "react-day-picker";
|
import { type DayButtonProps } from "react-day-picker";
|
||||||
import { LAST_24_HOURS_KEY } from "@/types/filter";
|
import { LAST_24_HOURS_KEY } from "@/types/filter";
|
||||||
import { useUserPersistence } from "@/hooks/use-user-persistence";
|
import { useUserPersistence } from "@/hooks/use-user-persistence";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
@ -38,60 +38,46 @@ export default function ReviewActivityCalendar({
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const modifiers = useMemo(() => {
|
const modifiers = useMemo(() => {
|
||||||
const recordings: Date[] = [];
|
const recordingsSet = new Set<string>();
|
||||||
const alerts: Date[] = [];
|
const alertsSet = new Set<string>();
|
||||||
const detections: Date[] = [];
|
const detectionsSet = new Set<string>();
|
||||||
|
|
||||||
// Handle recordings
|
|
||||||
if (recordingsSummary) {
|
if (recordingsSummary) {
|
||||||
Object.keys(recordingsSummary).forEach((date) => {
|
for (const date of Object.keys(recordingsSummary)) {
|
||||||
if (date === LAST_24_HOURS_KEY) {
|
if (date !== LAST_24_HOURS_KEY) {
|
||||||
return;
|
recordingsSet.add(date);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
const parts = date.split("-");
|
|
||||||
const cal = new TZDate(date + "T00:00:00", timezone);
|
|
||||||
|
|
||||||
cal.setFullYear(
|
|
||||||
parseInt(parts[0]),
|
|
||||||
parseInt(parts[1]) - 1,
|
|
||||||
parseInt(parts[2]),
|
|
||||||
);
|
|
||||||
|
|
||||||
recordings.push(cal);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle reviews if present
|
|
||||||
if (reviewSummary) {
|
if (reviewSummary) {
|
||||||
Object.entries(reviewSummary).forEach(([date, data]) => {
|
for (const [date, data] of Object.entries(reviewSummary)) {
|
||||||
if (date === LAST_24_HOURS_KEY) {
|
if (date === LAST_24_HOURS_KEY) continue;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const parts = date.split("-");
|
|
||||||
const cal = new TZDate(date + "T00:00:00", timezone);
|
|
||||||
|
|
||||||
cal.setFullYear(
|
|
||||||
parseInt(parts[0]),
|
|
||||||
parseInt(parts[1]) - 1,
|
|
||||||
parseInt(parts[2]),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (data.total_alert > data.reviewed_alert) {
|
if (data.total_alert > data.reviewed_alert) {
|
||||||
alerts.push(cal);
|
alertsSet.add(date);
|
||||||
} else if (data.total_detection > data.reviewed_detection) {
|
} else if (data.total_detection > data.reviewed_detection) {
|
||||||
detections.push(cal);
|
detectionsSet.add(date);
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return { alerts, detections, recordings };
|
const formatDay = (day: Date) => {
|
||||||
}, [reviewSummary, recordingsSummary, timezone]);
|
const y = day.getFullYear();
|
||||||
|
const m = String(day.getMonth() + 1).padStart(2, "0");
|
||||||
|
const d = String(day.getDate()).padStart(2, "0");
|
||||||
|
return `${y}-${m}-${d}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
recordings: (day: Date) => recordingsSet.has(formatDay(day)),
|
||||||
|
alerts: (day: Date) => alertsSet.has(formatDay(day)),
|
||||||
|
detections: (day: Date) => detectionsSet.has(formatDay(day)),
|
||||||
|
};
|
||||||
|
}, [reviewSummary, recordingsSummary]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Calendar
|
<Calendar
|
||||||
key={selectedDay ? selectedDay.toISOString() : "reset"}
|
|
||||||
mode="single"
|
mode="single"
|
||||||
disabled={disabledDates}
|
disabled={disabledDates}
|
||||||
showOutsideDays={false}
|
showOutsideDays={false}
|
||||||
@ -223,7 +209,6 @@ export function TimezoneAwareCalendar({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Calendar
|
<Calendar
|
||||||
key={selectedDay ? selectedDay.toISOString() : "reset"}
|
|
||||||
mode="single"
|
mode="single"
|
||||||
disabled={disabledDates}
|
disabled={disabledDates}
|
||||||
showOutsideDays={false}
|
showOutsideDays={false}
|
||||||
|
|||||||
@ -79,7 +79,17 @@ import { GiSoundWaves } from "react-icons/gi";
|
|||||||
import useKeyboardListener from "@/hooks/use-keyboard-listener";
|
import useKeyboardListener from "@/hooks/use-keyboard-listener";
|
||||||
import { useTimelineZoom } from "@/hooks/use-timeline-zoom";
|
import { useTimelineZoom } from "@/hooks/use-timeline-zoom";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { FaCog } from "react-icons/fa";
|
import { FaCog, FaFilter } from "react-icons/fa";
|
||||||
|
import MotionRegionFilterGrid from "@/components/filter/MotionRegionFilterGrid";
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
DialogTrigger,
|
||||||
|
} from "@/components/ui/dialog";
|
||||||
import ReviewActivityCalendar from "@/components/overlay/ReviewActivityCalendar";
|
import ReviewActivityCalendar from "@/components/overlay/ReviewActivityCalendar";
|
||||||
import PlatformAwareDialog from "@/components/overlay/dialog/PlatformAwareDialog";
|
import PlatformAwareDialog from "@/components/overlay/dialog/PlatformAwareDialog";
|
||||||
import MotionPreviewsPane from "./MotionPreviewsPane";
|
import MotionPreviewsPane from "./MotionPreviewsPane";
|
||||||
@ -1117,6 +1127,13 @@ function MotionReview({
|
|||||||
const [controlsOpen, setControlsOpen] = useState(false);
|
const [controlsOpen, setControlsOpen] = useState(false);
|
||||||
const [dimStrength, setDimStrength] = useState(82);
|
const [dimStrength, setDimStrength] = useState(82);
|
||||||
const [isPreviewSettingsOpen, setIsPreviewSettingsOpen] = useState(false);
|
const [isPreviewSettingsOpen, setIsPreviewSettingsOpen] = useState(false);
|
||||||
|
const [motionFilterCells, setMotionFilterCells] = useState<Set<number>>(
|
||||||
|
new Set(),
|
||||||
|
);
|
||||||
|
const [pendingFilterCells, setPendingFilterCells] = useState<Set<number>>(
|
||||||
|
new Set(),
|
||||||
|
);
|
||||||
|
const [isRegionFilterOpen, setIsRegionFilterOpen] = useState(false);
|
||||||
|
|
||||||
const objectReviewItems = useMemo(
|
const objectReviewItems = useMemo(
|
||||||
() =>
|
() =>
|
||||||
@ -1314,6 +1331,68 @@ function MotionReview({
|
|||||||
updateSelectedDay={onUpdateSelectedDay}
|
updateSelectedDay={onUpdateSelectedDay}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
<Dialog
|
||||||
|
open={isRegionFilterOpen}
|
||||||
|
onOpenChange={(open) => {
|
||||||
|
if (open) {
|
||||||
|
setPendingFilterCells(new Set(motionFilterCells));
|
||||||
|
}
|
||||||
|
setIsRegionFilterOpen(open);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<DialogTrigger asChild>
|
||||||
|
<Button
|
||||||
|
className={cn(
|
||||||
|
isDesktop ? "flex items-center gap-2" : "rounded-lg",
|
||||||
|
)}
|
||||||
|
size="sm"
|
||||||
|
variant={motionFilterCells.size > 0 ? "select" : "default"}
|
||||||
|
aria-label={t("motionPreviews.filter")}
|
||||||
|
>
|
||||||
|
<FaFilter
|
||||||
|
className={
|
||||||
|
motionFilterCells.size > 0
|
||||||
|
? "text-selected-foreground"
|
||||||
|
: "text-secondary-foreground"
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
{isDesktop && t("motionPreviews.filter")}
|
||||||
|
</Button>
|
||||||
|
</DialogTrigger>
|
||||||
|
<DialogContent className="max-h-[90dvh] overflow-y-auto sm:max-w-[85%] md:max-w-[70%] lg:max-w-[60%]">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>{t("motionPreviews.filter")}</DialogTitle>
|
||||||
|
<DialogDescription>
|
||||||
|
{t("motionPreviews.filterDesc")}
|
||||||
|
</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<MotionRegionFilterGrid
|
||||||
|
cameraName={selectedMotionPreviewCamera.name}
|
||||||
|
selectedCells={pendingFilterCells}
|
||||||
|
onCellsChange={setPendingFilterCells}
|
||||||
|
/>
|
||||||
|
<DialogFooter className="justify-end gap-1">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
disabled={pendingFilterCells.size === 0}
|
||||||
|
onClick={() => {
|
||||||
|
setPendingFilterCells(new Set());
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{t("motionPreviews.filterClear")}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="select"
|
||||||
|
onClick={() => {
|
||||||
|
setMotionFilterCells(new Set(pendingFilterCells));
|
||||||
|
setIsRegionFilterOpen(false);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{t("button.apply", { ns: "common" })}
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
<PlatformAwareDialog
|
<PlatformAwareDialog
|
||||||
trigger={
|
trigger={
|
||||||
<Button
|
<Button
|
||||||
@ -1456,6 +1535,7 @@ function MotionReview({
|
|||||||
}
|
}
|
||||||
playbackRate={playbackRate}
|
playbackRate={playbackRate}
|
||||||
nonMotionAlpha={dimStrength / 100}
|
nonMotionAlpha={dimStrength / 100}
|
||||||
|
motionFilterCells={motionFilterCells}
|
||||||
onSeek={(timestamp) => {
|
onSeek={(timestamp) => {
|
||||||
onOpenRecording({
|
onOpenRecording({
|
||||||
camera: selectedMotionPreviewCamera.name,
|
camera: selectedMotionPreviewCamera.name,
|
||||||
|
|||||||
@ -589,6 +589,7 @@ type MotionPreviewsPaneProps = {
|
|||||||
isLoadingMotionRanges?: boolean;
|
isLoadingMotionRanges?: boolean;
|
||||||
playbackRate: number;
|
playbackRate: number;
|
||||||
nonMotionAlpha: number;
|
nonMotionAlpha: number;
|
||||||
|
motionFilterCells?: Set<number>;
|
||||||
onSeek: (timestamp: number) => void;
|
onSeek: (timestamp: number) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -600,6 +601,7 @@ export default function MotionPreviewsPane({
|
|||||||
isLoadingMotionRanges = false,
|
isLoadingMotionRanges = false,
|
||||||
playbackRate,
|
playbackRate,
|
||||||
nonMotionAlpha,
|
nonMotionAlpha,
|
||||||
|
motionFilterCells,
|
||||||
onSeek,
|
onSeek,
|
||||||
}: MotionPreviewsPaneProps) {
|
}: MotionPreviewsPaneProps) {
|
||||||
const { t } = useTranslation(["views/events"]);
|
const { t } = useTranslation(["views/events"]);
|
||||||
@ -879,6 +881,26 @@ export default function MotionPreviewsPane({
|
|||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const filteredClipData = useMemo(() => {
|
||||||
|
if (!motionFilterCells || motionFilterCells.size === 0) {
|
||||||
|
return clipData;
|
||||||
|
}
|
||||||
|
|
||||||
|
return clipData.filter(({ motionHeatmap }) => {
|
||||||
|
if (!motionHeatmap) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const cellIndex of motionFilterCells) {
|
||||||
|
if ((motionHeatmap[cellIndex.toString()] ?? 0) > 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
}, [clipData, motionFilterCells]);
|
||||||
|
|
||||||
const hasCurrentHourRanges = useMemo(
|
const hasCurrentHourRanges = useMemo(
|
||||||
() => motionRanges.some((range) => isCurrentHour(range.end_time)),
|
() => motionRanges.some((range) => isCurrentHour(range.end_time)),
|
||||||
[motionRanges],
|
[motionRanges],
|
||||||
@ -901,13 +923,13 @@ export default function MotionPreviewsPane({
|
|||||||
ref={setContentNode}
|
ref={setContentNode}
|
||||||
className="no-scrollbar min-h-0 flex-1 overflow-y-auto"
|
className="no-scrollbar min-h-0 flex-1 overflow-y-auto"
|
||||||
>
|
>
|
||||||
{clipData.length === 0 ? (
|
{filteredClipData.length === 0 ? (
|
||||||
<div className="flex h-full items-center justify-center text-lg text-primary">
|
<div className="flex h-full items-center justify-center text-lg text-primary">
|
||||||
{t("motionPreviews.empty")}
|
{t("motionPreviews.empty")}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="grid grid-cols-1 gap-2 pb-2 sm:grid-cols-2 md:gap-4 xl:grid-cols-4">
|
<div className="grid grid-cols-1 gap-2 pb-2 sm:grid-cols-2 md:gap-4 xl:grid-cols-4">
|
||||||
{clipData.map(
|
{filteredClipData.map(
|
||||||
({ range, preview, fallbackFrameTimes, motionHeatmap }, idx) => {
|
({ range, preview, fallbackFrameTimes, motionHeatmap }, idx) => {
|
||||||
const clipId = `${camera.name}-${range.start_time}-${range.end_time}-${idx}`;
|
const clipId = `${camera.name}-${range.start_time}-${range.end_time}-${idx}`;
|
||||||
const isMounted = mountedClips.has(clipId);
|
const isMounted = mountedClips.has(clipId);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user