waha-shared 1.0.315 → 1.0.317

package/dist/functions/sets.js

@@ -6,7 +6,6 @@ exports.convertSToString = convertSToString;
 exports.shouldShowLesson = shouldShowLesson;
 exports.getExpectedLessonDuration = getExpectedLessonDuration;
 const bibleStatuses_1 = require("../data/bibleStatuses");
-const mediaDurations_1 = require("../data/mediaDurations");
 const sets_1 = require("../data/sets");
 const specialIds_1 = require("../data/specialIds");
 const youtubeVideos_1 = require("../data/youtubeVideos");
@@ -96,52 +95,41 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
             id: 'title',
             index: 0,
             indexWithinChapter: 0,
-            fileName: '',
-            languageId,
+            path: '',
         },
     ];
     fellowshipQuestions.forEach((questionId, index) => {
-        const fileName = `${languageInfo.contentLanguages.questionAudio}.${questionId}.mp3`;
         sections.push({
             id: questionId,
-            languageId: languageInfo.contentLanguages.questionAudio,
             index: sections.length,
             header: index === 0 ? t.fellowship : undefined,
             chapter: sets_2.Chapter.FELLOWSHIP,
             indexWithinChapter: index,
             text: fellowshipQuestionsText[index],
-            fileName,
+            path: (0, utils_1.join)(languageInfo.contentLanguages.questionAudio, 'questions', [languageInfo.contentLanguages.questionAudio, questionId, 'mp3'].join('.')),
         });
     });
     if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
         sections.push({
             id: 'eq',
-            languageId: languageInfo.contentLanguages.intros,
             index: sections.length,
             chapter: sets_2.Chapter.INTRODUCTION,
             indexWithinChapter: 0,
             pauseBefore: 0,
             text: t.introductions.introductions.eq,
-            fileName: `${languageInfo.contentLanguages.intros}.eq.mp3`,
+            path: (0, utils_1.join)(languageInfo.contentLanguages.intros, [languageInfo.contentLanguages.intros, 'eq', 'mp3'].join('.')),
         });
     }
     else if (specialIds_1.specialIds.growingAsDmcSetIds.includes(setInfo.setId)) {
-        const introFileName = [
-            languageInfo.contentLanguages.intros,
-            lessonId,
-            'intro',
-            'mp3',
-        ].join('.');
         sections.push({
             id: 'introduction',
-            languageId: languageInfo.contentLanguages.intros,
             index: sections.length,
             chapter: sets_2.Chapter.INTRODUCTION,
             indexWithinChapter: 0,
             pauseBefore: languageInfo.lessonPauses.beforeFtb,
             header: t.introductions.introduction,
             text: t.introductions.introductions[lessonId],
-            fileName: introFileName,
+            path: (0, utils_1.join)(languageInfo.contentLanguages.intros, [languageInfo.contentLanguages.intros, lessonId, 'intro', 'mp3'].join('.')),
         });
     }
     let lastBook = null;
@@ -155,18 +143,17 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
         const ftbRequired = lastBook !== passageInfo.book;
         sections.push({
             id: `${bibleId};${passageId}`,
-            languageId,
             index: sections.length,
             chapter: sets_2.Chapter.STORY,
             indexWithinChapter: index,
             pauseBefore: ftbRequired
                 ? languageInfo.lessonPauses.beforeFtb
                 : languageInfo.lessonPauses.betweenPassages,
-            ftbFileName: ftbRequired
-                ? `${languageInfo.contentLanguages.ftbs}.${passageInfo.book}.mp3`
+            ftbPath: ftbRequired
+                ? (0, utils_1.join)(languageInfo.contentLanguages.ftbs, 'ftb', [languageInfo.contentLanguages.ftbs, passageInfo.book, 'mp3'].join('.'))
                 : undefined,
-            fileName: bibleStatuses_1.bibleStatuses[bibleId]?.customPassages?.[passageId]
-                ? passageId + '.mp3'
+            path: bibleStatuses_1.bibleStatuses[bibleId]?.customPassages?.[passageId]
+                ? (0, utils_1.join)('audio_bibles', bibleId, 'custom_passages', [passageId, 'mp3'].join('.'))
                 : passageInfo.chapterAudioFileName,
             header: (0, scripturePassages_1.getPassagesString)([{ bibleId, passageId }]),
         });
