Mirrors/lossless-cut
1
0
Fork 0
mirror of https://github.com/mifi/lossless-cut.git synced 2024-11-21 18:02:35 +01:00
Code Issues Releases Activity

improve startup check

Browse Source 
also run it even if we have a customFfPath
closes #2070
This commit is contained in:
Mikael Finstad 2024-08-15 14:57:14 +02:00
parent 016f4ce1b7
commit 617731b86c
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/renderer/src/App.tsx
View File

@ -2623,10 +2623,9 @@ function App() {
if (!isStoreBuild && !hasDisabledNetworking()) loadMifiLink().then(setMifiLink);
}, []);
const haveCustomFfPath = !!customFfPath;
useEffect(() => {
runStartupCheck({ ffmpeg: !haveCustomFfPath });
}, [haveCustomFfPath]);
runStartupCheck({ customFfPath });
}, [customFfPath]);
useEffect(() => {
const keyScrollPreventer = (e) => {

22
src/renderer/src/mifi.ts
View File

@ -1,7 +1,7 @@
import ky from 'ky';
import { runFfmpegStartupCheck, getFfmpegPath } from './ffmpeg';
import { toast } from './swal';
import Swal from './swal';
import { handleError } from './util';
import isDev from './isDev';
@ -17,13 +17,13 @@ export async function loadMifiLink() {
}
}
export async function runStartupCheck({ ffmpeg }: { ffmpeg: boolean }) {
export async function runStartupCheck({ customFfPath }: { customFfPath: string | undefined }) {
try {
if (ffmpeg) await runFfmpegStartupCheck();
await runFfmpegStartupCheck();
} catch (err) {
if (err instanceof Error && 'code' in err && typeof err.code === 'string' && ['EPERM', 'EACCES'].includes(err.code)) {
toast.fire({
timer: 30000,
if (err instanceof Error) {
if (!customFfPath && 'code' in err && typeof err.code === 'string' && ['EPERM', 'EACCES'].includes(err.code)) {
Swal.fire({
icon: 'error',
title: 'Fatal: ffmpeg not accessible',
text: `Got ${err.code}. This probably means that anti-virus is blocking execution of ffmpeg. Please make sure the following file exists and is executable:\n\n${getFfmpegPath()}\n\nSee this issue: https://github.com/mifi/lossless-cut/issues/1114`,
@ -31,6 +31,16 @@ export async function runStartupCheck({ ffmpeg }: { ffmpeg: boolean }) {
return;
}
if (customFfPath && 'code' in err && err.code === 'ENOENT') {
Swal.fire({
icon: 'error',
title: 'Fatal: ffmpeg not found',
text: `Make sure that ffmpeg executable exists: ${getFfmpegPath()}`,
});
return;
}
}
handleError('Fatal: ffmpeg non-functional', err);
}
}