waha-shared 1.0.326 → 1.0.331

package/dist/functions/sets.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSetInfo = getSetInfo;
-exports.assembleLessonSections = assembleLessonSections;
 exports.getLessonInfo = getLessonInfo;
+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");
@@ -52,79 +53,95 @@ function getSetInfo({ setId, languageId, setIds, t, }) {
     };
     return toReturn;
 }
-function getSetTranslations({ setInfo, lessonId, languageId, t, }) {
+function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions, }) {
+    if (!lessonId)
+        return;
+    else if (lessonId.split('.').length !== 3)
+        return;
+    const [category, setNumber, lessonNumber] = lessonId.split('.');
+    const languageId = languageInfo.languageId;
+    setInfo =
+        setInfo ??
+            getSetInfo({
+                setId: [category, setNumber].join('.'),
+                languageId,
+                setIds: languageInfo.setIds,
+                t,
+            });
+    if (!setInfo) {
+        console.log('Missing set info for lesson:', lessonId);
+        return;
+    }
+    const lesson = setInfo.lessons.find((lesson) => lesson.lessonId === lessonId);
+    if (!lesson)
+        return;
+    let thisSetTranslations;
+    let lessonTitle;
     if (languageId === 'ase') {
         const englishEquivalent = sets_1.sets.find((set) => set.name === setInfo.name && !set.comment);
-        const thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === englishEquivalent?.setId);
-        const [, , lessonNumber] = lessonId.split('.');
-        return thisSetTranslations
-            ? {
-                ...thisSetTranslations,
-                lessonTitle: thisSetTranslations?.lessonTitles?.[`${englishEquivalent?.setId}.${lessonNumber}`],
-            }
-            : undefined;
+        thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === englishEquivalent?.setId);
+        lessonTitle =
+            thisSetTranslations?.lessonTitles?.[`${englishEquivalent?.setId}.${lessonNumber}`];
     }
     else {
-        const thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === setInfo?.setId);
-        return thisSetTranslations
-            ? {
-                ...thisSetTranslations,
-                lessonTitle: thisSetTranslations?.lessonTitles?.[lessonId],
-            }
-            : undefined;
+        thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === setInfo?.setId);
+        lessonTitle = thisSetTranslations?.lessonTitles?.[lessonId];
     }
-}
-/** Assembles all of the audio sections for a lesson. */
-function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQuestions, }) {
     const fellowshipQuestions = languageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.f)?.questions ?? [];
-    const applicationQuestions = languageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.a)?.questions ?? [];
     const fellowshipQuestionsText = fellowshipQuestions.map((questionId) => useSpokenQuestions ? t.questionsSpoken[questionId] : t.questions[questionId]);
+    const applicationQuestions = languageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.a)?.questions ?? [];
     const applicationQuestionsText = applicationQuestions.map((questionId) => useSpokenQuestions ? t.questionsSpoken[questionId] : t.questions[questionId]);
     const sections = [
         {
             id: 'title',
             index: 0,
             indexWithinChapter: 0,
-            path: '',
+            fileName: '',
+            languageId,
         },
     ];
     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],
-            path: (0, utils_1.join)(languageInfo.contentLanguages.questionAudio, 'questions', [languageInfo.contentLanguages.questionAudio, questionId, 'mp3'].join('.')),
+            fileName,
         });
     });
     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,
-            path: (0, utils_1.join)(languageInfo.contentLanguages.intros, [languageInfo.contentLanguages.intros, 'eq', 'mp3'].join('.')),
+            fileName: `${languageInfo.contentLanguages.intros}.eq.mp3`,
         });
     }
     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[lesson.lessonId],
-            path: (0, utils_1.join)(languageInfo.contentLanguages.intros, [
-                languageInfo.contentLanguages.intros,
-                lesson.lessonId,
-                'intro',
-                'mp3',
-            ].join('.')),
+            text: t.introductions.introductions[lessonId],
+            fileName: introFileName,
         });
     }
     let lastBook = null;
@@ -138,22 +155,29 @@ function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQue
         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,
-            ftbPath: ftbRequired
-                ? (0, utils_1.join)(languageInfo.contentLanguages.ftbs, 'ftb', [languageInfo.contentLanguages.ftbs, passageInfo.book, 'mp3'].join('.'))
+            ftbFileName: ftbRequired
+                ? `${languageInfo.contentLanguages.ftbs}.${passageInfo.book}.mp3`
                 : undefined,