@@ -191,16 +178,21 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
             const ftbRequired = lastBook !== passageInfo.book;
             sections.push({
                 id: `${modifier.bibleId};${passageId}`,
-                languageId,
                 index: sections.length,
                 chapter: sets_2.Chapter.STORY,
                 indexWithinChapter: concatStoryIndex,
-                fileName: passageInfo.chapterAudioFileName,
+                path: bibleStatuses_1.bibleStatuses[modifier.bibleId]?.customPassages?.[passageId]
+                    ? (0, utils_1.join)('audio_bibles', modifier.bibleId, 'custom_passages', [passageId, 'mp3'].join('.'))
+                    : passageInfo.chapterAudioFileName,
                 pauseBefore: ftbRequired
                     ? languageInfo.lessonPauses.beforeFtb
                     : languageInfo.lessonPauses.betweenPassages,
-                ftbFileName: ftbRequired
-                    ? `${languageInfo.contentLanguages.ftbs}.${passageInfo.book}.mp3`
+                ftbPath: ftbRequired
+                    ? (0, utils_1.join)(languageInfo.contentLanguages.ftbs, 'ftb', [
+                        languageInfo.contentLanguages.ftbs,
+                        passageInfo.book,
+                        'mp3',
+                    ].join('.'))
                     : undefined,
                 header: (0, scripturePassages_1.getPassagesString)([{ bibleId: modifier.bibleId, passageId }]),
             });
@@ -209,14 +201,8 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
         });
     });
     applicationQuestions.forEach((questionId, index) => {
-        const fileName = questionId.includes('video')
-            ? `${languageInfo.contentLanguages.trainingVideos}.${lessonId}.mp4`
-            : `${languageInfo.contentLanguages.questionAudio}.${questionId}.mp3`;
         sections.push({
             id: questionId,
-            languageId: questionId.includes('video')
-                ? languageInfo.contentLanguages.trainingVideos
-                : languageInfo.contentLanguages.questionAudio,
             index: sections.length,
             chapter: sets_2.Chapter.APPLICATION,
             indexWithinChapter: index,
@@ -225,7 +211,17 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
             text: questionId.includes('video')
                 ? t.training_video
                 : applicationQuestionsText[index],
-            fileName,
+            path: questionId.includes('video')
+                ? (0, utils_1.join)(languageInfo.contentLanguages.trainingVideos, 'course', 'videos_compressed', [
+                    languageInfo.contentLanguages.trainingVideos,
+                    lessonId,
+                    'mp4',
+                ].join('.'))
+                : (0, utils_1.join)(languageInfo.contentLanguages.questionAudio, 'questions', [
+                    languageInfo.contentLanguages.questionAudio,
+                    questionId,
+                    'mp3',
+                ].join('.')),
         });
     });
     const baseInfo = {
@@ -241,106 +237,62 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
         .filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP)
         .reduce((sum, section) => sum +
         (section.pauseBefore ?? 0) +
-        (mediaDurations_1.mediaDurations[languageInfo.contentLanguages.questionAudio]?.[section.fileName] ?? 0), 0);
+        ((0, utils_1.getCachedDuration)(section.path) ?? 0), 0);
     let applicationDuration = sections
         .filter((s) => s.chapter === sets_2.Chapter.APPLICATION)
         .reduce((sum, section) => sum +
         (section.pauseBefore ?? 0) +
-        (mediaDurations_1.mediaDurations[languageInfo.contentLanguages.questionAudio]?.[section.fileName] ?? 0), 0);
+        ((0, utils_1.getCachedDuration)(section.path) ?? 0), 0);
     if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
-        const eqId = `${languageInfo.contentLanguages.intros}.eq`;
-        const eqFileName = `${eqId}.mp3`;
-        const eqPath = (0, utils_1.join)(languageInfo.contentLanguages.intros, 'introductions', eqFileName);
         return {
             type: 'eq',
             ...baseInfo,
             fellowshipDuration,
             applicationDuration,
-            eq: {
-                id: eqId,
-                localFileName: eqFileName,
-                remoteFileName: eqFileName,
-                path: eqPath,
-                url: (0, utils_1.firebasePath)(eqPath),
-            },
+            eqPath: (0, utils_1.join)(languageInfo.contentLanguages.intros, 'introductions', `${languageInfo.contentLanguages.intros}.eq.mp3`),
         };
     }
     const assetVersion = languageInfo.audioAssetVersion ?? '';
