사소한 리팩토링

This commit is contained in:
static
2025-07-08 02:07:54 +09:00
parent 5d9042d149
commit 9b1e27c20b
5 changed files with 46 additions and 65 deletions

View File

@@ -11,7 +11,7 @@ import {
digestMessage,
signMessageHmac,
} from "$lib/modules/crypto";
import { generateImageThumbnail, generateVideoThumbnail } from "$lib/modules/thumbnail";
import { generateThumbnail } from "$lib/modules/thumbnail";
import type {
DuplicateFileScanRequest,
DuplicateFileScanResponse,
@@ -78,30 +78,6 @@ const extractExifDateTime = (fileBuffer: ArrayBuffer) => {
return new Date(utcDate - offsetMs);
};
const generateThumbnail = async (file: File, fileType: string) => {
let url;
try {
if (fileType === "image/heic") {
const { default: heic2any } = await import("heic2any");
url = URL.createObjectURL((await heic2any({ blob: file, toType: "image/png" })) as Blob);
return await generateImageThumbnail(url);
} else if (fileType.startsWith("image/")) {
url = URL.createObjectURL(file);
return await generateImageThumbnail(url);
} else if (fileType.startsWith("video/")) {
url = URL.createObjectURL(file);
return await generateVideoThumbnail(url);
}
return null;
} catch {
return null;
} finally {
if (url) {
URL.revokeObjectURL(url);
}
}
};
const encryptFile = limitFunction(
async (
status: Writable<FileUploadStatus>,
@@ -132,7 +108,7 @@ const encryptFile = limitFunction(
createdAt && (await encryptString(createdAt.getTime().toString(), dataKey));
const lastModifiedAtEncrypted = await encryptString(file.lastModified.toString(), dataKey);
const thumbnail = await generateThumbnail(file, fileType);
const thumbnail = await generateThumbnail(fileBuffer, fileType);
const thumbnailBuffer = await thumbnail?.arrayBuffer();
const thumbnailEncrypted = thumbnailBuffer ? await encryptData(thumbnailBuffer, dataKey) : null;