administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-01-27 22:48:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Implement filtering and adjust api

Browse Source
This commit is contained in:
Nicolas Mowen 2025-12-16 13:20:56 -07:00
parent fb6f9e617d
commit bbb506925b
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frigate/api/export.py
View File

@ -62,7 +62,7 @@ router = APIRouter(tags=[Tags.export])
def get_exports( def get_exports(
allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter), allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter),
export_case_id: Optional[str] = None, export_case_id: Optional[str] = None,
camera: Optional[List[str]] = Query(default=None), cameras: Optional[str] = Query(default="all"),
start_date: Optional[float] = None, start_date: Optional[float] = None,
end_date: Optional[float] = None, end_date: Optional[float] = None,
): ):
@ -74,8 +74,9 @@ def get_exports(
else: else:
query = query.where(Export.export_case == export_case_id) query = query.where(Export.export_case == export_case_id)
if camera: if cameras and cameras != "all":
filtered_cameras = [c for c in camera if c in allowed_cameras] requested = set(cameras.split(","))
filtered_cameras = list(requested.intersection(allowed_cameras))
if not filtered_cameras: if not filtered_cameras:
return JSONResponse(content=[]) return JSONResponse(content=[])
query = query.where(Export.camera << filtered_cameras) query = query.where(Export.camera << filtered_cameras)

31
web/src/pages/Exports.tsx
View File

@ -16,8 +16,14 @@ import { Input } from "@/components/ui/input";
import { Toaster } from "@/components/ui/sonner"; import { Toaster } from "@/components/ui/sonner";
import useKeyboardListener from "@/hooks/use-keyboard-listener"; import useKeyboardListener from "@/hooks/use-keyboard-listener";
import { useOverlayState, useSearchEffect } from "@/hooks/use-overlay-state"; import { useOverlayState, useSearchEffect } from "@/hooks/use-overlay-state";
import { useApiFilterArgs } from "@/hooks/use-api-filter";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { DeleteClipType, Export, ExportCase } from "@/types/export"; import {
DeleteClipType,
Export,
ExportCase,
ExportFilter,
} from "@/types/export";
import OptionAndInputDialog from "@/components/overlay/dialog/OptionAndInputDialog"; import OptionAndInputDialog from "@/components/overlay/dialog/OptionAndInputDialog";
import axios from "axios"; import axios from "axios";
@ -37,6 +43,9 @@ import { toast } from "sonner";
import useSWR from "swr"; import useSWR from "swr";
import ExportFilterGroup from "@/components/filter/ExportFilterGroup"; import ExportFilterGroup from "@/components/filter/ExportFilterGroup";
// always parse these as string arrays
const EXPORT_FILTER_ARRAY_KEYS = ["cameras"];
function Exports() { function Exports() {
const { t } = useTranslation(["views/exports"]); const { t } = useTranslation(["views/exports"]);
@ -44,11 +53,19 @@ function Exports() {
document.title = t("documentTitle"); document.title = t("documentTitle");
}, [t]); }, [t]);
// Filters
const [exportFilter, setExportFilter, exportSearchParams] =
useApiFilterArgs<ExportFilter>(EXPORT_FILTER_ARRAY_KEYS);
// Data // Data
const { data: cases, mutate: updateCases } = useSWR<ExportCase[]>("cases"); const { data: cases, mutate: updateCases } = useSWR<ExportCase[]>("cases");
const { data: rawExports, mutate: updateExports } = const { data: rawExports, mutate: updateExports } = useSWR<Export[]>(
useSWR<Export[]>("exports"); exportSearchParams && Object.keys(exportSearchParams).length > 0
? ["exports", exportSearchParams]
: "exports",
);
const exports = useMemo<Export[]>( const exports = useMemo<Export[]>(
() => (rawExports ?? []).filter((e) => !e.export_case), () => (rawExports ?? []).filter((e) => !e.export_case),
@ -241,17 +258,17 @@ function Exports() {
> >
<div className="w-full"> <div className="w-full">
<Input <Input
className="text-md w-full bg-muted md:w-1/3" className="text-md w-full bg-muted md:w-1/2"
placeholder={t("search")} placeholder={t("search")}
value={search} value={search}
onChange={(e) => setSearch(e.target.value)} onChange={(e) => setSearch(e.target.value)}
/> />
</div> </div>
<ExportFilterGroup <ExportFilterGroup
filter={{}} className="w-full justify-between md:justify-start lg:justify-end"
filter={exportFilter}
filters={["cameras"]} filters={["cameras"]}
className="" onUpdateFilter={setExportFilter}
onUpdateFilter={() => {}}
/> />
</div> </div>