-    const fullLessonId = `${languageId}.${lessonId}`;
-    const fullLessonFileName = `${fullLessonId}.mp3`;
-    const fullLessonPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, fullLessonFileName);
-    const full = {
-        id: fullLessonId,
-        localFileName: fullLessonFileName,
-        remoteFileName: fullLessonFileName,
-        path: fullLessonPath,
-        url: (0, utils_1.firebasePath)(fullLessonPath),
-    };
-    const storyId = fullLessonId + '.story';
-    const storyFileName = `${storyId}.mp3`;
-    const storyPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, storyFileName);
-    const story = {
-        id: storyId,
-        localFileName: storyFileName,
-        remoteFileName: storyFileName,
-        path: storyPath,
-        url: (0, utils_1.firebasePath)(storyPath),
-    };
     if (setInfo.setId === specialIds_1.specialIds.dmCourseSetId || languageId === 'ase') {
-        let video;
-        let trainingVideo;
+        let videoPath;
+        let trainingVideoPath;
+        let trainingVideoNarrationPath;
+        let trainingVideoOriginalPath;
+        let trainingVideoNarrationWithMusicPath;
+        let youtubeLink;
         if (languageId === 'ase') {
-            const aseVideoLessonId = `${languageId}.${lessonId}`;
-            const aseVideoLocalFileName = `${aseVideoLessonId}.mp4`;
-            const aseVideoRemoteFileName = `${aseVideoLessonId}.1080.mp4`;
-            const aseVideoPath = (0, utils_1.join)(languageId, 'full_lessons', setInfo.setId, aseVideoRemoteFileName);
-            video = {
-                id: aseVideoLessonId,
-                localFileName: aseVideoLocalFileName,
-                remoteFileName: aseVideoRemoteFileName,
-                path: aseVideoPath,
-                url: (0, utils_1.firebasePath)(aseVideoPath),
-            };
-            trainingVideo = undefined;
+            videoPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, [languageId, lessonId, '1080', 'mp4'].join('.'));
+            trainingVideoPath = undefined;
         }
         else {
-            const videoLessonId = [
+            videoPath = (0, utils_1.join)(languageId, `full_lessons`, setInfo.setId, [
                 languageId,
                 languageInfo.contentLanguages.trainingVideos,
                 lessonId,
-            ].join('.');
-            const videoLessonRemoteFileName = `${videoLessonId}.1080.mp4`;
-            const videoLessonLocalFileName = `${videoLessonId}.mp4`;
-            const videoPath = (0, utils_1.join)(languageId, 'full_lessons', setInfo.setId, videoLessonRemoteFileName);
-            video = {
-                id: videoLessonId,
-                localFileName: videoLessonLocalFileName,
-                remoteFileName: videoLessonRemoteFileName,
-                path: videoPath,
-                url: (0, utils_1.firebasePath)(videoPath),
-            };
-            const trainingVideoId = [
-                languageInfo.contentLanguages.trainingVideos,
-                lessonId,
-            ].join('.');
-            const trainingVideoFileName = `${trainingVideoId}.mp4`;
+                '1080',
+                'mp4',
+            ].join('.'));
+            const trainingVideosDir = (0, utils_1.join)(languageInfo.contentLanguages.trainingVideos, 'course');
+            trainingVideoPath = (0, utils_1.join)(trainingVideosDir, 'videos_compressed', [languageInfo.contentLanguages.trainingVideos, lessonId, 'mp4'].join('.'));
+            trainingVideoNarrationPath = (0, utils_1.join)(trainingVideosDir, 'audio', [languageInfo.contentLanguages.trainingVideos, lessonId, 'mp3'].join('.'));
+            trainingVideoOriginalPath = (0, utils_1.join)(trainingVideosDir, 'videos_export', [languageInfo.contentLanguages.trainingVideos, lessonId, 'm4v'].join('.'));
+            trainingVideoNarrationWithMusicPath = (0, utils_1.join)(trainingVideosDir, 'audio_with_music', [languageInfo.contentLanguages.trainingVideos, lessonId, 'mp3'].join('.'));
             // Add the length of the training video to the application duration.
-            applicationDuration +=
-                mediaDurations_1.mediaDurations[languageInfo.contentLanguages.trainingVideos]?.[trainingVideoFileName] ?? 0;
-            const trainingVideoPath = (0, utils_1.join)(languageInfo.contentLanguages.trainingVideos, 'course', 'videos_compressed', trainingVideoFileName);
-            trainingVideo = {
-                id: trainingVideoId,
-                localFileName: trainingVideoFileName,
-                remoteFileName: trainingVideoFileName,
-                path: trainingVideoPath,
-                url: (0, utils_1.firebasePath)(trainingVideoPath),
-            };
+            applicationDuration += (0, utils_1.getCachedDuration)(trainingVideoPath) ?? 0;
+            if (videoPath && (0, utils_1.basename)(videoPath) in youtubeVideos_1.youtubeVideos)
+                youtubeLink =
+                    'https://www.youtube.com/watch?v=' +
+                        youtubeVideos_1.youtubeVideos[(0, utils_1.basename)(videoPath)];
+            if (specialIds_1.specialIds.dmCourseVideoOnlyLessonIds.includes(lessonId))
+                videoPath = trainingVideoPath;
         }
