π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Centralize native image extension selection
Neeraj Gupta669b87567050
diff --git a/desktop/src/main/ipc.ts b/desktop/src/main/ipc.tsindex 27d2979916..1a7bec2863 100644--- a/desktop/src/main/ipc.ts+++ b/desktop/src/main/ipc.ts@@ -218,8 +218,14 @@ export const attachIPCHandlers = () => {handle("fsFindFiles", (_, folderPath: string) => fsFindFiles(folderPath));- handle("convertToJPEG", (_, imageData: Uint8Array, extension: string) =>- convertToJPEG(imageData, extension),+ handle(+ "convertToJPEG",+ (+ _,+ imageData: Uint8Array,+ detectedExtension: string,+ fileName: string,+ ) => convertToJPEG(imageData, detectedExtension, fileName),);handle(diff --git a/desktop/src/main/services/image.ts b/desktop/src/main/services/image.tsindex 488cc8d4de..f855faef18 100644--- a/desktop/src/main/services/image.ts+++ b/desktop/src/main/services/image.ts@@ -4,14 +4,17 @@ import { type ZipItem } from "../../types/ipc";import { execAsync, isDev } from "../utils/electron";import {deleteTempFileIgnoringErrors,+ imageInputExtension,makeFileForStreamOrPathOrZipItem,makeTempFilePath,} from "../utils/temp";export const convertToJPEG = async (imageData: Uint8Array,- extension: string,+ detectedExtension: string,+ fileName: string,): Promise<Uint8Array<ArrayBuffer>> => {+ const extension = imageInputExtension(detectedExtension, fileName);const inputFilePath = await makeTempFilePath(extension);const outputFilePath = await makeTempFilePath("jpeg");diff --git a/desktop/src/main/utils/temp.ts b/desktop/src/main/utils/temp.tsindex 82f1398cf5..0c1d9a5a84 100644--- a/desktop/src/main/utils/temp.ts+++ b/desktop/src/main/utils/temp.ts@@ -23,6 +23,17 @@ const randomPrefix = () => {const isValidExtension = (extension: string) =>/^[a-z0-9]{1,244}$/i.test(extension);+export const imageInputExtension = (+ detectedExtension: string | undefined,+ fileName: string,+) => {+ const fileNameExtension = path.extname(fileName).slice(1);+ const mayBeTIFFBasedRAW = detectedExtension === "tif";+ return mayBeTIFFBasedRAW && isValidExtension(fileNameExtension)+ ? fileNameExtension+ : detectedExtension;+};+export const makeTempFilePath = async (extension?: string) => {if (extension && !isValidExtension(extension))throw new Error("Invalid temporary file extension");@@ -70,12 +81,8 @@ export const makeFileForStreamOrPathOrZipItem = async (filePath = item;isFileTemporary = false;} else {- const fileNameExtension =- Array.isArray(item) && detectedExtension === "tif"- ? path.extname(item[1]).slice(1)- : "";- const extension = isValidExtension(fileNameExtension)- ? fileNameExtension+ const extension = Array.isArray(item)+ ? imageInputExtension(detectedExtension, item[1]): detectedExtension;filePath = await makeTempFilePath(extension);isFileTemporary = true;diff --git a/desktop/src/preload.ts b/desktop/src/preload.tsindex 8f18f0e8d8..d18615e1bf 100644--- a/desktop/src/preload.ts+++ b/desktop/src/preload.ts@@ -161,9 +161,10 @@ const fsStatMtime = (path: string) => ipcRenderer.invoke("fsStatMtime", path);const convertToJPEG = (imageData: Uint8Array,- extension: string,+ detectedExtension: string,+ fileName: string,): Promise<Uint8Array<ArrayBuffer>> =>- ipcRenderer.invoke("convertToJPEG", imageData, extension);+ ipcRenderer.invoke("convertToJPEG", imageData, detectedExtension, fileName);const generateImageThumbnail = (pathOrZipItem: string | ZipItem,diff --git a/web/packages/base/types/ipc.ts b/web/packages/base/types/ipc.tsindex 32d940d81d..bfc664a8a7 100644--- a/web/packages/base/types/ipc.ts+++ b/web/packages/base/types/ipc.ts@@ -76,7 +76,8 @@ export interface Electron {convertToJPEG: (imageData: Uint8Array,- extension: string,+ detectedExtension: string,+ fileName: string,) => Promise<Uint8Array<ArrayBuffer>>;generateImageThumbnail: (pathOrZipItem: string | ZipItem,diff --git a/web/packages/base/worker/comlink-worker.ts b/web/packages/base/worker/comlink-worker.tsindex 0c2b54764f..fcee920fff 100644--- a/web/packages/base/worker/comlink-worker.ts+++ b/web/packages/base/worker/comlink-worker.ts@@ -36,8 +36,11 @@ export class ComlinkWorker<T extends new () => InstanceType<T>> {const workerBridge = {logToDisk,- convertToJPEG: (imageData: Uint8Array, extension: string) =>- ensureElectron().convertToJPEG(imageData, extension),+ convertToJPEG: (+ imageData: Uint8Array,+ detectedExtension: string,+ fileName: string,+ ) => ensureElectron().convertToJPEG(imageData, detectedExtension, fileName),};export type WorkerBridge = typeof workerBridge;diff --git a/web/packages/gallery/services/convert-core.ts b/web/packages/gallery/services/convert-core.tsindex 12fee78fb4..105347b344 100644--- a/web/packages/gallery/services/convert-core.ts+++ b/web/packages/gallery/services/convert-core.ts@@ -8,7 +8,11 @@ import { detectFileTypeInfo } from "../utils/detect-type";type ConvertToMP4 = (blob: Blob) => Promise<Blob | Uint8Array<ArrayBuffer>>;export interface RenderableImageBlobWebOpts {- convertToJPEG?: (imageBlob: Blob, extension: string) => Promise<Blob>;+ convertToJPEG?: (+ imageBlob: Blob,+ detectedExtension: string,+ fileName: string,+ ) => Promise<Blob>;onConvertToJPEGError?: (e: unknown) => void;}@@ -27,14 +31,11 @@ export const renderableImageBlobWeb = async (if (opts?.convertToJPEG) {try {- const fileNameExtension =- lowercaseExtension(fileName) ?? "";- const inputExtension =- extension === "tif" &&- /^[a-z0-9]{1,244}$/.test(fileNameExtension)- ? fileNameExtension- : extension;- return await opts.convertToJPEG(imageBlob, inputExtension);+ return await opts.convertToJPEG(+ imageBlob,+ extension,+ fileName,+ );} catch (e) {opts.onConvertToJPEGError?.(e);}diff --git a/web/packages/gallery/services/convert.ts b/web/packages/gallery/services/convert.tsindex cba51c8e4e..00547abb2a 100644--- a/web/packages/gallery/services/convert.ts+++ b/web/packages/gallery/services/convert.ts@@ -22,14 +22,22 @@ export const renderableImageBlob = async (: undefined,);-const nativeConvertToJPEG = async (imageBlob: Blob, extension: string) => {+const nativeConvertToJPEG = async (+ imageBlob: Blob,+ detectedExtension: string,+ fileName: string,+) => {const startTime = Date.now();const imageData = new Uint8Array(await imageBlob.arrayBuffer());const electron = globalThis.electron;// Workers route through the main thread because they cannot access electron.const jpegData = electron- ? await electron.convertToJPEG(imageData, extension)- : await workerBridge!.convertToJPEG(imageData, extension);+ ? await electron.convertToJPEG(imageData, detectedExtension, fileName)+ : await workerBridge!.convertToJPEG(+ imageData,+ detectedExtension,+ fileName,+ );log.debug(() => `Native JPEG conversion took ${Date.now() - startTime} ms`);return new Blob([jpegData], { type: "image/jpeg" });};