-            path: bibleStatuses_1.bibleStatuses[bibleId]?.customPassages?.[passageId]
-                ? (0, utils_1.join)('audio_bibles', bibleId, 'custom_passages', [passageId, 'mp3'].join('.'))
+            fileName: bibleStatuses_1.bibleStatuses[bibleId]?.customPassages?.[passageId]
+                ? passageId + '.mp3'
                 : passageInfo.chapterAudioFileName,
             header: (0, scripturePassages_1.getPassagesString)([{ bibleId, passageId }]),
         });
         lastBook = passageInfo.book;
     });
+    const passagesString = (0, scripturePassages_1.getPassagesString)(sections
+        .filter((section) => section.chapter === sets_2.Chapter.STORY)
+        .map((section) => {
+        const [bibleId, passageId] = section.id.split(';');
+        return { passageId, bibleId };
+    }));
     let concatStoryIndex = lesson.s.length;
     languageInfo.bibleModifiers?.forEach((modifier) => {
         lesson.s.forEach((passageId) => {
@@ -167,21 +191,16 @@ function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQue
             const ftbRequired = lastBook !== passageInfo.book;
             sections.push({
                 id: `${modifier.bibleId};${passageId}`,
+                languageId,
                 index: sections.length,
                 chapter: sets_2.Chapter.STORY,
                 indexWithinChapter: concatStoryIndex,
-                path: bibleStatuses_1.bibleStatuses[modifier.bibleId]?.customPassages?.[passageId]
-                    ? (0, utils_1.join)('audio_bibles', modifier.bibleId, 'custom_passages', [passageId, 'mp3'].join('.'))
-                    : passageInfo.chapterAudioFileName,
+                fileName: passageInfo.chapterAudioFileName,
                 pauseBefore: ftbRequired
                     ? languageInfo.lessonPauses.beforeFtb
                     : languageInfo.lessonPauses.betweenPassages,
-                ftbPath: ftbRequired
-                    ? (0, utils_1.join)(languageInfo.contentLanguages.ftbs, 'ftb', [
-                        languageInfo.contentLanguages.ftbs,
-                        passageInfo.book,
-                        'mp3',
-                    ].join('.'))
+                ftbFileName: ftbRequired
+                    ? `${languageInfo.contentLanguages.ftbs}.${passageInfo.book}.mp3`
                     : undefined,
                 header: (0, scripturePassages_1.getPassagesString)([{ bibleId: modifier.bibleId, passageId }]),
             });
@@ -190,8 +209,14 @@ function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQue
         });
     });
     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,
@@ -200,177 +225,212 @@ function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQue
             text: questionId.includes('video')
                 ? t.training_video
                 : applicationQuestionsText[index],
-            path: questionId.includes('video')
-                ? (0, utils_1.join)(languageInfo.contentLanguages.trainingVideos, 'course', 'videos_compressed', [
-                    languageInfo.contentLanguages.trainingVideos,
-                    lesson.lessonId,
-                    'mp4',
-                ].join('.'))
-                : (0, utils_1.join)(languageInfo.contentLanguages.questionAudio, 'questions', [
-                    languageInfo.contentLanguages.questionAudio,
-                    questionId,
-                    'mp3',
-                ].join('.')),
+            fileName,
         });
     });
