diff --git a/apps/octra/src/app/core/component/octra-dropzone/octra-dropzone.component.ts b/apps/octra/src/app/core/component/octra-dropzone/octra-dropzone.component.ts index 17d9d4623..ee1326e7b 100644 --- a/apps/octra/src/app/core/component/octra-dropzone/octra-dropzone.component.ts +++ b/apps/octra/src/app/core/component/octra-dropzone/octra-dropzone.component.ts @@ -175,7 +175,7 @@ export class OctraDropzoneComponent extends DefaultComponent { if ( new RegExp( `${converter.extensions - .map((a) => `(?:${escapeRegex(a)})`) + .map((a) => `(?:${escapeRegex(a.toLowerCase())})`) .join('|')}$` ).exec(fileProgress.name.toLowerCase()) !== null ) { @@ -218,18 +218,12 @@ export class OctraDropzoneComponent extends DefaultComponent { ) { fileProgress.status = 'valid'; - if ( - new RegExp( - `${escapeRegex(audioName)}${AppInfo.converters[i].extensions - .map((a) => `(?:${escapeRegex(a)})`) - .join('|')}$` - ).exec(fileProgress.name) === null && - new RegExp( - `${escapeRegex(audioName)}${AppInfo.converters[i].extensions - .map((a) => `(?:${escapeRegex(a.toLowerCase())})`) - .join('|')}$` - ).exec(fileProgress.name) === null - ) { + const regexStr = `${escapeRegex(audioName)}${AppInfo.converters[ + i + ].extensions + .map((a) => `(?:${escapeRegex(a)})|((?:${escapeRegex(a.toLowerCase())}))`) + .join('|')}$`; + if (new RegExp(regexStr).exec(fileProgress.name) === null) { fileProgress.warning = 'File names are not the same.'; } for (const lvl of importResult.annotjson.levels) {