Updated burrito files to conform to schema

Author: Greg Trihus

src/renderer/src/burrito/data/burritoBuilder.ts

@@ -38,22 +38,22 @@ interface BurritoLanguage {
   };
 }
 
-interface BurritoFormat {
-  compression: string;
-  trackConfiguration?: string;
-  bitRate?: number;
-  bitDepth?: number;
-  samplingRate?: number;
-}
-
-export interface BurritoFormats {
-  [key: string]: BurritoFormat;
-}
+// interface BurritoFormat {
+//   compression: string;
+//   trackConfiguration?: string;
+//   bitRate?: number;
+//   bitDepth?: number;
+//   samplingRate?: number;
+// }
+
+// export interface BurritoFormats {
+//   [key: string]: BurritoFormat;
+// }
 
 interface BurritoFlavor {
   name: string;
-  performance: string[];
-  formats: BurritoFormats;
+  // performance: string[];
+  // formats: BurritoFormats;
 }
 
 export interface BurritoScopes {
@@ -112,7 +112,7 @@ interface BurritoIngredient {
   scope?: {
     [key: string]: string[];
   };
-  role?: string[];
+  role?: string;
 }
 
 export interface BurritoIngredients {
@@ -177,8 +177,8 @@ export class BurritoBuilder {
         name: 'scripture',
         flavor: {
           name: 'audioTranslation',
-          performance: [],
-          formats: {},
+          // performance: [],
+          // formats: {},
         },
         currentScope: {},
       },
@@ -198,11 +198,11 @@ export class BurritoBuilder {
     return this;
   }
 
-  withIdAuthority(id: string, name: string): BurritoBuilder {
+  withIdAuthority(key: string, id: string, name: string): BurritoBuilder {
     if (!this.burrito.idAuthorities) {
       this.burrito.idAuthorities = {};
     }
-    this.burrito.idAuthorities[id] = {
+    this.burrito.idAuthorities[key] = {
       id,
       name: { en: name },
     };
@@ -239,8 +239,8 @@ export class BurritoBuilder {
               name: '',
               flavor: {
                 name: '',
-                performance: [],
-                formats: {},
+                // performance: [],
+                // formats: {},
               },
               currentScope: {},
             },
@@ -250,8 +250,8 @@ export class BurritoBuilder {
           name: '',
           flavor: {
             name: '',
-            performance: [],
-            formats: {},
+            // performance: [],
+            // formats: {},
           },
           currentScope: {},
         };
@@ -458,7 +458,11 @@ export const createAudioBurrito = () => {
       },
       comments: ['Updated with working audio files for GEN 1-3 and MAT 1-3'],
     })
-    .withIdAuthority('dbl', 'The Digital Bible Library')
+    .withIdAuthority(
+      'dbl',
+      'https://www.thedigitalbiblelibrary.org',
+      'The Digital Bible Library'
+    )
     .withIdentification({
       primary: {
         dbl: {
@@ -474,16 +478,16 @@ export const createAudioBurrito = () => {
     })
     .withLanguage('en', 'English')
     .withFlavor({
-      performance: ['multipleVoice', 'drama', 'withMusic'],
-      formats: {
-        format1: {
-          compression: 'mp3',
-          trackConfiguration: '2/0 (Stereo)',
-          bitRate: 128000,
-          bitDepth: 16,
-          samplingRate: 44100,
-        },
-      },
+      // performance: ['multipleVoice', 'drama', 'withMusic'],
+      // formats: {
+      //   format1: {
+      //     compression: 'mp3',
+      //     trackConfiguration: '2/0 (Stereo)',
+      //     bitRate: 128000,
+      //     bitDepth: 16,
+      //     samplingRate: 44100,
+      //   },
+      // },
     })
     .withAgency({
       id: 'dbl::54650cfa5117ad690fb05fb6',

src/renderer/src/routes/useBurritoAudo.ts

@@ -6,7 +6,6 @@ import {
 } from '../burrito/data/alignmentBuilder';
 import {
   Burrito,
-  BurritoFormats,
   BurritoIngredients,
   BurritoScopes,
 } from '../burrito/data/burritoBuilder';
@@ -192,7 +191,7 @@ export const useBurritoAudo = (teamId: string) => {
       mimeType: 'application/json',
       size: alignmentContent.length,
       scope: { [book]: Array.from(chapters).sort() },
-      role: ['timing'],
+      role: 'timing',
     };
     const curScopes = scopes.get(book) || [];
     scopes.set(book, [...curScopes, ...Array.from(chapters).sort()]);
@@ -206,17 +205,17 @@ export const useBurritoAudo = (teamId: string) => {
     metadata.ingredients = ingredients;
 
     // add the formats to the metadata file
-    const formats: BurritoFormats = {};
-    let formatn = 0;
-    Array.from(compressions).forEach((c) => {
-      formats[`format${++formatn}`] = {
-        compression: c,
-        trackConfiguration: 'mono',
-      };
-    });
-    if (metadata.type?.flavorType?.flavor) {
-      metadata.type.flavorType.flavor.formats = formats;
-    }
+    // const formats: BurritoFormats = {};
+    // let formatn = 0;
+    // Array.from(compressions).forEach((c) => {
+    //   formats[`format${++formatn}`] = {
+    //     compression: c,
+    //     trackConfiguration: 'mono',
+    //   };
+    // });
+    // if (metadata.type?.flavorType?.flavor) {
+    //   metadata.type.flavorType.flavor.formats = formats;
+    // }
     return metadata;
   };
 };

src/renderer/src/routes/useCreateBurrito.ts

@@ -89,6 +89,11 @@ export const useCreateBurrito = (teamId: string) => {
     [teamId]
   );
 
+  const cleanName = (name: string) => {
+    const m = name.match(/^[^A-Za-z]*([A-Za-z0-9 ]+)[^A-Za-z0-9]*$/);
+    return m ? m[1] : name;
+  };
+
   const getMetadata = () => {
     const userRec = users.find((user) => user.id === userId);
     const teamRec = teams.find((team) => team.id === teamId);
@@ -118,7 +123,11 @@ export const useCreateBurrito = (teamId: string) => {
           }`,
         ],
       })
-      .withIdAuthority('apm', productName)
+      .withIdAuthority(
+        'apm',
+        'https://www.audioprojectmanager.org',
+        productName
+      )
       .withIdentification({
         primary: {
           apm: {
@@ -130,8 +139,8 @@ export const useCreateBurrito = (teamId: string) => {
         },
         name: {
           en:
-            bible?.attributes.bibleName ||
-            teamRec?.attributes.name ||
+            cleanName(bible?.attributes.bibleName || '') ||
+            cleanName(teamRec?.attributes.name || '') ||
             'Unknown Bible',
         },
         description: { en: bible?.attributes.description || '' },
@@ -142,7 +151,9 @@ export const useCreateBurrito = (teamId: string) => {
       .withAgency({
         id: `apm::${teamRemId}`,
         roles: ['rightsHolder'],
-        name: { en: teamRec?.attributes.name || 'Unknown Team' },
+        name: {
+          en: cleanName(teamRec?.attributes.name || '') || 'Unknown Team',
+        },
       })
       .withTargetArea('US', 'United States')
       .withLocalizedNames(localizedNames)