diff --git a/src/services/appUpdater.ts b/src/services/appUpdater.ts index 2fd5efd48..533b24fef 100644 --- a/src/services/appUpdater.ts +++ b/src/services/appUpdater.ts @@ -8,7 +8,7 @@ import { getSkipAppVersion, setSkipAppVersion } from './userPreference'; import fetch from 'node-fetch'; import { logErrorSentry } from './sentry'; import ElectronLog from 'electron-log'; -import { isPlatform } from 'utils/main'; +import { isPlatform } from '../utils/main'; const FIVE_MIN_IN_MICROSECOND = 5 * 60 * 1000; diff --git a/src/services/heicConvertor.ts b/src/services/heicConvertor.ts index 08fdec1d9..c094cde06 100644 --- a/src/services/heicConvertor.ts +++ b/src/services/heicConvertor.ts @@ -6,10 +6,17 @@ import { readFile, writeFile } from 'promise-fs'; import { generateTempFilePath } from '../utils/temp'; import { logErrorSentry } from './sentry'; import { isPlatform } from '../utils/main'; -import pathToImageMagick from '../pkg/image-magick-static'; +import { isDev } from '../utils/common'; +import path from 'path'; const asyncExec = util.promisify(exec); +function getImageMagickStaticPath() { + return isDev + ? 'build/image-magick' + : path.join(process.resourcesPath, 'image-magick'); +} + export async function convertHEIC( heicFileData: Uint8Array ): Promise { @@ -54,7 +61,7 @@ async function runConvertCommand( ); } else if (isPlatform('linux')) { await asyncExec( - `${pathToImageMagick} ${tempInputFilePath} -quality 100% ${tempOutputFilePath}` + `${getImageMagickStaticPath()} ${tempInputFilePath} -quality 100% ${tempOutputFilePath}` ); } else { Error(`${process.platform} native heic convert not supported yet`);