diff --git a/src/handlers/api/asset.handler.ts b/src/handlers/api/asset.handler.ts index a8f47e7..0baea76 100644 --- a/src/handlers/api/asset.handler.ts +++ b/src/handlers/api/asset.handler.ts @@ -130,8 +130,29 @@ export const listOrphanAssets = async (filters: IOrphanFilters): Promise assets.map(cleanUpAsset)); } -export const listCompressionVideos = async (page = 1, limit = 200): Promise => { - return API.get(LIST_COMPRESSION_VIDEOS_PATH, { page, limit }).then((assets) => assets.map(cleanUpAsset)); +export interface ICompressionVideoFilters { + page?: number; + limit?: number; + minSizeMb?: number; + maxSizeMb?: number; + sortBy?: "date" | "size"; + sortOrder?: "asc" | "desc"; +} + +export const listCompressionVideos = async ( + filters: ICompressionVideoFilters = {} +): Promise => { + const params: Record = { + page: filters.page ?? 1, + limit: filters.limit ?? 200, + sortBy: filters.sortBy ?? "date", + sortOrder: filters.sortOrder ?? "desc", + }; + + if (filters.minSizeMb !== undefined) params.minSizeMb = filters.minSizeMb; + if (filters.maxSizeMb !== undefined) params.maxSizeMb = filters.maxSizeMb; + + return API.get(LIST_COMPRESSION_VIDEOS_PATH, params).then((assets) => assets.map(cleanUpAsset)); }; export interface ICompressionResult { diff --git a/src/pages/api/assets/compression/videos.ts b/src/pages/api/assets/compression/videos.ts index 881db0b..66acbf9 100644 --- a/src/pages/api/assets/compression/videos.ts +++ b/src/pages/api/assets/compression/videos.ts @@ -3,7 +3,7 @@ import { ASSET_VIDEO_PATH } from "@/config/routes"; import { getCurrentUser } from "@/handlers/serverUtils/user.utils"; import { isFlipped } from "@/helpers/asset.helper"; import { assets, exif } from "@/schema"; -import { and, desc, eq, isNull } from "drizzle-orm"; +import { and, asc, desc, eq, gte, isNull, lte, sql } from "drizzle-orm"; import type { NextApiRequest, NextApiResponse } from "next"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { @@ -13,6 +13,35 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) const page = Math.max(1, Number(req.query.page) || 1); const limit = Math.max(1, Number(req.query.limit) || 200); + const minSizeMb = Number(req.query.minSizeMb); + const maxSizeMb = Number(req.query.maxSizeMb); + const sortBy = req.query.sortBy === "size" ? "size" : "date"; + const sortOrder = req.query.sortOrder === "asc" ? "asc" : "desc"; + + const conditions = [ + eq(assets.ownerId, currentUser.id), + eq(assets.type, "VIDEO"), + eq(assets.status, "active"), + isNull(assets.deletedAt), + ]; + + if (Number.isFinite(minSizeMb) && minSizeMb >= 0) { + conditions.push(gte(exif.fileSizeInByte, Math.ceil(minSizeMb * 1024 * 1024))); + } + if (Number.isFinite(maxSizeMb) && maxSizeMb >= 0) { + conditions.push(lte(exif.fileSizeInByte, Math.floor(maxSizeMb * 1024 * 1024))); + } + + const orderBy = sortBy === "size" + ? [ + sql`${exif.fileSizeInByte} ${sql.raw(sortOrder)} nulls last`, + desc(assets.localDateTime), + asc(assets.id), + ] + : [ + sortOrder === "asc" ? asc(assets.localDateTime) : desc(assets.localDateTime), + asc(assets.id), + ]; const rows = await db .select({ @@ -32,13 +61,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) }) .from(assets) .leftJoin(exif, eq(assets.id, exif.assetId)) - .where(and( - eq(assets.ownerId, currentUser.id), - eq(assets.type, "VIDEO"), - eq(assets.status, "active"), - isNull(assets.deletedAt) - )) - .orderBy(desc(assets.localDateTime)) + .where(and(...conditions)) + .orderBy(...orderBy) .limit(limit) .offset((page - 1) * limit); diff --git a/src/pages/assets/compress-videos.tsx b/src/pages/assets/compress-videos.tsx index fd4de1b..ce5e211 100644 --- a/src/pages/assets/compress-videos.tsx +++ b/src/pages/assets/compress-videos.tsx @@ -5,6 +5,14 @@ import FloatingBar from '@/components/shared/FloatingBar' import Loader from '@/components/ui/loader' import { Button } from '@/components/ui/button' import { AlertDialog } from '@/components/ui/alert-dialog' +import { Input } from '@/components/ui/input' +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from '@/components/ui/select' import PhotoSelectionContext, { IPhotoSelectionContext } from '@/contexts/PhotoSelectionContext' import { discardCompressedVideo, @@ -34,6 +42,12 @@ export default function CompressVideosPage() { 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('') + const [appliedMaxSizeMb, setAppliedMaxSizeMb] = useState('') + const [sortBy, setSortBy] = useState<'date' | 'size'>('date') + const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc') const [contextState, setContextState] = useState({ selectedIds: [], @@ -63,7 +77,14 @@ export default function CompressVideosPage() { setLoading(true) setErrorMessage('') try { - const fetchedAssets = await listCompressionVideos(page, PAGE_SIZE) + const fetchedAssets = await listCompressionVideos({ + page, + limit: PAGE_SIZE, + minSizeMb: appliedMinSizeMb === '' ? undefined : Number(appliedMinSizeMb), + maxSizeMb: appliedMaxSizeMb === '' ? undefined : Number(appliedMaxSizeMb), + sortBy, + sortOrder, + }) setAssets(fetchedAssets) contextState.updateContext({ assets: fetchedAssets, selectedIds: [] }) setResult(null) @@ -76,7 +97,21 @@ export default function CompressVideosPage() { useEffect(() => { loadVideos() - }, [page]) + }, [page, appliedMinSizeMb, appliedMaxSizeMb, sortBy, sortOrder]) + + const handleApplySizeFilter = () => { + setAppliedMinSizeMb(minSizeMb) + setAppliedMaxSizeMb(maxSizeMb) + setPage(1) + } + + const handleClearSizeFilter = () => { + setMinSizeMb('') + setMaxSizeMb('') + setAppliedMinSizeMb('') + setAppliedMaxSizeMb('') + setPage(1) + } const handleSelectionChange = (ids: string[]) => { if (result) { @@ -166,6 +201,77 @@ export default function CompressVideosPage() { /> +
+ setMinSizeMb(event.target.value)} + className="w-32" + /> + setMaxSizeMb(event.target.value)} + className="w-32" + /> + + {(appliedMinSizeMb !== '' || appliedMaxSizeMb !== '') && ( + + )} + + +
+ {loading ? (
) : errorMessage ? (