-    return {
-        sections,
-        fellowshipDuration: sections
-            .filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP)
-            .reduce((sum, section) => sum +
-            (section.pauseBefore ?? 0) +
-            ((0, utils_1.getCachedDuration)(section.path) ?? 0), 0),
-        applicationDuration: sections
-            .filter((s) => s.chapter === sets_2.Chapter.APPLICATION)
-            .reduce((sum, section) => sum +
-            (section.pauseBefore ?? 0) +
-            ((0, utils_1.getCachedDuration)(section.path) ?? 0), 0),
-    };
-}
-function getTrainingVideoPaths({ languageInfo, lessonId, }) {
-    const trainingVideosDir = (0, utils_1.join)(languageInfo.contentLanguages.trainingVideos, 'course');
-    const trainingVideoPath = (0, utils_1.join)(trainingVideosDir, 'videos_compressed', [languageInfo.contentLanguages.trainingVideos, lessonId, 'mp4'].join('.'));
-    const trainingVideoNarrationPath = (0, utils_1.join)(trainingVideosDir, 'audio', [languageInfo.contentLanguages.trainingVideos, lessonId, 'mp3'].join('.'));
-    const trainingVideoOriginalPath = (0, utils_1.join)(trainingVideosDir, 'videos_export', [languageInfo.contentLanguages.trainingVideos, lessonId, 'm4v'].join('.'));
-    const trainingVideoNarrationWithMusicPath = (0, utils_1.join)(trainingVideosDir, 'audio_with_music', [languageInfo.contentLanguages.trainingVideos, lessonId, 'mp3'].join('.'));
-    return {
-        trainingVideoPath,
-        trainingVideoNarrationPath,
-        trainingVideoOriginalPath,
-        trainingVideoNarrationWithMusicPath,
-    };
-}
-function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions, }) {
-    if (!lessonId)
-        return;
-    else if (lessonId.split('.').length !== 3)
-        return;
-    const [category, setNumber, lessonNumber] = lessonId.split('.');
-    const languageId = languageInfo.languageId;
-    setInfo =
-        setInfo ??
-            getSetInfo({
-                setId: [category, setNumber].join('.'),
-                languageId,
-                setIds: languageInfo.setIds,
-                t,
-            });
-    if (!setInfo) {
-        console.log('Missing set info for lesson:', lessonId);
-        return;
-    }
-    const lesson = setInfo.lessons.find((lesson) => lesson.lessonId === lessonId);
-    if (!lesson)
-        return;
-    const thisSetTranslations = getSetTranslations({
-        setInfo,
-        lessonId,
-        languageId,
-        t,
-    });
-    const { sections, applicationDuration, fellowshipDuration } = assembleLessonSections({
-        setInfo,
-        lesson,
-        languageInfo,
-        t,
-        useSpokenQuestions,
-    });
-    const passagesString = (0, scripturePassages_1.getPassagesString)(sections
-        .filter((section) => section.chapter === sets_2.Chapter.STORY)
-        // Slice out any concat passages.
-        .slice(0, lesson.s.length)
-        .map((section) => {
-        const [bibleId, passageId] = section.id.split(';');
-        return { passageId, bibleId };
-    }));
     const baseInfo = {
         lessonLink: `https://web.waha.app/lesson?lesson-id=${lessonId}&meet-language=${languageId}`,
         lessonNumber,
-        lessonTitle: thisSetTranslations?.lessonTitle,
+        lessonTitle,
         sections,
-        fellowshipDuration,
-        applicationDuration,
         ...setInfo,
         ...lesson,
         ...languageInfo,
     };
+    const fellowshipDuration = sections
+        .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);
+    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);
     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,
-            eqPath: (0, utils_1.join)(languageInfo.contentLanguages.intros, 'introductions', `${languageInfo.contentLanguages.intros}.eq.mp3`),
+            fellowshipDuration,
+            applicationDuration,
+            eq: {
+                id: eqId,
+                localFileName: eqFileName,
+                remoteFileName: eqFileName,
+                path: eqPath,
+                url: (0, utils_1.firebasePath)(eqPath),
+            },
         };
     }
