Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Use detected image formats for ZIP thumbnails

Neeraj Guptaa019bcda7733
diff --git a/desktop/src/main/ipc.ts b/desktop/src/main/ipc.ts
index 61fbe426fe..27d2979916 100644
--- a/desktop/src/main/ipc.ts
+++ b/desktop/src/main/ipc.ts
@@ -229,7 +229,14 @@ export const attachIPCHandlers = () => {
pathOrZipItem: string | ZipItem,
maxDimension: number,
maxSize: number,
- ) => generateImageThumbnail(pathOrZipItem, maxDimension, maxSize),
+ extension: string,
+ ) =>
+ generateImageThumbnail(
+ pathOrZipItem,
+ maxDimension,
+ maxSize,
+ extension,
+ ),
);
handle(
diff --git a/desktop/src/main/services/image.ts b/desktop/src/main/services/image.ts
index 468a0dc346..488cc8d4de 100644
--- a/desktop/src/main/services/image.ts
+++ b/desktop/src/main/services/image.ts
@@ -62,12 +62,13 @@ export const generateImageThumbnail = async (
pathOrZipItem: string | ZipItem,
maxDimension: number,
maxSize: number,
+ extension: string,
): Promise<Uint8Array<ArrayBuffer>> => {
const {
path: inputFilePath,
isFileTemporary: isInputFileTemporary,
writeToTemporaryFile: writeToTemporaryInputFile,
- } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem);
+ } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem, extension);
const outputFilePath = await makeTempFilePath("jpeg");
diff --git a/desktop/src/main/utils/temp.ts b/desktop/src/main/utils/temp.ts
index 6986f0c16e..a35847b5cc 100644
--- a/desktop/src/main/utils/temp.ts
+++ b/desktop/src/main/utils/temp.ts
@@ -55,6 +55,7 @@ interface FileForStreamOrPathOrZipItem {
export const makeFileForStreamOrPathOrZipItem = async (
item: ReadableStream | string | ZipItem,
+ detectedExtension?: string,
): Promise<FileForStreamOrPathOrZipItem> => {
let filePath: string;
let isFileTemporary: boolean;
@@ -66,9 +67,11 @@ export const makeFileForStreamOrPathOrZipItem = async (
filePath = item;
isFileTemporary = false;
} else {
- const extension = Array.isArray(item)
- ? path.extname(item[1]).slice(1)
- : undefined;
+ const extension =
+ Array.isArray(item) &&
+ (!detectedExtension || detectedExtension === "tif")
+ ? path.extname(item[1]).slice(1) || detectedExtension
+ : detectedExtension;
filePath = await makeTempFilePath(extension);
isFileTemporary = true;
if (item instanceof ReadableStream) {
diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts
index 952895fd24..8f18f0e8d8 100644
--- a/desktop/src/preload.ts
+++ b/desktop/src/preload.ts
@@ -169,12 +169,14 @@ const generateImageThumbnail = (
pathOrZipItem: string | ZipItem,
maxDimension: number,
maxSize: number,
+ extension: string,
): Promise<Uint8Array<ArrayBuffer>> =>
ipcRenderer.invoke(
"generateImageThumbnail",
pathOrZipItem,
maxDimension,
maxSize,
+ extension,
);
const ffmpegExec = (
diff --git a/web/packages/base/types/ipc.ts b/web/packages/base/types/ipc.ts
index fc55879435..32d940d81d 100644
--- a/web/packages/base/types/ipc.ts
+++ b/web/packages/base/types/ipc.ts
@@ -82,6 +82,7 @@ export interface Electron {
pathOrZipItem: string | ZipItem,
maxDimension: number,
maxSize: number,
+ extension: string,
) => Promise<Uint8Array<ArrayBuffer>>;
ffmpegExec: (
command: FFmpegCommand,
diff --git a/web/packages/gallery/services/upload/thumbnail.ts b/web/packages/gallery/services/upload/thumbnail.ts
index 77c9eafe9b..26d019b130 100644
--- a/web/packages/gallery/services/upload/thumbnail.ts
+++ b/web/packages/gallery/services/upload/thumbnail.ts
@@ -161,6 +161,7 @@ export const generateThumbnailNative = async (
toPathOrZipEntry(fsUploadItem),
maxThumbnailDimension,
maxThumbnailSize,
+ fileTypeInfo.extension,
)
: ffmpeg.generateVideoThumbnailNative(electron, fsUploadItem);