-        let youtubeLink;
-        if (video.remoteFileName && video.remoteFileName in youtubeVideos_1.youtubeVideos)
-            youtubeLink =
-                'https://www.youtube.com/watch?v=' +
-                    youtubeVideos_1.youtubeVideos[video.remoteFileName];
+        const fullPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, [
+            languageId,
+            languageInfo.contentLanguages.trainingVideos,
+            lessonId,
+            'mp3',
+        ].join('.'));
+        const storyPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, [languageId, lessonId, 'story', 'mp3'].join('.'));
         return {
             type: 'video',
             ...baseInfo,
@@ -348,27 +300,29 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
             applicationDuration,
             lessonSectionHeader: thisSetTranslations?.sectionHeaders?.[lessonId],
             lessonSectionBody: thisSetTranslations?.sectionBodies?.[lessonId],
-            video,
-            trainingVideo,
-            full: lesson.s.length > 0 ? full : undefined,
-            story: lesson.s.length > 0 ? story : undefined,
+            videoPath,
+            trainingVideoPath,
+            trainingVideoNarrationPath,
+            trainingVideoOriginalPath,
+            trainingVideoNarrationWithMusicPath,
+            fullPath: lesson.s.length > 0 ? fullPath : undefined,
+            storyPath: lesson.s.length > 0 ? storyPath : undefined,
             youtubeLink,
             passagesString,
         };
     }
     else {
+        const fullPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, `${languageId}.${lessonId}.mp3`);
+        const storyPath = fullPath.replace('.mp3', '.story.mp3');
         return {
             type: 'dbs',
             ...baseInfo,
             fellowshipDuration,
             applicationDuration,
             passagesString,
-            full,
-            story,
-            dbsCast: {
-                remoteFileName: `${languageId}.${lessonId}.1080.mp4`,
-                url: (0, utils_1.firebasePath)((0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, `${languageId}.${lessonId}.1080.mp4`)),
-            },
+            fullPath,
+            storyPath,
+            dbsCastPath: (0, utils_1.join)(languageId, `full_lessons`, setInfo.setId, [languageId, lessonId, '1080', 'mp4'].join('.')),
         };
     }
 }
@@ -413,27 +367,25 @@ function convertSToString(time) {
     }
 }
 /** Determines whether a lesson should be visible in Waha. */