-    if (setInfo.setId === specialIds_1.specialIds.dmCourseSetId || languageId === 'ase') {
-        const tvPaths = getTrainingVideoPaths({ languageInfo, lessonId });
-        const videoPath = languageId === 'ase'
-            ? (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.dbs ?? ''}`, setInfo.setId, [languageId, lessonId, '1080', 'mp4'].join('.'))
-            : specialIds_1.specialIds.dmCourseVideoOnlyLessonIds.includes(lessonId)
-                ? tvPaths.trainingVideoPath
-                : (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.dmc ?? ''}`, setInfo.setId, [
-                    languageId,
-                    languageInfo.contentLanguages.trainingVideos,
-                    lessonId,
-                    '1080',
-                    'mp4',
-                ].join('.'));
-        const youtubeLink = (0, utils_1.basename)(videoPath) in youtubeVideos_1.youtubeVideos
-            ? 'https://www.youtube.com/watch?v=' +
-                youtubeVideos_1.youtubeVideos[(0, utils_1.basename)(videoPath)]
-            : undefined;
-        const videoFullAudioPath = (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.dmc ?? ''}`, setInfo.setId, [
-            languageId,
-            languageInfo.contentLanguages.trainingVideos,
-            lessonId,
-            'mp3',
-        ].join('.'));
-        const videoStoryAudioPath = (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.dmc ?? ''}`, setInfo.setId, [languageId, lessonId, 'story', 'mp3'].join('.'));
+    else if (setInfo.setId === specialIds_1.specialIds.dmCourseSetId ||
+        languageId === 'ase') {
+        let video;
+        let trainingVideo;
+        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;
+        }
+        else {
+            const videoLessonId = [
+                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`;
+            // 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),
+            };
+        }
+        let youtubeLink;
+        if (video.remoteFileName && video.remoteFileName in youtubeVideos_1.youtubeVideos)
+            youtubeLink =
+                'https://www.youtube.com/watch?v=' +
+                    youtubeVideos_1.youtubeVideos[video.remoteFileName];
         return {
             type: 'video',
             ...baseInfo,
-            ...tvPaths,
+            fellowshipDuration,
+            applicationDuration,
             lessonSectionHeader: thisSetTranslations?.sectionHeaders?.[lessonId],
             lessonSectionBody: thisSetTranslations?.sectionBodies?.[lessonId],
-            videoPath,
-            fullPath: lesson.s.length > 0 ? videoFullAudioPath : undefined,
-            storyPath: lesson.s.length > 0 ? videoStoryAudioPath : undefined,
+            video,
+            trainingVideo,
             youtubeLink,
             passagesString,
         };
     }
     else {
-        const fullPath = (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.dbs ?? ''}`, setInfo.setId, `${languageId}.${lessonId}.mp3`);
-        const storyPath = fullPath.replace('.mp3', '.story.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 storyId = fullLessonId + '.story';
+        const storyFileName = `${storyId}.mp3`;
+        const storyPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, storyFileName);
         return {
             type: 'dbs',
             ...baseInfo,
+            fellowshipDuration,
+            applicationDuration,
             passagesString,
-            fullPath,
-            storyPath,
-            dbsCastPath: (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.cast ?? ''}`, setInfo.setId, [languageId, lessonId, '1080', 'mp4'].join('.')),
+            full: {
+                id: fullLessonId,
+                localFileName: fullLessonFileName,
+                remoteFileName: fullLessonFileName,
+                path: fullLessonPath,
+                url: (0, utils_1.firebasePath)(fullLessonPath),
+            },
+            story: {
+                id: storyId,
+                localFileName: storyFileName,
+                remoteFileName: storyFileName,
+                path: storyPath,
+                url: (0, utils_1.firebasePath)(storyPath),
+            },
+            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`)),
+            },
         };
     }
 }
+function convertSToString(time) {
+    let secondsNumber;
+    let minutesNumber;
+    let hoursNumber;
+    let secondsString;
+    let minutesString;
+    let hoursString;
+    if (time > 0) {
+        // If the time is greater than an hour, we need to show the hour of the time as well.
+        if (time >= 3600) {
+            secondsNumber = Math.floor(time % 60);
+            minutesNumber = Math.floor((time / 60) % 60);
+            hoursNumber = Math.floor((time / (60 * 60)) % 60);
+            secondsString = secondsNumber.toString();
+            minutesString =
+                minutesNumber < 10
+                    ? '0' + minutesNumber.toString()
+                    : minutesNumber.toString();
+            hoursString =
+                hoursNumber < 10 ? '0' + hoursNumber.toString() : hoursNumber.toString();
+            return `${hoursString}:${minutesString}:${secondsString}`;
+        }
+        else {
+            secondsNumber = Math.floor(time % 60);
+            minutesNumber = Math.floor((time / 60) % 60);
+            minutesString =
+                minutesNumber < 10
+                    ? '0' + minutesNumber.toString()
+                    : minutesNumber.toString();
+            secondsString =
+                secondsNumber < 10
+                    ? '0' + secondsNumber.toString()
+                    : secondsNumber.toString();
+            return `${minutesString}:${secondsString}`;
+        }
+    } // If the time is greater than the max allowed, just show the max.
+    else {
+        return '00:00';
+    }
+}
 /** Determines whether a lesson should be visible in Waha. */
