beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove layer

Browse source
This commit is contained in:
Manav Rathi 2024-04-18 10:57:13 +05:30
parent 278df2aae8
commit 73cadcd36b
No known key found for this signature in database
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
desktop/src/main/platform.ts
View file

@ -1,19 +0,0 @@
export function isPlatform(platform: "mac" | "windows" | "linux") {
return getPlatform() === platform;
}
export function getPlatform(): "mac" | "windows" | "linux" {
switch (process.platform) {
case "aix":
case "freebsd":
case "linux":
case "openbsd":
case "android":
return "linux";
case "darwin":
case "sunos":
return "mac";
case "win32":
return "windows";
}
}

15
desktop/src/main/services/imageProcessor.ts
View file

@ -3,7 +3,6 @@ import fs from "node:fs/promises";
import path from "path"; import path from "path";
import { CustomErrors, ElectronFile } from "../../types/ipc"; import { CustomErrors, ElectronFile } from "../../types/ipc";
import log from "../log"; import log from "../log";
import { isPlatform } from "../platform";
import { writeStream } from "../stream"; import { writeStream } from "../stream";
import { generateTempFilePath } from "../temp"; import { generateTempFilePath } from "../temp";
import { execAsync, isDev } from "../util"; import { execAsync, isDev } from "../util";
@ -77,9 +76,8 @@ export async function convertToJPEG(
fileData: Uint8Array, fileData: Uint8Array,
filename: string, filename: string,
): Promise<Uint8Array> { ): Promise<Uint8Array> {
if (isPlatform("windows")) { if (process.platform == "win32")
throw Error(CustomErrors.WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED); throw Error(CustomErrors.WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED);
}
const convertedFileData = await convertToJPEG_(fileData, filename); const convertedFileData = await convertToJPEG_(fileData, filename);
return convertedFileData; return convertedFileData;
} }
@ -126,7 +124,7 @@ function constructConvertCommand(
tempOutputFilePath: string, tempOutputFilePath: string,
) { ) {
let convertCmd: string[]; let convertCmd: string[];
if (isPlatform("mac")) { if (process.platform == "darwin") {
convertCmd = SIPS_HEIC_CONVERT_COMMAND_TEMPLATE.map((cmdPart) => { convertCmd = SIPS_HEIC_CONVERT_COMMAND_TEMPLATE.map((cmdPart) => {
if (cmdPart === INPUT_PATH_PLACEHOLDER) { if (cmdPart === INPUT_PATH_PLACEHOLDER) {
return tempInputFilePath; return tempInputFilePath;
@ -136,7 +134,7 @@ function constructConvertCommand(
} }
return cmdPart; return cmdPart;
}); });
} else if (isPlatform("linux")) { } else if (process.platform == "linux") {
convertCmd = IMAGEMAGICK_HEIC_CONVERT_COMMAND_TEMPLATE.map( convertCmd = IMAGEMAGICK_HEIC_CONVERT_COMMAND_TEMPLATE.map(
(cmdPart) => { (cmdPart) => {
if (cmdPart === IMAGE_MAGICK_PLACEHOLDER) { if (cmdPart === IMAGE_MAGICK_PLACEHOLDER) {
@ -165,11 +163,10 @@ export async function generateImageThumbnail(
let inputFilePath = null; let inputFilePath = null;
let createdTempInputFile = null; let createdTempInputFile = null;
try { try {
if (isPlatform("windows")) { if (process.platform == "win32")
throw Error( throw Error(
CustomErrors.WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED, CustomErrors.WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED,
); );
}
if (!existsSync(inputFile.path)) { if (!existsSync(inputFile.path)) {
const tempFilePath = await generateTempFilePath(inputFile.name); const tempFilePath = await generateTempFilePath(inputFile.name);
await writeStream(tempFilePath, await inputFile.stream()); await writeStream(tempFilePath, await inputFile.stream());
@ -240,7 +237,7 @@ function constructThumbnailGenerationCommand(
quality: number, quality: number,
) { ) {
let thumbnailGenerationCmd: string[]; let thumbnailGenerationCmd: string[];
if (isPlatform("mac")) { if (process.platform == "darwin") {
thumbnailGenerationCmd = SIPS_THUMBNAIL_GENERATE_COMMAND_TEMPLATE.map( thumbnailGenerationCmd = SIPS_THUMBNAIL_GENERATE_COMMAND_TEMPLATE.map(
(cmdPart) => { (cmdPart) => {
if (cmdPart === INPUT_PATH_PLACEHOLDER) { if (cmdPart === INPUT_PATH_PLACEHOLDER) {
@ -258,7 +255,7 @@ function constructThumbnailGenerationCommand(
return cmdPart; return cmdPart;
}, },
); );
} else if (isPlatform("linux")) { } else if (process.platform == "linux") {
thumbnailGenerationCmd = thumbnailGenerationCmd =
IMAGE_MAGICK_THUMBNAIL_GENERATE_COMMAND_TEMPLATE.map((cmdPart) => { IMAGE_MAGICK_THUMBNAIL_GENERATE_COMMAND_TEMPLATE.map((cmdPart) => {
if (cmdPart === IMAGE_MAGICK_PLACEHOLDER) { if (cmdPart === IMAGE_MAGICK_PLACEHOLDER) {