Merge 24b7653ea8 into 011ad8eda7

frigate/api/export.py

@@ -5,15 +5,13 @@ import logging
 import random
 import string
 import time
-import zipfile
-from collections import deque
 from pathlib import Path
-from typing import Iterator, List, Optional
+from typing import List, Optional
 
 import psutil
 from fastapi import APIRouter, Depends, Query, Request
-from fastapi.responses import JSONResponse, StreamingResponse
+from fastapi.responses import JSONResponse
-from pathvalidate import sanitize_filename, sanitize_filepath
+from pathvalidate import sanitize_filepath
 from peewee import DoesNotExist
 from playhouse.shortcuts import model_to_dict
 
@@ -363,136 +361,6 @@ def get_export_case(case_id: str):
         )
 
 
-_ZIP_STREAM_CHUNK_SIZE = 1024 * 1024  # 1 MiB
-
-
-class _StreamingZipBuffer:
-    """File-like sink for ZipFile that exposes written bytes via drain().
-
-    ZipFile writes synchronously into this buffer; the generator drains the
-    queue between writes so StreamingResponse can yield bytes without
-    materializing the whole archive in memory.
-    """
-
-    def __init__(self) -> None:
-        self._queue: deque[bytes] = deque()
-        self._offset = 0
-
-    def write(self, data: bytes) -> int:
-        if data:
-            self._queue.append(bytes(data))
-            self._offset += len(data)
-        return len(data)
-
-    def tell(self) -> int:
-        return self._offset
-
-    def flush(self) -> None:
-        pass
-
-    def drain(self) -> Iterator[bytes]:
-        while self._queue:
-            yield self._queue.popleft()
-
-
-def _unique_archive_name(export: Export, used: set[str]) -> str:
-    base = sanitize_filename(export.name) if export.name else None
-    if not base:
-        base = f"{export.camera}_{int(datetime.datetime.timestamp(export.date))}"
-
-    candidate = f"{base}.mp4"
-    counter = 1
-    while candidate in used:
-        candidate = f"{base}_{counter}.mp4"
-        counter += 1
-
-    used.add(candidate)
-    return candidate
-
-
-def _stream_case_archive(exports: List[Export]) -> Iterator[bytes]:
-    """Yield bytes of a zip archive built from the given exports' mp4 files."""
-    buffer = _StreamingZipBuffer()
-    used_names: set[str] = set()
-
-    # ZIP_STORED: mp4 is already compressed, recompressing wastes CPU for ~0% size win.
-    with zipfile.ZipFile(
-        buffer,
-        mode="w",
-        compression=zipfile.ZIP_STORED,
-        allowZip64=True,
-    ) as archive:
-        for export in exports:
-            source = Path(export.video_path)
-            if not source.exists():
-                continue
-
-            arcname = _unique_archive_name(export, used_names)
-
-            with (
-                archive.open(arcname, mode="w", force_zip64=True) as entry,
-                source.open("rb") as src,
-            ):
-                while True:
-                    chunk = src.read(_ZIP_STREAM_CHUNK_SIZE)
-                    if not chunk:
-                        break
-
-                    entry.write(chunk)
-                    yield from buffer.drain()
-
-            yield from buffer.drain()
-
-    yield from buffer.drain()
-
-
-@router.get(
-    "/cases/{case_id}/download",
-    dependencies=[Depends(allow_any_authenticated())],
-    summary="Download export case as zip",
-    description="Streams a zip archive containing every completed export's mp4 for the given case.",
-)
-def download_export_case(
-    case_id: str,
-    allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter),
-):
-    try:
-        case = ExportCase.get(ExportCase.id == case_id)
-    except DoesNotExist:
-        return JSONResponse(
-            content={"success": False, "message": "Export case not found"},
-            status_code=404,
-        )
-
-    exports = list(
-        Export.select()
-        .where(
-            Export.export_case == case_id,
-            ~Export.in_progress,
-            Export.camera << allowed_cameras,
-        )
-        .order_by(Export.date.asc())
-    )
-
-    if not exports:
-        return JSONResponse(
-            content={"success": False, "message": "No exports available to download."},
-            status_code=404,
-        )
-
-    archive_base = sanitize_filename(case.name) if case.name else ""
-    if not archive_base:
-        archive_base = case_id
-
-    return StreamingResponse(
-        _stream_case_archive(exports),
-        media_type="application/zip",
-        headers={
-            "Content-Disposition": f'attachment; filename="{archive_base}.zip"',
-        },
-    )
-
-
 @router.patch(
     "/cases/{case_id}",
     response_model=GenericResponse,

web/src/pages/Exports.tsx

@@ -57,7 +57,6 @@ import { useTranslation } from "react-i18next";
 
 import { IoMdArrowRoundBack } from "react-icons/io";
 import {
-  LuDownload,
   LuFolderPlus,
   LuFolderX,
   LuPencil,
@@ -778,76 +777,54 @@ function Exports() {
                   filters={["cameras"]}
                   onUpdateFilter={setExportFilter}
                 />
-                <div className="flex items-center gap-1 md:gap-2">
+                {isAdmin && (
-                  {(exportsByCase[selectedCase.id]?.length ?? 0) > 0 && (
+                  <div className="flex items-center gap-1 md:gap-2">
                     <Button
-                      asChild
                       className="flex items-center gap-2 p-2"
                       size="sm"
-                      aria-label={t("button.download", { ns: "common" })}
+                      aria-label={t("toolbar.addExport")}
+                      onClick={() => setCaseForAddExport(selectedCase)}
                     >
-                      <a
+                      <LuPlus className="text-secondary-foreground" />
-                        download
+                      {!isMobile && (
-                        href={`${baseUrl}api/cases/${selectedCase.id}/download`}
+                        <div className="text-primary">
-                      >
+                          {t("toolbar.addExport")}
-                        <LuDownload className="text-secondary-foreground" />
+                        </div>
-                        {!isMobile && (
+                      )}
-                          <div className="text-primary">
-                            {t("button.download", { ns: "common" })}
-                          </div>
-                        )}
-                      </a>
                     </Button>
-                  )}
+                    <Button
-                  {isAdmin && (
+                      className="flex items-center gap-2 p-2"
-                    <>
+                      size="sm"
-                      <Button
+                      aria-label={t("toolbar.editCase")}
-                        className="flex items-center gap-2 p-2"
+                      onClick={() =>
-                        size="sm"
+                        setCaseDialog({
-                        aria-label={t("toolbar.addExport")}
+                          mode: "edit",
-                        onClick={() => setCaseForAddExport(selectedCase)}
+                          exportCase: selectedCase,
-                      >
+                        })
-                        <LuPlus className="text-secondary-foreground" />
+                      }
-                        {!isMobile && (
+                    >
-                          <div className="text-primary">
+                      <LuPencil className="text-secondary-foreground" />
-                            {t("toolbar.addExport")}
+                      {!isMobile && (
-                          </div>
+                        <div className="text-primary">
-                        )}
+                          {t("toolbar.editCase")}
-                      </Button>
+                        </div>
-                      <Button
+                      )}
-                        className="flex items-center gap-2 p-2"
+                    </Button>
-                        size="sm"
+                    <Button
-                        aria-label={t("toolbar.editCase")}
+                      className="flex items-center gap-2 p-2"
-                        onClick={() =>
+                      size="sm"
-                          setCaseDialog({
+                      aria-label={t("toolbar.deleteCase")}
-                            mode: "edit",
+                      onClick={() => setCaseToDelete(selectedCase)}
-                            exportCase: selectedCase,
+                    >
-                          })
+                      <LuTrash2 className="text-secondary-foreground" />
-                        }
+                      {!isMobile && (
-                      >
+                        <div className="text-primary">
-                        <LuPencil className="text-secondary-foreground" />
+                          {t("toolbar.deleteCase")}
-                        {!isMobile && (
+                        </div>
-                          <div className="text-primary">
+                      )}
-                            {t("toolbar.editCase")}
+                    </Button>
-                          </div>
+                  </div>
-                        )}
+                )}
-                      </Button>
-                      <Button
-                        className="flex items-center gap-2 p-2"
-                        size="sm"
-                        aria-label={t("toolbar.deleteCase")}
-                        onClick={() => setCaseToDelete(selectedCase)}
-                      >
-                        <LuTrash2 className="text-secondary-foreground" />
-                        {!isMobile && (
-                          <div className="text-primary">
-                            {t("toolbar.deleteCase")}
-                          </div>
-                        )}
-                      </Button>
-                    </>
-                  )}
-                </div>
               </div>
             )}
           </>

web/src/views/settings/MediaSyncSettingsView.tsx

@@ -10,16 +10,13 @@ import axios from "axios";
 import { toast } from "sonner";
 import { useJobStatus } from "@/api/ws";
 import { Switch } from "@/components/ui/switch";
-import { LuCheck, LuExternalLink, LuX } from "react-icons/lu";
+import { LuCheck, LuX } from "react-icons/lu";
 import { cn } from "@/lib/utils";
 import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
 import { MediaSyncResults, MediaSyncStats } from "@/types/ws";
-import { useDocDomain } from "@/hooks/use-doc-domain";
-import { Link } from "react-router-dom";
 
 export default function MediaSyncSettingsView() {
   const { t } = useTranslation("views/settings");
-  const { getLocaleDocUrl } = useDocDomain();
   const [selectedMediaTypes, setSelectedMediaTypes] = useState<string[]>([
     "all",
   ]);
@@ -112,25 +109,13 @@ export default function MediaSyncSettingsView() {
               <Heading as="h4" className="mb-2 hidden md:block">
                 {t("maintenance.sync.title")}
               </Heading>
+
               <div className="max-w-6xl">
                 <div className="mb-5 mt-2 flex max-w-5xl flex-col gap-2 text-sm text-muted-foreground">
                   <p>{t("maintenance.sync.desc")}</p>
-
-                  <div className="flex items-center text-primary-variant">
-                    <Link
-                      to={getLocaleDocUrl(
-                        "configuration/record#syncing-media-files-with-disk",
-                      )}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="inline"
-                    >
-                      {t("readTheDocumentation", { ns: "common" })}
-                      <LuExternalLink className="ml-2 inline-flex size-3" />
-                    </Link>
-                  </div>
                 </div>
               </div>
+
               <div className="space-y-6">
                 {/* Media Types Selection */}
                 <div>