-function shouldShowLesson(lessonInfo) {
+function shouldShowLesson(lessonInfo, languageInfo) {
     if (lessonInfo?.lessonTitle === undefined || lessonInfo.lessonTitle === '') {
         console.log('Missing lesson info or lessonTitle lesson:', lessonInfo?.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'eq' &&
-        (0, utils_1.getCachedDuration)(lessonInfo.eqPath) === undefined) {
+        mediaDurations_1.mediaDurations[languageInfo.contentLanguages.intros]?.[lessonInfo.eq.remoteFileName] === undefined) {
         console.log('Missing remote eq file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'dbs' &&
-        (0, utils_1.getCachedDuration)(lessonInfo.fullPath) === undefined) {
+        mediaDurations_1.mediaDurations[lessonInfo.languageId]?.[lessonInfo.full.remoteFileName] ===
+            undefined) {
         console.log('Missing remote dbs file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'video' &&
-        lessonInfo.videoPath &&
-        (0, utils_1.getCachedDuration)(lessonInfo.videoPath) === undefined) {
-        console.log('Missing remote video for lesson:', lessonInfo.lessonId);
+        lessonInfo.video &&
+        mediaDurations_1.mediaDurations[lessonInfo.languageId]?.[lessonInfo.video.remoteFileName] ===
+            undefined) {
+        console.log('Missing remote video for lesson:', lessonInfo.video.remoteFileName);
         return false;
     }
     else

package/dist/functions/utils.d.ts

@@ -1,7 +1,2 @@
 export declare const join: (...parts: 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;
+export declare const firebasePath: (path: string) => string;

package/dist/functions/utils.js

@@ -1,22 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCachedDuration = exports.basenamenoext = exports.extname = exports.dirname = exports.first = exports.basename = exports.join = void 0;
-const mediaDurations_1 = require("../data/mediaDurations");
+exports.firebasePath = exports.join = void 0;
+const firebase_1 = require("../data/firebase");
 const join = (...parts) => parts.join('/').replace(/\/+/g, '/');
 exports.join = join;
-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;
+const firebasePath = (path) => firebase_1.firebaseUrl + encodeURIComponent(path) + `?alt=media`;
+exports.firebasePath = firebasePath;

package/dist/types/sets.d.ts

@@ -13,6 +13,13 @@ 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;
@@ -25,6 +32,7 @@ export interface BaseInfo extends LanguageInfo {
 }
 export interface Section {
     id: string;
+    languageId: string;
     header?: string;
     text?: string;
     index: number;
@@ -36,8 +44,8 @@ export interface Section {
      * Filename for the "From the Book" clip to insert before this section, if
      * there is one.
      */
-    ftbPath?: string;
-    path: string;
+    ftbFileName?: string;
+    fileName: string;
 }
 export interface EnrichedSection extends Section {
     startTime: number;
@@ -52,29 +60,18 @@ export interface EnrichedSection extends Section {
 }
 export interface DbsInfo extends BaseInfo, SetInfo, Lesson {
     type: 'dbs';
-    fullPath: string;
-    storyPath: string;
-    dbsCastPath: string;
+    full: Content;
+    story: Content;
+    dbsCast: {
+        remoteFileName: string;
+        url: string;
+    };
     passagesString: string;
 }
 export interface VideoInfo extends BaseInfo, SetInfo, Lesson {
     type: 'video';
-    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.
-     */
-    fullPath?: string;
-    /**
-     * Story audio file (scripture passages only). Same population rules as
-     * `full`.
-     */
-    storyPath?: string;
+    video: Content;
+    trainingVideo: Content | undefined;
     lessonSectionHeader: string | undefined;
     lessonSectionBody: string | undefined;
     youtubeLink: string | undefined;
@@ -82,7 +79,7 @@ export interface VideoInfo extends BaseInfo, SetInfo, Lesson {
 }
 export interface EqInfo extends BaseInfo, SetInfo, Lesson {
     type: 'eq';
-    eqPath: string;
+    eq: Content;
 }
 export type LessonInfo = DbsInfo | VideoInfo | EqInfo;
 export declare enum Chapter {