refactor(octra): build system works again

IPS-LMU · Sep 18, 2023 · 3535df3 · 3535df3
1 parent 8524486
commit 3535df3
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 36 deletions.
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
@@ -18,7 +18,8 @@ import {
 import { timer } from 'rxjs';
 import { SupportedFilesModalComponent } from '../../modals/supportedfiles-modal/supportedfiles-modal.component';
 import { DefaultComponent } from '../default.component';
-import { AudioManager, fileListToArray, OAudiofile } from '@octra/web-media';
+import { AudioManager, fileListToArray } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 @Component({
   selector: 'octra-dropzone',

diff --git a/libs/annotation/src/lib/converters/AnnotJSONConverter.ts b/libs/annotation/src/lib/converters/AnnotJSONConverter.ts
@@ -6,7 +6,7 @@ import {
   OctraAnnotationFormatType,
 } from './Converter';
 import { OAnnotJSON } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class AnnotJSONConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'AnnotJSON';

diff --git a/libs/annotation/src/lib/converters/BundleJSONConverter.ts b/libs/annotation/src/lib/converters/BundleJSONConverter.ts
@@ -6,7 +6,7 @@ import {
   OctraAnnotationFormatType,
 } from './Converter';
 import { IAnnotJSON, OAnnotJSON } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export interface Bundle {
   ssffFiles: {

diff --git a/libs/annotation/src/lib/converters/CTMConverter.ts b/libs/annotation/src/lib/converters/CTMConverter.ts
@@ -7,7 +7,7 @@ import {
 } from './Converter';
 import { contains } from '@octra/utilities';
 import { OAnnotJSON, OLabel, OSegment, OSegmentLevel } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class CTMConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'CTM';

diff --git a/libs/annotation/src/lib/converters/Converter.ts b/libs/annotation/src/lib/converters/Converter.ts
@@ -1,5 +1,5 @@
 import { OAnnotJSON } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export type OctraAnnotationFormatType =
   | 'AnnotJSON'

diff --git a/libs/annotation/src/lib/converters/ELANConverter.ts b/libs/annotation/src/lib/converters/ELANConverter.ts
@@ -8,7 +8,7 @@ import {
 } from './Converter';
 import { OAnnotJSON, OLabel, OSegment, OSegmentLevel } from '../annotjson';
 import { DateTime } from 'luxon';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class ELANConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'ELAN';

diff --git a/libs/annotation/src/lib/converters/PartiturConverter.ts b/libs/annotation/src/lib/converters/PartiturConverter.ts
@@ -13,7 +13,7 @@ import {
   OSegment,
   OSegmentLevel,
 } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class PartiturConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'BASPartitur';

diff --git a/libs/annotation/src/lib/converters/PraatTableConverter.ts b/libs/annotation/src/lib/converters/PraatTableConverter.ts
@@ -14,7 +14,7 @@ import {
   OSegmentLevel,
 } from '../annotjson';
 import { contains } from '../functions';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class PraatTableConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'PraatTextTable';

diff --git a/libs/annotation/src/lib/converters/PraatTextgridConverter.ts b/libs/annotation/src/lib/converters/PraatTextgridConverter.ts
@@ -14,7 +14,7 @@ import {
   OSegmentLevel,
 } from '../annotjson';
 import { contains } from '../functions';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class PraatTextgridConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'TextGrid';

diff --git a/libs/annotation/src/lib/converters/SRTConverter.ts b/libs/annotation/src/lib/converters/SRTConverter.ts
@@ -6,7 +6,7 @@ import {
   OctraAnnotationFormatType,
 } from './Converter';
 import { OAnnotJSON, OLabel, OSegment, OSegmentLevel } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class SRTConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'SRT';

diff --git a/libs/annotation/src/lib/converters/TextConverter.ts b/libs/annotation/src/lib/converters/TextConverter.ts
@@ -6,7 +6,7 @@ import {
   OctraAnnotationFormatType,
 } from './Converter';
 import { OAnnotJSON, OLabel, OSegment, OSegmentLevel } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class TextConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'PlainText';

diff --git a/libs/annotation/src/lib/converters/WebVTTConverter.ts b/libs/annotation/src/lib/converters/WebVTTConverter.ts
@@ -12,7 +12,7 @@ import {
   OSegment,
   OSegmentLevel,
 } from '../annotjson';
-import { OAudiofile } from '@octra/web-media';
+import { OAudiofile } from '@octra/media';
 
 export class WebVTTConverter extends Converter {
   override _name: OctraAnnotationFormatType = 'WebVTT';

diff --git a/libs/annotation/src/lib/functions.ts b/libs/annotation/src/lib/functions.ts
@@ -1,8 +1,7 @@
 import { OLabel, OSegment } from './annotjson';
 import { Converter, IFile } from './converters';
-import { SampleUnit } from '@octra/media';
+import { OAudiofile, SampleUnit } from '@octra/media';
 import { OctraAnnotationSegment } from './octraAnnotationSegment';
-import { OAudiofile } from '@octra/web-media';
 
 export function convertFromSupportedConverters(
   converters: Converter[],

diff --git a/libs/media/src/index.ts b/libs/media/src/index.ts
@@ -1,2 +1,3 @@
 export * from './lib/audio';
 export * from './lib/types';
+export * from './lib/audio/audio-file';
diff --git a/libs/media/src/lib/audio/audio-file.ts b/libs/media/src/lib/audio/audio-file.ts
@@ -0,0 +1,20 @@
+export interface IAudioFile {
+  name: string;
+  size: number;
+  duration: number;
+  sampleRate: number;
+  url?: string;
+  type: string;
+}
+
+// TODO add extension and use name without it
+export class OAudiofile implements IAudioFile {
+  name!: string;
+  // need type attribute
+  arraybuffer?: ArrayBuffer;
+  size!: number;
+  duration!: number;
+  sampleRate!: number;
+  url?: string;
+  type!: string;
+}
diff --git a/libs/web-media/src/lib/audio/audio-info.ts b/libs/web-media/src/lib/audio/audio-info.ts
@@ -1,27 +1,6 @@
 import { SampleUnit } from '@octra/media';
 import { FileInfo } from '../data-info';
 
-export interface IAudioFile {
-  name: string;
-  size: number;
-  duration: number;
-  sampleRate: number;
-  url?: string;
-  type: string;
-}
-
-// TODO add extension and use name without it
-export class OAudiofile implements IAudioFile {
-  name!: string;
-  // need type attribute
-  arraybuffer?: ArrayBuffer;
-  size!: number;
-  duration!: number;
-  sampleRate!: number;
-  url?: string;
-  type!: string;
-}
-
 export class AudioInfo extends FileInfo {
   private readonly _bitrate: number = -1;
 

diff --git a/libs/web-media/src/lib/audio/audio-resource.ts b/libs/web-media/src/lib/audio/audio-resource.ts
@@ -1,6 +1,7 @@
-import { AudioInfo, OAudiofile } from './audio-info';
+import { AudioInfo } from './audio-info';
 import { MediaResource } from '../media-resource';
 import { SourceType } from '../types';
+import { OAudiofile } from '@octra/media';
 
 export class AudioResource extends MediaResource {
   private _info: AudioInfo;