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

Merge pull request #288 from ente-io/fix-get-original-filename-logic

Browse source 
fix getFileOriginalName logic
This commit is contained in:
abhinavkgrd 2022-01-09 18:00:39 +05:30 committed by GitHub
parent cc67038b93 48eac037ea
commit b504e072f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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'; } from 'constants/upload';
import FileType from 'file-type/browser'; import FileType from 'file-type/browser';
import { CustomError } from 'utils/error'; import { CustomError } from 'utils/error';
import { getFileExtension } from 'utils/file'; import { getFileExtension, splitFilenameAndExtension } from 'utils/file';
import { FileTypeInfo } from 'types/upload'; import { FileTypeInfo } from 'types/upload';
const TYPE_VIDEO = 'video'; const TYPE_VIDEO = 'video';
@ -66,13 +66,22 @@ export async function getFileType(
*/ */
export function getFileOriginalName(file: File) { export function getFileOriginalName(file: File) {
let originalName: string = null; 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) { if (isEditedFile) {
originalName = file.name.slice(0, -1 * EDITED_FILE_SUFFIX.length); originalName = nameWithoutExtension.slice(
0,
-1 * EDITED_FILE_SUFFIX.length
);
} else { } else {
originalName = file.name; originalName = file.name;
} }
if (extension) {
originalName += '.' + extension;
}
return originalName; return originalName;
} }