fix(annotation): full name instead of name set on AnnotJSON on format…

… import
IPS-LMU · Feb 28, 2024 · 0419bd4 · 0419bd4
1 parent 6ce2c75
commit 0419bd4
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 13 deletions.
diff --git a/libs/annotation/src/lib/annotjson.ts b/libs/annotation/src/lib/annotjson.ts
@@ -69,6 +69,9 @@ export interface IAudioFile {
 export class OAnnotJSON
   implements IAnnotJSON, Serializable<IAnnotJSON, OAnnotJSON>
 {
+  /**
+   * name of the annotation file WITHOUT extension
+   */
   name = '';
   annotates = '';
   sampleRate;
@@ -88,6 +91,14 @@ export class OAnnotJSON
     return Math.max(1, last(this.levels.map((a, i) => i + 1))!);
   }
 
+  /**
+   * initiates a new AnnotJSON object
+   * @param annotates
+   * @param name file name WITHOUT extension
+   * @param sampleRate
+   * @param levels
+   * @param links
+   */
   constructor(
     annotates: string,
     name: string,

diff --git a/libs/annotation/src/lib/converters/AnnotJSONConverter.ts b/libs/annotation/src/lib/converters/AnnotJSONConverter.ts
@@ -42,7 +42,7 @@ export class AnnotJSONConverter extends Converter {
     if (audiofile) {
       let result = new OAnnotJSON(
         audiofile.name,
-        file.name,
+        this.getFileName(file.name),
         audiofile.sampleRate
       );
       const content = file.content;

diff --git a/libs/annotation/src/lib/converters/CTMConverter.ts b/libs/annotation/src/lib/converters/CTMConverter.ts
@@ -103,7 +103,7 @@ export class CTMConverter extends Converter {
 
     const result = new OAnnotJSON(
       audiofile.name,
-      file.name,
+      this.getFileName(file.name),
       audiofile.sampleRate
     );
 

diff --git a/libs/annotation/src/lib/converters/Converter.ts b/libs/annotation/src/lib/converters/Converter.ts
@@ -114,4 +114,16 @@ export abstract class Converter {
    * returns object with an annotjson or an error.
    */
   public abstract import(file: IFile, audiofile: OAudiofile): ImportResult;
+
+  /**
+   * removes the extension of the current convert from the filename
+   * @param fullname
+   * @protected
+   */
+  protected getFileName(fullname: string) {
+    return fullname.replace(
+      new RegExp(this._extension.replace(/\./g, '\\.') + '$'),
+      ''
+    );
+  }
 }
diff --git a/libs/annotation/src/lib/converters/ELANConverter.ts b/libs/annotation/src/lib/converters/ELANConverter.ts
@@ -154,7 +154,7 @@ export class ELANConverter extends Converter {
 
     result.annotjson = new OAnnotJSON(
       audiofile.name,
-      file.name,
+      this.getFileName(file.name),
       audiofile.sampleRate
     );
 

diff --git a/libs/annotation/src/lib/converters/PartiturConverter.ts b/libs/annotation/src/lib/converters/PartiturConverter.ts
@@ -125,7 +125,7 @@ LBD:\n`;
 
     const result = new OAnnotJSON(
       audiofile.name,
-      file.name,
+      this.getFileName(file.name),
       audiofile.sampleRate
     );
     const tiers: any = {};

diff --git a/libs/annotation/src/lib/converters/PraatTableConverter.ts b/libs/annotation/src/lib/converters/PraatTableConverter.ts
@@ -102,7 +102,7 @@ export class PraatTableConverter extends Converter {
     const lines: string[] = content.split('\n');
 
     // check if filename is equal with audio file
-    const filename = file.name.substr(0, file.name.indexOf('.Table'));
+    const filename = this.getFileName(file.name);
 
     if (contains(audiofile.name, filename)) {
       const tiers: string[] = [];

diff --git a/libs/annotation/src/lib/converters/PraatTextgridConverter.ts b/libs/annotation/src/lib/converters/PraatTextgridConverter.ts
@@ -130,10 +130,7 @@ export class PraatTextgridConverter extends Converter {
     }
 
     const name = audiofile.name.substr(0, audiofile.name.lastIndexOf('.'));
-    const fileName =
-      file.name.indexOf('.') > -1
-        ? file.name.substr(0, file.name.lastIndexOf('.'))
-        : file.name;
+    const fileName = this.getFileName(file.name);
     if (name === fileName) {
       const result = new OAnnotJSON(
         audiofile.name,

diff --git a/libs/annotation/src/lib/converters/SRTConverter.ts b/libs/annotation/src/lib/converters/SRTConverter.ts
@@ -143,7 +143,7 @@ export class SRTConverter extends Converter {
     if (audiofile) {
       const result = new OAnnotJSON(
         audiofile.name,
-        file.name,
+        this.getFileName(file.name),
         audiofile.sampleRate
       );
 

diff --git a/libs/annotation/src/lib/converters/TextConverter.ts b/libs/annotation/src/lib/converters/TextConverter.ts
@@ -144,7 +144,7 @@ export class TextConverter extends Converter {
 
     const result = new OAnnotJSON(
       audiofile.name,
-      file.name,
+      this.getFileName(file.name),
       audiofile.sampleRate,
       [],
       []

diff --git a/libs/annotation/src/lib/converters/WebVTTConverter.ts b/libs/annotation/src/lib/converters/WebVTTConverter.ts
@@ -121,7 +121,7 @@ export class WebVTTConverter extends Converter {
     }
     const result = new OAnnotJSON(
       audiofile.name,
-      file.name,
+      this.getFileName(file.name),
       audiofile.sampleRate
     );
     result.levels.push(new OSegmentLevel(`OCTRA_1`));

diff --git a/libs/annotation/src/lib/converters/WhisperJSONConverter.ts b/libs/annotation/src/lib/converters/WhisperJSONConverter.ts
@@ -54,7 +54,7 @@ export class WhisperJSONConverter extends Converter {
 
     result.annotjson = new OAnnotJSON(
       audiofile.name,
-      file.name,
+      this.getFileName(file.name),
       audiofile.sampleRate
     );