-function shouldShowLesson(lessonInfo, languageInfo) {
+function shouldShowLesson(lessonInfo) {
     if (lessonInfo?.lessonTitle === undefined || lessonInfo.lessonTitle === '') {
         console.log('Missing lesson info or lessonTitle lesson:', lessonInfo?.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'eq' &&
-        mediaDurations_1.mediaDurations[languageInfo.contentLanguages.intros]?.[lessonInfo.eq.remoteFileName] === undefined) {
+        (0, utils_1.getCachedDuration)(lessonInfo.eqPath) === undefined) {
         console.log('Missing remote eq file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'dbs' &&
-        mediaDurations_1.mediaDurations[lessonInfo.languageId]?.[lessonInfo.full.remoteFileName] ===
-            undefined) {
+        (0, utils_1.getCachedDuration)(lessonInfo.fullPath) === undefined) {
         console.log('Missing remote dbs file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'video' &&
-        lessonInfo.video &&
-        mediaDurations_1.mediaDurations[lessonInfo.languageId]?.[lessonInfo.video.remoteFileName] ===
-            undefined) {
-        console.log('Missing remote video for lesson:', lessonInfo.video.remoteFileName);
+        lessonInfo.videoPath &&
+        (0, utils_1.getCachedDuration)(lessonInfo.videoPath) === undefined) {
+        console.log('Missing remote video for lesson:', lessonInfo.lessonId);
         return false;
     }
     else

package/dist/functions/upload.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Minimal structural shape of `@google-cloud/storage`'s `Bucket`. Defined
+ * structurally so this module doesn't pull `@google-cloud/storage` into the
+ * shared package's dependency graph — callers pass the real bucket.
+ */
+export interface UploadBucket {
+    file(path: string): {
+        exists(): Promise<[boolean]>;
+        setMetadata(meta: {
+            metadata: Record<string, string>;
+        }): Promise<unknown>;
+    };
+    upload(localPath: string, options: {
+        destination: string;
+        contentType: string;
+        public?: boolean;
+    }): Promise<unknown>;
+}
+export type UploadResult = 'uploaded' | 'skipped';
+/**
+ * Upload a local file to a Cloud Storage bucket. The content type is inferred
+ * from the file extension via {@link CONTENT_TYPE_BY_EXTENSION}. Returns
+ * `'skipped'` if the remote file already exists and `overwrite` is falsy,
+ * `'uploaded'` otherwise. Throws if the underlying bucket operation fails.
+ *
+ * Sets a `duration` metadata field (in seconds) from ffprobe when probing
+ * succeeds; metadata failures are swallowed since they're non-fatal.
+ */
+export declare function uploadFile({ bucket, localPath, overwrite, remotePath, }: {
+    bucket: UploadBucket;
+    localPath: string;
+    remotePath: string;
+    overwrite?: boolean;
+}): Promise<UploadResult>;

package/dist/functions/upload.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadFile = uploadFile;
+const path_1 = require("path");
+const ffmpeg_1 = require("./ffmpeg");
+const CONTENT_TYPE_BY_EXTENSION = {
+    '.mp3': 'audio/mpeg',
+    '.mp4': 'video/mp4',
+};
+function contentTypeFor(path) {
+    const ext = (0, path_1.extname)(path).toLowerCase();
+    const contentType = CONTENT_TYPE_BY_EXTENSION[ext];
+    if (!contentType)
+        throw new Error(`uploadFile: no content type mapped for extension '${ext}' (path: ${path}). ` +
+            `Add it to CONTENT_TYPE_BY_EXTENSION in shared/functions/upload.ts.`);
+    return contentType;
+}
+/**
+ * Upload a local file to a Cloud Storage bucket. The content type is inferred
+ * from the file extension via {@link CONTENT_TYPE_BY_EXTENSION}. Returns
+ * `'skipped'` if the remote file already exists and `overwrite` is falsy,
+ * `'uploaded'` otherwise. Throws if the underlying bucket operation fails.
+ *
+ * Sets a `duration` metadata field (in seconds) from ffprobe when probing
+ * succeeds; metadata failures are swallowed since they're non-fatal.
+ */
+async function uploadFile({ bucket, localPath, overwrite, remotePath, }) {
+    const contentType = contentTypeFor(localPath);
+    const [exists] = await bucket.file(remotePath).exists();
+    if (exists && !overwrite)
+        return 'skipped';
+    await bucket.upload(localPath, {
+        destination: remotePath,
+        contentType,
+        public: true,
+    });
+    try {
+        const duration = await (0, ffmpeg_1.getAudioDuration)(localPath);
+        if (!isNaN(duration) && duration > 0) {
+            await bucket.file(remotePath).setMetadata({
+                metadata: { duration: duration.toString() },
+            });
+        }
+    }
+    catch {
+        // Non-fatal — proceed even if setting duration metadata fails.
+    }
+    return 'uploaded';
+}

package/dist/functions/utils.d.ts

@@ -1,2 +1,7 @@
 export declare const join: (...parts: string[]) => string;
-export declare const firebasePath: (path: string) => string;
+export declare const basename: (p: string) => string;
+export declare const first: (p: string) => string;
+export declare const dirname: (p: string) => string;
+export declare const extname: (p: string) => string;
+export declare const basenamenoext: (p: string) => string;
+export declare const getCachedDuration: (path: string) => number | undefined;

package/dist/functions/utils.js

@@ -1,8 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firebasePath = exports.join = void 0;
-const firebase_1 = require("../data/firebase");
+exports.getCachedDuration = exports.basenamenoext = exports.extname = exports.dirname = exports.first = exports.basename = exports.join = void 0;
+const mediaDurations_1 = require("../data/mediaDurations");
 const join = (...parts) => parts.join('/').replace(/\/+/g, '/');
 exports.join = join;
-const firebasePath = (path) => firebase_1.firebaseUrl + encodeURIComponent(path) + `?alt=media`;
-exports.firebasePath = firebasePath;
+const basename = (p) => p.split('/').pop();
+exports.basename = basename;
+const first = (p) => p.split('/')[0];
+exports.first = first;
+const dirname = (p) => p.substring(0, p.lastIndexOf('/'));
+exports.dirname = dirname;
+const extname = (p) => p.slice(p.lastIndexOf('.'));
+exports.extname = extname;
+const basenamenoext = (p) => {
+    const base = (0, exports.basename)(p);
+    const dotIndex = base.lastIndexOf('.');
+    return dotIndex !== -1 ? base.slice(0, dotIndex) : base;
+};
+exports.basenamenoext = basenamenoext;
+const getCachedDuration = (path) => mediaDurations_1.mediaDurations[(0, exports.first)(path)]?.[(0, exports.basename)(path)];
+exports.getCachedDuration = getCachedDuration;

package/dist/types/sets.d.ts

@@ -13,13 +13,6 @@ export interface SetInfo extends Set {
     setTag?: string;
     setLink: string;
 }
-export interface Content {
-    id: string;
-    localFileName: string;
-    remoteFileName: string;
-    path: string;
-    url: string;
-}
 export interface BaseInfo extends LanguageInfo {
     lessonNumber: string;
     lessonTitle: string | undefined;
@@ -32,7 +25,6 @@ export interface BaseInfo extends LanguageInfo {
 }
 export interface Section {
     id: string;
-    languageId: string;
     header?: string;
     text?: string;
     index: number;
@@ -44,8 +36,8 @@ export interface Section {
      * Filename for the "From the Book" clip to insert before this section, if
      * there is one.
      */
-    ftbFileName?: string;
-    fileName: string;
+    ftbPath?: string;
+    path: string;
 }
 export interface EnrichedSection extends Section {
     startTime: number;
@@ -60,26 +52,29 @@ export interface EnrichedSection extends Section {
 }
 export interface DbsInfo extends BaseInfo, SetInfo, Lesson {
     type: 'dbs';
-    full: Content;
-    story: Content;
-    dbsCast: {
-        remoteFileName: string;
-        url: string;
-    };
+    fullPath: string;
+    storyPath: string;
+    dbsCastPath: string;
     passagesString: string;
 }
 export interface VideoInfo extends BaseInfo, SetInfo, Lesson {
     type: 'video';
-    video: Content;
-    trainingVideo: Content | undefined;
+    videoPath: string;
+    trainingVideoPath: string | undefined;
+    trainingVideoNarrationPath: string | undefined;
+    trainingVideoNarrationWithMusicPath: string | undefined;
+    trainingVideoOriginalPath: string | undefined;
     /**
      * Full audio file (training-video audio + scripture + questions). Populated
      * only for video lessons that have audio to play (e.g. dmCourse lessons with
      * scripture passages). Video-only lessons leave this undefined.
      */
-    full?: Content;
-    /** Story audio file (scripture passages only). Same population rules as `full`. */
-    story?: Content;
+    fullPath?: string;
+    /**
+     * Story audio file (scripture passages only). Same population rules as
+     * `full`.
+     */
+    storyPath?: string;
     lessonSectionHeader: string | undefined;
     lessonSectionBody: string | undefined;
     youtubeLink: string | undefined;
@@ -87,7 +82,7 @@ export interface VideoInfo extends BaseInfo, SetInfo, Lesson {
 }
 export interface EqInfo extends BaseInfo, SetInfo, Lesson {
     type: 'eq';
-    eq: Content;
+    eqPath: string;
 }
 export type LessonInfo = DbsInfo | VideoInfo | EqInfo;
 export declare enum Chapter {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waha-shared",
-  "version": "1.0.315",
+  "version": "1.0.317",
   "author": "Waha",
   "dependencies": {
     "@types/signale": "^1.4.7",