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

fix getFileOriginalName logic

Browse source
This commit is contained in:
Abhinav 2022-01-09 12:25:40 +05:30
parent c53a94240b
commit 48eac037ea
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/services/upload/readFileService.ts
View file

@ -7,7 +7,7 @@ import {
} from 'constants/upload';
import FileType from 'file-type/browser';
import { CustomError } from 'utils/error';
import { getFileExtension } from 'utils/file';
import { getFileExtension, splitFilenameAndExtension } from 'utils/file';
import { FileTypeInfo } from 'types/upload';
const TYPE_VIDEO = 'video';
@ -66,13 +66,22 @@ export async function getFileType(
*/
export function getFileOriginalName(file: File) {
let originalName: string = null;
const [nameWithoutExtension, extension] = splitFilenameAndExtension(
file.name
);
const isEditedFile = file.name.endsWith(EDITED_FILE_SUFFIX);
const isEditedFile = nameWithoutExtension.endsWith(EDITED_FILE_SUFFIX);
if (isEditedFile) {
originalName = file.name.slice(0, -1 * EDITED_FILE_SUFFIX.length);
originalName = nameWithoutExtension.slice(
0,
-1 * EDITED_FILE_SUFFIX.length
);
} else {
originalName = file.name;
}
if (extension) {
originalName += '.' + extension;
}
return originalName;
}