π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Preserve image extensions in desktop temporary files
Neeraj Gupta70ce7bf7d8a4
diff --git a/desktop/src/main/ipc.ts b/desktop/src/main/ipc.tsindex ad6d0a70a3..61fbe426fe 100644--- a/desktop/src/main/ipc.ts+++ b/desktop/src/main/ipc.ts@@ -218,8 +218,8 @@ export const attachIPCHandlers = () => {handle("fsFindFiles", (_, folderPath: string) => fsFindFiles(folderPath));- handle("convertToJPEG", (_, imageData: Uint8Array) =>- convertToJPEG(imageData),+ handle("convertToJPEG", (_, imageData: Uint8Array, extension: string) =>+ convertToJPEG(imageData, extension),);handle(diff --git a/desktop/src/main/services/image.ts b/desktop/src/main/services/image.tsindex 5a35ca42dc..468a0dc346 100644--- a/desktop/src/main/services/image.ts+++ b/desktop/src/main/services/image.ts@@ -10,8 +10,9 @@ import {export const convertToJPEG = async (imageData: Uint8Array,+ extension: string,): Promise<Uint8Array<ArrayBuffer>> => {- const inputFilePath = await makeTempFilePath();+ const inputFilePath = await makeTempFilePath(extension);const outputFilePath = await makeTempFilePath("jpeg");const command = convertToJPEGCommand(inputFilePath, outputFilePath);diff --git a/desktop/src/main/utils/temp.ts b/desktop/src/main/utils/temp.tsindex cd245542ef..6986f0c16e 100644--- a/desktop/src/main/utils/temp.ts+++ b/desktop/src/main/utils/temp.ts@@ -21,6 +21,8 @@ const randomPrefix = () => {};export const makeTempFilePath = async (extension?: string) => {+ if (extension && !/^[a-z0-9]+$/i.test(extension))+ throw new Error("Invalid temporary file extension");const tempDir = await enteTempDirPath();const suffix = extension ? "." + extension : "";let result: string;@@ -54,26 +56,29 @@ interface FileForStreamOrPathOrZipItem {export const makeFileForStreamOrPathOrZipItem = async (item: ReadableStream | string | ZipItem,): Promise<FileForStreamOrPathOrZipItem> => {- let path: string;+ let filePath: string;let isFileTemporary: boolean;let writeToTemporaryFile = async () => {/* no-op */};if (typeof item == "string") {- path = item;+ filePath = item;isFileTemporary = false;} else {- path = await makeTempFilePath();+ const extension = Array.isArray(item)+ ? path.extname(item[1]).slice(1)+ : undefined;+ filePath = await makeTempFilePath(extension);isFileTemporary = true;if (item instanceof ReadableStream) {- writeToTemporaryFile = () => writeStream(path, item);+ writeToTemporaryFile = () => writeStream(filePath, item);} else {writeToTemporaryFile = async () => {const [zipPath, entryName] = item;const zip = openZip(zipPath);try {- await zip.extract(entryName, path);+ await zip.extract(entryName, filePath);} finally {markClosableZip(zipPath);}@@ -81,5 +86,5 @@ export const makeFileForStreamOrPathOrZipItem = async (}}- return { path, isFileTemporary, writeToTemporaryFile };+ return { path: filePath, isFileTemporary, writeToTemporaryFile };};diff --git a/desktop/src/preload.ts b/desktop/src/preload.tsindex f467a7dd9f..952895fd24 100644--- a/desktop/src/preload.ts+++ b/desktop/src/preload.ts@@ -161,8 +161,9 @@ const fsStatMtime = (path: string) => ipcRenderer.invoke("fsStatMtime", path);const convertToJPEG = (imageData: Uint8Array,+ extension: string,): Promise<Uint8Array<ArrayBuffer>> =>- ipcRenderer.invoke("convertToJPEG", imageData);+ ipcRenderer.invoke("convertToJPEG", imageData, extension);const generateImageThumbnail = (pathOrZipItem: string | ZipItem,diff --git a/web/packages/base/types/ipc.ts b/web/packages/base/types/ipc.tsindex ec57947417..fc55879435 100644--- a/web/packages/base/types/ipc.ts+++ b/web/packages/base/types/ipc.ts@@ -74,7 +74,10 @@ export interface Electron {findFiles: (folderPath: string) => Promise<string[]>;};- convertToJPEG: (imageData: Uint8Array) => Promise<Uint8Array<ArrayBuffer>>;+ convertToJPEG: (+ imageData: Uint8Array,+ extension: string,+ ) => Promise<Uint8Array<ArrayBuffer>>;generateImageThumbnail: (pathOrZipItem: string | ZipItem,maxDimension: number,diff --git a/web/packages/base/worker/comlink-worker.ts b/web/packages/base/worker/comlink-worker.tsindex 6fa7ad3763..0c2b54764f 100644--- a/web/packages/base/worker/comlink-worker.ts+++ b/web/packages/base/worker/comlink-worker.ts@@ -36,8 +36,8 @@ export class ComlinkWorker<T extends new () => InstanceType<T>> {const workerBridge = {logToDisk,- convertToJPEG: (imageData: Uint8Array) =>- ensureElectron().convertToJPEG(imageData),+ convertToJPEG: (imageData: Uint8Array, extension: string) =>+ ensureElectron().convertToJPEG(imageData, extension),};export type WorkerBridge = typeof workerBridge;diff --git a/web/packages/gallery/services/convert-core.ts b/web/packages/gallery/services/convert-core.tsindex 569a84ac16..6a387f0c5e 100644--- a/web/packages/gallery/services/convert-core.ts+++ b/web/packages/gallery/services/convert-core.ts@@ -8,7 +8,7 @@ import { detectFileTypeInfo } from "../utils/detect-type";type ConvertToMP4 = (blob: Blob) => Promise<Blob | Uint8Array<ArrayBuffer>>;export interface RenderableImageBlobWebOpts {- convertToJPEG?: (imageBlob: Blob) => Promise<Blob>;+ convertToJPEG?: (imageBlob: Blob, extension: string) => Promise<Blob>;onConvertToJPEGError?: (e: unknown) => void;}@@ -27,7 +27,10 @@ export const renderableImageBlobWeb = async (if (opts?.convertToJPEG) {try {- return await opts.convertToJPEG(imageBlob);+ return await opts.convertToJPEG(+ imageBlob,+ lowercaseExtension(fileName) || extension,+ );} catch (e) {opts.onConvertToJPEGError?.(e);}diff --git a/web/packages/gallery/services/convert.ts b/web/packages/gallery/services/convert.tsindex 44f91b1d0d..cba51c8e4e 100644--- a/web/packages/gallery/services/convert.ts+++ b/web/packages/gallery/services/convert.ts@@ -22,14 +22,14 @@ export const renderableImageBlob = async (: undefined,);-const nativeConvertToJPEG = async (imageBlob: Blob) => {+const nativeConvertToJPEG = async (imageBlob: Blob, extension: 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)- : await workerBridge!.convertToJPEG(imageData);+ ? await electron.convertToJPEG(imageData, extension)+ : await workerBridge!.convertToJPEG(imageData, extension);log.debug(() => `Native JPEG conversion took ${Date.now() - startTime} ms`);return new Blob([jpegData], { type: "image/jpeg" });};