From 3573ac4c0e5b151335dcf63c4b014bd4b38a8a05 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 24 Sep 2026 12:19:13 +0100 Subject: [PATCH] feat: compression 3 --- src/config/routes.ts | 1 + src/handlers/api/asset.handler.ts | 11 + src/pages/api/assets/compression/results.ts | 63 ++++ src/pages/assets/compress-videos.tsx | 376 ++++++++++++++------ 4 files changed, 343 insertions(+), 108 deletions(-) create mode 100644 src/pages/api/assets/compression/results.ts diff --git a/src/config/routes.ts b/src/config/routes.ts index cce8dd1..f843c70 100644 --- a/src/config/routes.ts +++ b/src/config/routes.ts @@ -49,6 +49,7 @@ export const ASSET_GEO_HEATMAP_PATH = BASE_API_ENDPOINT + "/assets/geo-heatmap"; export const LIST_EMPTY_VIDEOS_PATH = BASE_API_ENDPOINT + "/assets/empty-videos"; export const LIST_ORPHAN_ASSETS_PATH = BASE_API_ENDPOINT + "/assets/orphan-finder"; export const LIST_COMPRESSION_VIDEOS_PATH = BASE_API_ENDPOINT + "/assets/compression/videos"; +export const LIST_COMPRESSED_VIDEOS_PATH = BASE_API_ENDPOINT + "/assets/compression/results"; export const TRANSCODE_VIDEO_PATH = BASE_API_ENDPOINT + "/assets/compression/transcode"; export const REPLACE_COMPRESSED_VIDEO_PATH = BASE_API_ENDPOINT + "/assets/compression/replace"; export const COMPRESSION_RESULT_PATH = (id: string) => BASE_API_ENDPOINT + "/assets/compression/result/" + id; diff --git a/src/handlers/api/asset.handler.ts b/src/handlers/api/asset.handler.ts index 0baea76..cba8e41 100644 --- a/src/handlers/api/asset.handler.ts +++ b/src/handlers/api/asset.handler.ts @@ -10,6 +10,7 @@ import { LIST_DUPLICATES_PATH, LIST_ORPHAN_ASSETS_PATH, LIST_COMPRESSION_VIDEOS_PATH, + LIST_COMPRESSED_VIDEOS_PATH, TRANSCODE_VIDEO_PATH, REPLACE_COMPRESSED_VIDEO_PATH, COMPRESSION_RESULT_PATH, @@ -162,6 +163,16 @@ export interface ICompressionResult { resultUrl: string; } +export interface ICompressedVideo extends ICompressionResult { + originalFileName: string; + localDateTime: string; + compressedAt: string; +} + +export const listCompressedVideos = async (): Promise => { + return API.get(LIST_COMPRESSED_VIDEOS_PATH); +}; + export const transcodeVideo = async (assetId: string): Promise => { return API.post(TRANSCODE_VIDEO_PATH, { assetId }); }; diff --git a/src/pages/api/assets/compression/results.ts b/src/pages/api/assets/compression/results.ts new file mode 100644 index 0000000..47fe5f7 --- /dev/null +++ b/src/pages/api/assets/compression/results.ts @@ -0,0 +1,63 @@ +import { db } from "@/config/db"; +import { getCurrentUser } from "@/handlers/serverUtils/user.utils"; +import { getCompressionOutputPath } from "@/helpers/compression.server"; +import { assets, exif } from "@/schema"; +import { and, eq, inArray } from "drizzle-orm"; +import { readdir, stat } from "node:fs/promises"; +import type { NextApiRequest, NextApiResponse } from "next"; + +const COMPRESSION_ROOT = "/app/data/compression"; + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + const currentUser = await getCurrentUser(req); + if (!currentUser) return res.status(401).json({ message: "Unauthorized" }); + if (req.method !== "GET") return res.status(405).json({ message: "Method not allowed" }); + + let assetIds: string[] = []; + try { + const entries = await readdir(COMPRESSION_ROOT, { withFileTypes: true }); + assetIds = entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name); + } catch (error: any) { + if (error?.code === "ENOENT") return res.status(200).json([]); + throw error; + } + + if (assetIds.length === 0) return res.status(200).json([]); + + const rows = await db + .select({ + id: assets.id, + originalFileName: assets.originalFileName, + localDateTime: assets.localDateTime, + originalSize: exif.fileSizeInByte, + }) + .from(assets) + .leftJoin(exif, eq(assets.id, exif.assetId)) + .where(and(eq(assets.ownerId, currentUser.id), inArray(assets.id, assetIds))); + + const results = await Promise.all(rows.map(async (asset) => { + try { + const outputPath = getCompressionOutputPath(asset.id); + const outputStat = await stat(outputPath); + if (!outputStat.isFile()) return null; + + return { + assetId: asset.id, + originalFileName: asset.originalFileName, + localDateTime: asset.localDateTime, + originalSize: Number(asset.originalSize ?? 0), + compressedSize: outputStat.size, + compressedAt: outputStat.mtime.toISOString(), + resultUrl: `/api/assets/compression/result/${asset.id}`, + }; + } catch { + return null; + } + })); + + return res.status(200).json( + results + .filter((result): result is NonNullable => result !== null) + .sort((a, b) => b.compressedAt.localeCompare(a.compressedAt)) + ); +} diff --git a/src/pages/assets/compress-videos.tsx b/src/pages/assets/compress-videos.tsx index ce5e211..26e962c 100644 --- a/src/pages/assets/compress-videos.tsx +++ b/src/pages/assets/compress-videos.tsx @@ -16,7 +16,8 @@ import { import PhotoSelectionContext, { IPhotoSelectionContext } from '@/contexts/PhotoSelectionContext' import { discardCompressedVideo, - ICompressionResult, + ICompressedVideo, + listCompressedVideos, listCompressionVideos, replaceCompressedVideo, transcodeVideo, @@ -27,21 +28,28 @@ import { useEffect, useMemo, useState } from 'react' import toast from 'react-hot-toast' const PAGE_SIZE = 200 +const QUEUE_STORAGE_KEY = 'videoCompressionQueue' const formatMB = (bytes?: number | null) => { if (bytes == null) return 'Unknown' return `${(bytes / 1024 / 1024).toFixed(1)} MB` } +type QueueStatus = 'waiting' | 'compressing' | 'failed' + +interface IQueueItem { + assetId: string + originalFileName: string + originalSize?: number | null + status: QueueStatus + error?: string +} + export default function CompressVideosPage() { const [assets, setAssets] = useState([]) const [loading, setLoading] = useState(false) const [page, setPage] = useState(1) const [errorMessage, setErrorMessage] = useState('') - const [compressing, setCompressing] = useState(false) - const [replacing, setReplacing] = useState(false) - const [discarding, setDiscarding] = useState(false) - const [result, setResult] = useState(null) const [minSizeMb, setMinSizeMb] = useState('') const [maxSizeMb, setMaxSizeMb] = useState('') const [appliedMinSizeMb, setAppliedMinSizeMb] = useState('') @@ -49,6 +57,14 @@ export default function CompressVideosPage() { const [sortBy, setSortBy] = useState<'date' | 'size'>('date') const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc') + const [queue, setQueue] = useState([]) + const [queueLoaded, setQueueLoaded] = useState(false) + const [queueRunning, setQueueRunning] = useState(false) + const [compressedVideos, setCompressedVideos] = useState([]) + const [compressedLoading, setCompressedLoading] = useState(false) + const [replacingAssetId, setReplacingAssetId] = useState(null) + const [discardingAssetId, setDiscardingAssetId] = useState(null) + const [contextState, setContextState] = useState({ selectedIds: [], assets: [], @@ -68,9 +84,9 @@ export default function CompressVideosPage() { }, }) - const selectedAsset = useMemo(() => { - const selectedId = contextState.selectedIds[0] - return contextState.assets.find((asset) => asset.id === selectedId) ?? null + const selectedAssets = useMemo(() => { + const selectedIds = new Set(contextState.selectedIds) + return contextState.assets.filter((asset) => selectedIds.has(asset.id)) }, [contextState.assets, contextState.selectedIds]) const loadVideos = async () => { @@ -87,7 +103,6 @@ export default function CompressVideosPage() { }) setAssets(fetchedAssets) contextState.updateContext({ assets: fetchedAssets, selectedIds: [] }) - setResult(null) } catch (error: any) { setErrorMessage(error?.message ?? 'Failed to load videos') } finally { @@ -95,10 +110,56 @@ export default function CompressVideosPage() { } } + const loadCompressed = async () => { + setCompressedLoading(true) + try { + setCompressedVideos(await listCompressedVideos()) + } catch (error: any) { + toast.error(error?.message ?? 'Failed to load compressed videos') + } finally { + setCompressedLoading(false) + } + } + useEffect(() => { loadVideos() }, [page, appliedMinSizeMb, appliedMaxSizeMb, sortBy, sortOrder]) + useEffect(() => { + loadCompressed() + + try { + const storedQueue = localStorage.getItem(QUEUE_STORAGE_KEY) + if (storedQueue) { + const items = JSON.parse(storedQueue) as Array> + setQueue(items.map((item) => ({ ...item, status: 'waiting' }))) + } + } catch { + localStorage.removeItem(QUEUE_STORAGE_KEY) + } finally { + setQueueLoaded(true) + } + }, []) + + useEffect(() => { + if (!queueLoaded) return + const persistedQueue = queue.map(({ assetId, originalFileName, originalSize }) => ({ + assetId, + originalFileName, + originalSize, + })) + localStorage.setItem(QUEUE_STORAGE_KEY, JSON.stringify(persistedQueue)) + }, [queue, queueLoaded]) + + useEffect(() => { + if (!queueLoaded || compressedLoading) return + const compressedIds = new Set(compressedVideos.map((item) => item.assetId)) + setQueue((previous) => { + const filtered = previous.filter((item) => !compressedIds.has(item.assetId)) + return filtered.length === previous.length ? previous : filtered + }) + }, [compressedVideos, compressedLoading, queueLoaded]) + const handleApplySizeFilter = () => { setAppliedMinSizeMb(minSizeMb) setAppliedMaxSizeMb(maxSizeMb) @@ -114,65 +175,100 @@ export default function CompressVideosPage() { } const handleSelectionChange = (ids: string[]) => { - if (result) { - contextState.updateContext({ selectedIds: [result.assetId] }) + contextState.updateContext({ selectedIds: ids }) + } + + const handleAddToQueue = () => { + const queuedIds = new Set(queue.map((item) => item.assetId)) + const compressedIds = new Set(compressedVideos.map((item) => item.assetId)) + const itemsToAdd = selectedAssets.filter( + (asset) => !queuedIds.has(asset.id) && !compressedIds.has(asset.id) + ) + + if (itemsToAdd.length === 0) { + toast.error('Selected videos are already queued or compressed') return } - const selectedIds = ids.length > 0 ? [ids[ids.length - 1]] : [] - contextState.updateContext({ selectedIds }) + + setQueue((previous) => [ + ...previous, + ...itemsToAdd.map((asset) => ({ + assetId: asset.id, + originalFileName: asset.originalFileName, + originalSize: asset.fileSizeInByte, + status: 'waiting' as const, + })), + ]) + contextState.updateContext({ selectedIds: [] }) + toast.success(`${itemsToAdd.length} video${itemsToAdd.length === 1 ? '' : 's'} added to queue`) } - const handleCompress = async () => { - if (!selectedAsset) return - setCompressing(true) - setResult(null) - try { - const compressionResult = await transcodeVideo(selectedAsset.id) - setResult(compressionResult) - toast.success('Compression finished') - } catch (error: any) { - toast.error(error?.message ?? 'Compression failed') - } finally { - setCompressing(false) + const handleRunQueue = async () => { + if (queueRunning || queue.length === 0) return + + const items = queue.map((item) => ({ ...item })) + setQueueRunning(true) + let failures = 0 + + for (const item of items) { + setQueue((previous) => previous.map((queuedItem) => + queuedItem.assetId === item.assetId + ? { ...queuedItem, status: 'compressing', error: undefined } + : queuedItem + )) + + try { + await transcodeVideo(item.assetId) + setQueue((previous) => previous.filter((queuedItem) => queuedItem.assetId !== item.assetId)) + await loadCompressed() + } catch (error: any) { + failures += 1 + setQueue((previous) => previous.map((queuedItem) => + queuedItem.assetId === item.assetId + ? { ...queuedItem, status: 'failed', error: error?.message ?? 'Compression failed' } + : queuedItem + )) + } } + + setQueueRunning(false) + if (failures > 0) toast.error(`Queue finished with ${failures} failure${failures === 1 ? '' : 's'}`) + else toast.success('Queue finished') } - const handleDiscard = async () => { - if (!result) return - setDiscarding(true) + const handleDiscard = async (assetId: string) => { + setDiscardingAssetId(assetId) try { - await discardCompressedVideo(result.assetId) - setResult(null) + await discardCompressedVideo(assetId) + setCompressedVideos((previous) => previous.filter((item) => item.assetId !== assetId)) toast.success('Compressed file discarded') } catch (error: any) { toast.error(error?.message ?? 'Failed to discard compressed file') } finally { - setDiscarding(false) + setDiscardingAssetId(null) } } - const handleReplace = async () => { - if (!result) return - setReplacing(true) + const handleReplace = async (assetId: string) => { + setReplacingAssetId(assetId) try { - await replaceCompressedVideo(result.assetId) - const remainingAssets = assets.filter((asset) => asset.id !== result.assetId) + await replaceCompressedVideo(assetId) + const remainingAssets = assets.filter((asset) => asset.id !== assetId) setAssets(remainingAssets) - contextState.updateContext({ assets: remainingAssets, selectedIds: [] }) - setResult(null) + contextState.updateContext({ + assets: remainingAssets, + selectedIds: contextState.selectedIds.filter((id) => id !== assetId), + }) + setCompressedVideos((previous) => previous.filter((item) => item.assetId !== assetId)) + setQueue((previous) => previous.filter((item) => item.assetId !== assetId)) toast.success('Asset replaced in Immich') } catch (error: any) { toast.error(error?.message ?? 'Failed to replace asset') } finally { - setReplacing(false) + setReplacingAssetId(null) } } - const savedBytes = result ? result.originalSize - result.compressedSize : 0 - const savedPercent = result && result.originalSize > 0 - ? Math.round((savedBytes / result.originalSize) * 100) - : 0 - return (
setPage((value) => Math.max(1, value - 1))} > @@ -191,7 +287,7 @@ export default function CompressVideosPage() { {(appliedMinSizeMb !== '' || appliedMaxSizeMb !== '') && ( - )} +
+
+
+
+
Compression queue
+
{queue.length} queued
+
+
+ {queue.length > 0 && ( + + )} + +
+
+ +
+ {queue.length === 0 ? ( +
Queue is empty.
+ ) : queue.map((item) => ( +
+
+
{item.originalFileName}
+
+ {formatMB(item.originalSize)} · {item.status === 'failed' ? 'Failed' : item.status === 'compressing' ? 'Compressing' : 'Waiting'} +
+ {item.error &&
{item.error}
} +
+ +
+ ))} +
+
+ +
+
+
Compressed files
+
{compressedVideos.length} ready
+
+ +
+ {compressedLoading ? ( +
+ ) : compressedVideos.length === 0 ? ( +
No compressed files.
+ ) : compressedVideos.map((item) => { + const savedBytes = item.originalSize - item.compressedSize + const savedPercent = item.originalSize > 0 + ? Math.round((savedBytes / item.originalSize) * 100) + : 0 + const replacing = replacingAssetId === item.assetId + const discarding = discardingAssetId === item.assetId + + return ( +
+
+
+
{item.originalFileName}
+
+ {formatMB(item.originalSize)} → {formatMB(item.compressedSize)} · saved {formatMB(savedBytes)} ({savedPercent}%) +
+
+
+ + + handleReplace(item.assetId)} + variant="destructive" + disabled={replacing || discarding} + asChild + > + + +
+
+
+ ) + })} +
+
+
+ {loading ? (
) : errorMessage ? ( @@ -291,57 +493,15 @@ export default function CompressVideosPage() { )} - {selectedAsset && ( + {selectedAssets.length > 0 && (
-
-
{selectedAsset.originalFileName}
- {!result ? ( -
{formatMB(selectedAsset.fileSizeInByte)}
- ) : ( -
- Original: {formatMB(result.originalSize)} - Compressed: {formatMB(result.compressedSize)} - Saved: {formatMB(savedBytes)} ({savedPercent}%) -
- )} +
+ {selectedAssets.length} video{selectedAssets.length === 1 ? '' : 's'} selected
- - {!result ? ( - - ) : ( -
- - - - - -
- )} +
)}