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

improve error message when loading file #937

Browse Source
This commit is contained in:
Mikael Finstad 2022-02-20 21:11:55 +08:00
parent f402ff8763
commit a71c4411d3
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/App.jsx
View File

@ -59,7 +59,7 @@ import {
getOutPath, toast, errorToast, handleError, setFileNameTitle, getOutDir, withBlur,
checkDirWriteAccess, dirExists, openDirToast, isMasBuild, isStoreBuild, dragPreventer, doesPlayerSupportFile,
isDurationValid, filenamify, getOutFileExtension, generateSegFileName, defaultOutSegTemplate,
havePermissionToReadFile, resolvePathIfNeeded, pathExists, html5ifiedPrefix, html5dummySuffix, findExistingHtml5FriendlyFile,
havePermissionToReadFile, resolvePathIfNeeded, getPathReadAccessError, html5ifiedPrefix, html5dummySuffix, findExistingHtml5FriendlyFile,
deleteFiles, isStreamThumbnail, getAudioStreams, getVideoStreams, isOutOfSpaceError, shuffleArray,
} from './util';
import { formatDuration } from './util/duration';
@ -1502,11 +1502,17 @@ const App = memo(() => {
return;
}
if (!(await pathExists(path))) {
errorToast(i18n.t('The media you tried to open does not exist'));
const pathReadAccessErrorCode = await getPathReadAccessError(path);
if (pathReadAccessErrorCode != null) {
let errorMessage;
if (pathReadAccessErrorCode === 'ENOENT') errorMessage = i18n.t('The media you tried to open does not exist');
else if (['EACCES', 'EPERM'].includes(pathReadAccessErrorCode)) errorMessage = i18n.t('You do not have permission to access this file');
else errorMessage = i18n.t('Could not open media due to error {{errorCode}}', { errorCode: pathReadAccessErrorCode });
errorToast(errorMessage);
return;
}
// Not sure why this one is needed, but I think sometimes fs.access doesn't fail but it fails when actually trying to read
if (!(await havePermissionToReadFile(path))) {
errorToast(i18n.t('You do not have permission to access this file'));
return;

9
src/util.js
View File

@ -58,6 +58,15 @@ export async function pathExists(pathIn) {
return fs.pathExists(pathIn);
}
export async function getPathReadAccessError(pathIn) {
try {
await fs.access(pathIn, fs.constants.R_OK);
return undefined;
} catch (err) {
return err.code;
}
}
export async function dirExists(dirPath) {
return (await pathExists(dirPath)) && (await fs.lstat(dirPath)).isDirectory();
}