waha-shared 1.0.344 → 1.0.346

package/dist/functions/sets.js

@@ -1,12 +1,11 @@
 "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");
@@ -53,95 +52,79 @@ function getSetInfo({ setId, languageId, setIds, t, }) {
     };
     return toReturn;
 }
-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;
+function getSetTranslations({ setInfo, lessonId, languageId, t, }) {
     if (languageId === 'ase') {
         const englishEquivalent = sets_1.sets.find((set) => set.name === setInfo.name && !set.comment);
-        thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === englishEquivalent?.setId);
-        lessonTitle =
-            thisSetTranslations?.lessonTitles?.[`${englishEquivalent?.setId}.${lessonNumber}`];
+        const thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === englishEquivalent?.setId);
+        const [, , lessonNumber] = lessonId.split('.');
+        return thisSetTranslations
+            ? {
+                ...thisSetTranslations,
+                lessonTitle: thisSetTranslations?.lessonTitles?.[`${englishEquivalent?.setId}.${lessonNumber}`],
+            }
+            : undefined;
     }
     else {
-        thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === setInfo?.setId);
-        lessonTitle = thisSetTranslations?.lessonTitles?.[lessonId];
+        const thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === setInfo?.setId);
+        return thisSetTranslations
+            ? {
+                ...thisSetTranslations,
+                lessonTitle: thisSetTranslations?.lessonTitles?.[lessonId],
+            }
+            : undefined;
     }
+}
+/** 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 fellowshipQuestionsText = fellowshipQuestions.map((questionId) => useSpokenQuestions ? t.questionsSpoken[questionId] : t.questions[questionId]);
     const applicationQuestions = languageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.a)?.questions ?? [];
+    const fellowshipQuestionsText = fellowshipQuestions.map((questionId) => useSpokenQuestions ? t.questionsSpoken[questionId] : t.questions[questionId]);
     const applicationQuestionsText = applicationQuestions.map((questionId) => useSpokenQuestions ? t.questionsSpoken[questionId] : t.questions[questionId]);
     const sections = [
         {
             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,
+            text: t.introductions.introductions[lesson.lessonId],
+            path: (0, utils_1.join)(languageInfo.contentLanguages.intros, [
+                languageInfo.contentLanguages.intros,
+                lesson.lessonId,
+                'intro',
+                'mp3',
+            ].join('.')),
         });
     }
     let lastBook = null;
@@ -155,29 +138,22 @@ 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 }]),
         });
         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) => {
@@ -191,16 +167,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 +190,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,212 +200,181 @@ 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,
+                    lesson.lessonId,
+                    'mp4',
+                ].join('.'))
+                : (0, utils_1.join)(languageInfo.contentLanguages.questionAudio, 'questions', [
+                    languageInfo.contentLanguages.questionAudio,
+                    questionId,
+                    'mp3',
+                ].join('.')),
         });
     });
+    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,
+        lessonTitle: thisSetTranslations?.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,
-            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`),
         };
     }
-    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];
+    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('.'));
         return {
             type: 'video',
             ...baseInfo,
-            fellowshipDuration,
-            applicationDuration,
+            ...tvPaths,
             lessonSectionHeader: thisSetTranslations?.sectionHeaders?.[lessonId],
             lessonSectionBody: thisSetTranslations?.sectionBodies?.[lessonId],
-            video,
-            trainingVideo,
+            videoPath,
+            fullPath: lesson.s.length > 0 && languageId !== 'ase'
+                ? videoFullAudioPath
+                : undefined,
+            storyPath: lesson.s.length > 0 && languageId !== 'ase'
+                ? videoStoryAudioPath
+                : undefined,
             youtubeLink,
             passagesString,
         };
     }
     else {
-        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);
+        const fullPath = (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.dbs ?? ''}`, setInfo.setId, `${languageId}.${lessonId}.mp3`);
+        const storyPath = fullPath.replace('.mp3', '.story.mp3');
         return {
             type: 'dbs',
             ...baseInfo,
-            fellowshipDuration,
-            applicationDuration,
             passagesString,
-            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`)),
-            },
+            fullPath,
+            storyPath,
+            dbsCastPath: (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.cast ?? ''}`, setInfo.setId, [languageId, lessonId, '1080', 'mp4'].join('.')),
         };
     }
 }
-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, 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.getDurationFromFile)(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;