Merge branch 'stage'

runners/content-downloader/download-audio.js

@@ -1,6 +1,6 @@
 const { XMLParser } = require("fast-xml-parser"),
     axios   = require("axios"),
-    { getCompilationQuarterValue, getCurrentQuarter } = require('../../deploy-helper'),
+    { getCompilationQuarterValue, getCurrentQuarter, getNextQuarter } = require('../../deploy-helper'),
     fs = require("fs-extra"),
     moment  = require("moment"),
     crypto = require("crypto"),
@@ -13,9 +13,12 @@ const WORKING_DIR = `ss-audio`
 let downloadEGWaudio = async function() {
     const URL = "https://www.egwhiteaudio.com/feed.xml"
     const parser = new XMLParser({ignoreAttributes : false});
-    const LESSON_NUMBER = /Lesson\s*(\d+)/gm
-    const quarter = getCompilationQuarterValue(null, true).replace(/[()|+]/g, '').substring(0, 7)
-    const SERVER_URL = `https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/${quarter}/en-egw-${quarter}`
+    let quarter = getCurrentQuarter()
+    const nextQuarter = getNextQuarter()
+    const podcastQuarter = quarter.replace(/(\d\d\d\d)-(\d)(\d)/g, '$1 Q$3')
+    const podcastQuarterNext = nextQuarter.replace(/(\d\d\d\d)-(\d)(\d)/g, '$1 Q$3')
+    const LESSON_NUMBER = new RegExp(`(${podcastQuarter}|${podcastQuarterNext})\\s*Lesson\\s*(\\d+)`, 'gm')
+
     const TIMESTAMPS = /(\d\d:\d\d)/gm
     let response
     try {
@@ -37,8 +40,10 @@ let downloadEGWaudio = async function() {
             // Identifying the lesson #
             let lesson = LESSON_NUMBER.exec(episode.title.trim())
 
-            if (lesson && lesson[1]) {
-                lesson = String(lesson[1]).padStart(2, '0')
+            if (lesson && lesson[1] && lesson[2]) {
+                quarter = lesson[1].replace(/ /gm, '-').replace(/Q/, '0')
+                lesson = String(lesson[2]).padStart(2, '0')
+                const SERVER_URL = `https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/${quarter}/en-egw-${quarter}`
 
                 // Check if this lesson has already been processed and uploaded to the cloud
                 try {

src/en/2024-04/audio.yml

@@ -212,4 +212,22 @@
         - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/138 SS Lesson 27 December 2024.mp3
           target: en/2024-04/13/07
         - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/139 INSIDE STORY 13 Sybilla.mp3
-          target: en/2024-04/13/inside-story
+          target: en/2024-04/13/inside-story
+    - artist: Ellen G. White Notes
+      image: misc/ellen-white-notes.png
+      imageRatio: square
+      tracks:
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/en-egw-2024-04-01-01.mp3
+          target: en/2024-04/01/01
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/en-egw-2024-04-01-02.mp3
+          target: en/2024-04/01/02
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/en-egw-2024-04-01-03.mp3
+          target: en/2024-04/01/03
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/en-egw-2024-04-01-04.mp3
+          target: en/2024-04/01/04
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/en-egw-2024-04-01-05.mp3
+          target: en/2024-04/01/05
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/en-egw-2024-04-01-06.mp3
+          target: en/2024-04/01/06
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/audio/en/2024-04/en-egw-2024-04-01-07.mp3
+          target: en/2024-04/01/07

src/en/2024-04/video.yml

@@ -1,10 +1,20 @@
 ---
   video:
+    - artist: Hope Sabbath School
+      clips:
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/en/hopess/en-hopess-2024-04-01-updated.mp4
+          target: en/2024-04/01
+          thumbnail: https://sabbath-school-media-tmp.s3.amazonaws.com/en/hopess/en-hopess-2024-04-01-updated.webp
     - artist: Hope Lives 365
       clips:
         - src: https://sabbath-school-media-tmp.s3.amazonaws.com/en/365/365-en-2024-04-01.mp4
           target: en/2024-04/01
           thumbnail: https://sabbath-school-media-tmp.s3.amazonaws.com/en/365/365-en-2024-04-01.webp
+    - artist: It Is Written
+      clips:
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/iiw/iiw-en-2024-04-01.mp4
+          target: en/2024-04/01
+          thumbnail: https://sabbath-school-media-tmp.s3.amazonaws.com/iiw/iiw-en-2024-04-01.webp
     - artist: Amazing Facts Study Hour
       clips:
         - src: https://sabbath-school-media-tmp.s3.amazonaws.com/en/af/en-af-2024-04-01.mp4?updated
@@ -15,8 +25,3 @@
         - src: https://sabbath-school-media-tmp.s3.amazonaws.com/tp/tp-en-2024-04-01.mp4
           target: en/2024-04/01
           thumbnail: https://sabbath-school-media-tmp.s3.amazonaws.com/tp/tp-en-2024-04-01.webp
-    - artist: It Is Written
-      clips:
-        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/iiw/iiw-en-2024-04-01.mp4
-          target: en/2024-04/01
-          thumbnail: https://sabbath-school-media-tmp.s3.amazonaws.com/iiw/iiw-en-2024-04-01.webp

src/hr/2024-04/video.yml

@@ -1,2 +1,7 @@
 ---
-  video: []
+  video:
+    - artist: Tajne Biblije
+      clips:
+        - src: https://sabbath-school-media-tmp.s3.amazonaws.com/hr/hr-2024-04-01.mp4
+          target: hr/2024-04/01
+          thumbnail: https://sabbath-school-media-tmp.s3.amazonaws.com/hr/hr-2024-04-01.webp

src/kar/2024-04/01/01.md

@@ -0,0 +1,18 @@
+---
+title:  တၢ်ပနီၣ်တဖၣ်လၢအဒုးနဲၣ်ကျဲ
+date:   28/09/2024
+---
+
+### တၢ်မၤလိတနွံအံၤအဂီၢ်ဖး
+ယိၤဟၣ် ၂း၁-၁၁; ယိၤဟၣ် ၄း၄၆-၅၄; ယိၤဟၣ် ၅း၁-၁၆; မၢ်ကူး ၃း၂၂, ၂၃; မးသဲ ၁၂း၉-၁၄; ယိၤဟၣ် ၅း၁၅-၄၇.
+
+> <p>တၢ်ကလုၢ်ထူ</p>
+> "မၤသးဒ်န့ၣ်ဒီး တၢ်လီၤလးလၢအဂုၤအဂၤလၢအတကွဲးဘၣ်အသး လၢလံၥ်အံၤအပူၤဘၣ်န့ၣ်, ယ့ၣ်ရှူးမၤစ့ၢ်ကီးဝဲအါမံၤ, လၢအပျဲၢ်အဘီၣ် အမဲၥ်ညါလီၤ. ဘၣ်ဆၣ်ဒီး ဒ်သိးသုကနၥ်လၢယ့ၣ်ရှူးမ့ၢ်ခ၇ံၥ်, ယွၤအဖိခွါ, ဒီးသုနၥ်တၢ်သတးဒီး, ဒ်သိးသုကန့ၢ်ဘၣ်တၢ်မူလၢအမံၤဒီး, တၢ်အံၤတဖၣ် ဘၣ်ကွဲးအသးလီၤ" (ယိၤဟၣ် ၂၀း၃၀, ၃၁).
+
+ဘၣ်မနုၤလၢစီၤယိၤဟၣ်ကွဲးအလံၥ်တၢ်သးခုကစီၣ်အံၤန့ၣ်လဲၣ်. မ့ၢ်လၢအအဲၣ်ဒိးပၥ်ဖျါတၢ်ဂ့ၢ်ဒိၣ်ဒိၣ်ဘၣ်ဃးကစၢ်ခ၇ံၥ်မၤတၢ်လီၤလးတဖၣ်အံၤ အဃိန့ၣ်လီၤ. မ့တမ့ၢ် အဲၣ်ဒိးကတိၤဒိၣ်ကစၢ်ခ၇ံၥ်အတၢ်သိၣ်လိသီလိတဖၣ် လၢအလီၤတံၢ်လီၤဆဲးအံၤအဂ့ၢ်ဧါ. တၢ်ဂ့ၢ်တၢ်ကျိၤအိၣ်လၢအကွဲးလံၥ်အံၤ အဂီၢ်န့ၣ် မ့ၢ်မနုၤလဲၣ်.
+
+လၢသးစီဆှံအတၢ်စိတၢ်ကမီၤအဖီလၥ်အပူၤ, စီၤယိၤဟၣ်စံးကတိၤ ဖျါထီၣ်တၢ်ဂ့ၢ်တၢ်ကျိၤအိၣ်အါမးလၢကကြၢးကွဲးဘၣ်ဃးကစၢ်ခ၇ံၥ်အတၢ် အိၣ်မူအဂ့ၢ်အကျိၤလီၤ, (ယိၤဟၣ် ၂၁း၂၅) ဒီးတၢ်လၢအကွဲးဝဲသ့ၣ်တဖၣ်အံၤ လဲၤသးလၢအဂ့ၢ်တဆီဘၣ်တဆီ, ဒ်သိး "သုကနၥ်လၢယ့ၣ်ရှူးမ့ၢ်ခ၇ံၥ်, ယွၤအဖိခွါ, ဒီးသုနၥ်တၢ်သတးဒီး ဒ်သိးသုကန့ၢ်ဘၣ်တၢ်မူလၢအမံၤဒီး, တၢ်အံၤတဖၣ်ဘၣ်တၢ်ကွဲးအသးလီၤ. (ယိၤဟၣ် ၂၀း၃၁).
+
+တနွံအံၤ, ပကကွၢ်ကစၢ်ခ၇ံၥ်မၤတၢ်လီၤလးအဆိတဖၣ်လၢ လံၥ်ယိၤဟၣ်အပူၤအံၤန့ၣ်လီၤ, စးထီၣ်လၢအဒုးကဲထီၣ်ထံဆူစပံးထံဖဲတၢ်ဖျီ အမူးကတီၢ်, တုၤလၢအမၤဘျါက့ၤၦၤတဂၤအဖိခွါလၢ အဆါဒိၣ်ဒိၣ်ကလဲၥ်, တုၤလၢအမၤဘျါက့ၤၦၤပိၥ်ခွါတဂၤ ဖဲဘ့ၤသ့းစဒါအနိၣ်နံၤအဂ့ၢ်အံၤန့ၣ်လီၤ.
+
+စီၤယိၤဟၣ်ကိးတၢ်လီၤလးတဖၣ်အံၤလၢအမ့ၢ် "တၢ်ပနီၣ်" န့ၣ်လီၤ. အဝဲတပၥ်ဝဲလၢအမ့ၢ်ကျဲအတၢ်ပနီၣ်ဘၣ်, ဘၣ်ဆၣ်မ့ၢ်တၢ်မၤအသးလီၤလိၣ် လီၤလးလၢ အဒုးနဲၣ်ဆူတၢ်နီၢ်ကီၢ်အဒိၣ်အယိၥ်လၢအမ့ၢ်-ကစၢ်ခ၇ံၥ် မ့ၢ်မ့းၡံအၤအံၤန့ၣ်လီၤ. လၢတၢ်ပၥ်ဖျါခဲလၢၥ်တဖၣ်အပူၤအံၤန့ၣ်, ပမ့ၢ်တၢ်ဒိ တၢ်တဲၥ်လၢၦၤဂီၢ်မုၢ်လၢအတူၢ်လိၥ်တၢ်လၢတၢ်နၥ်အပူၤတဖၣ်အဂီၢ်န့ၣ်လီၤ. ဒီးအဝဲသ့ၣ်အတၢ်ဒိတၢ်တဲၥ်န့ၣ် ကွဲမုၥ်ၦၤလၢကမၤတၢ်တမံၤဃီဒ်အံၤန့ၣ်လီၤ.

src/kar/2024-04/01/02.md

@@ -0,0 +1,22 @@
+---
+title:  တၢ်ဖျီလၢကၤနါ
+date:   29/09/2024
+---
+
+`ဖး ယိၤဟၣ် ၂း၁-၁၁ တက့ၢ်. ကစၢ်မၤတၢ်ပနီၣ်လီၤလးတမံၤ ဖဲကၤနါန့ၣ်မ့ၢ်မနုၤလဲၣ်. ဒီးမ့ၢ်အမၤစၢၤပျဲၢ်ဘီၣ်သ့ၣ်တဖၣ်လၢ ကစူၢ်အီၤ နၥ်အီၤသ့ဝဲလၢကျဲဒ်လဲၣ်.`
+
+ခီဖျိတၢ်ထံၣ်ဘၣ်ကစၢ်ခ၇ံၥ်မၤတၢ်လီၤလးလၢဒုးကဲထီၣ်ထံဆူ စပံးထံအဃိ, ဒုးအိၣ်ထီၣ်တၢ်ကတဲၥ်ကတီၤတၢ်အုၣ်အသးလၢပျဲၢ်ဘီၣ်သ့ၣ် တဖၣ်အဂီၢ် ဒ်သိးကဆၢတဲၥ်အသးလၢပိၥ်ကစၢ်ခ၇ံၥ်ခံအဂီၢ်န့ၣ်လီၤ. ဘၣ်မနုၤ လၢအတမ့ၢ်တၢ်ပနီၣ်အစိကမီၤအိၣ်ဝဲလၢကဒုးနဲၣ်ကစၢ်ခ၇ံၥ်အံၤ ဒ်အမ့ၢ် ၦၤတဂၤလၢအဟဲလၢယွၤအအိၣ်အံၤန့ၣ်ဘၣ်လဲၣ်. (အနီၢ်ကီၢ်န့ၣ် အဝဲသ့ၣ် တအိၣ်ဒီးတၢ်ကတဲၥ်ကတီၤအသးလၢကနၢ်ပၢၢ်ဝဲလၢ ကစၢ်ခ၇ံၥ်န့ၣ် မ့ၢ်ယွၤ တဂၤဒ်ဘၣ်လီၤ.)
+
+စီၤမိၤၡွမ့ၢ်ၦၤအံၣ်စ၇့လးဖိအခိၣ်တဂၤ, ဒီးအဝဲထုးထီၣ်ကွံၥ် အံၣ်စ၇့လးဖိလၢကီၢ်အဲၤကူပတူးအပူၤခီဖျိ "တၢ်ပနီၣ်လီၤလးဒီးတၢ်လီၤလိၣ် လီၤလး" အါအါတဖၣ်န့ၣ်လီၤ. (ကွၢ် ၅မိၤၡွ ၆း၂၂; ၅မိၤၡွ ၂၆း၈). အဝဲ မ့ၢ်ၦၤတဂၤလၢယွၤသူအီၤဒ်သိးကမၤပူၤမၤဖျဲးၦၤအံၣ်စ၇့လးဖိလၢ ၦၤအဲၤကူပတူးဖိအစုပူၤအဂီၢ်န့ၣ်လီၤ. (အဝဲမ့ၢ်ၦၤအံၣ်စ၇့လးဖိ "တၢ်အုၣ်က့ၤ ခီၣ်က့ၤ" အဂီၢ်တဂၤန့ၣ်လီၤ.)
+
+ကစၢ်ယွၤစံးကတိၤပၥ်စၢၤတ့ၢ်တၢ်ခီဖျိစီၤမိၤၡွလၢ၀ံကဟဲဝဲတဂၤလၢ အလီၤဂၥ်စီၤမိၤၡွန့ၣ်လီၤ. ကစၢ်ယွၤစံးဘၣ်အံၣ်စ၇့လးလၢကဒိကနၣ်အီၤန့ၣ် လီၤ. (၅မိၤၡွ ၁၈း၁၅; မးသဲ ၇း၅; မၤတၢ် ၇း၃၇) တၢ်လၢ "၀ံတဂၤ" န့ၣ် မ့ၢ်ကစၢ်ခ၇ံၥ်ဒီးဖဲယိၤဟၣ်အဆၢဒိၣ် ၂ အပူၤန့ၣ်, ကစၢ်ခ၇ံၥ်မၤတၢ်ပနီၣ် လီၤလးအဆိကတၢၢ်လၢအဒုးနဲၣ်ကဒါက့ၤဆူတၢ်အုၣ်က့ၤခီၣ်က့ၤ ၦၤအံၣ်စ၇့လးဖိလၢကီၢ်အဲၤကူပတူးအပူၤအံၤန့ၣ်လီၤ.
+
+နဲ(လ်) (Nile) အထံကျိမိၢ်ၦၢ် မ့ၢ်တၢ်ဂံၢ်တၢ်ဘါအဒိၣ်တမံၤဒီး မ့ၢ်ၦၤအဲၤကူပတူးဖိသ့ၣ်တဖၣ်ဘူၣ်ထီၣ်ဘါထီၣ်ဝဲဒ်အမ့ၢ်ကစၢ်ယွၤအသိးန့ၣ် လီၤ. တၢ်ဆါသံသတြိၥ်အကျါတမံၤန့ၣ် မ့ၢ်တၢ်မၤဘၣ်ဒိထံကျိအဝဲအံၤ ခီဖျိ တၢ်ဆီတလဲကွံၥ်ထံအံၤလၢတၢ်သွံၣ်န့ၣ်လီၤ. ဖဲကၤနါန့ၣ်, ကစၢ်ခ၇ံၥ်မၤတၢ် လီၤလးတမံၤဃီဒ်အံၤဘၣ်ဆၣ်, လၢအလီၢ်န့ၣ်, ဒ်သိးကဒုးကဲထီၣ်ထံလၢ တၢ်သွံၣ်အဂီၢ်န့ၣ်, အဝဲဒုးကဲထီၣ်ဝဲဆူစပံးထံန့ၣ်လီၤ.
+
+ထံသ့ၣ်တဖၣ်န့ၣ် မ့ၢ်ထံလၢကတံၤဃုဖျၢၣ်အပူၤလၢ ၦၤကမၤကဆှီထံ အဂီၢ် လၢၦၤယူဒၤဖိအလုၢ်အလၢ်အိၣ်ဝဲအပူၤ, ဒုးစဲဘူးတၢ်မၤတၢ်လီၤလး အဝဲအံၤဘူးဒိၣ်ထီၣ်ဒီးလံၥ်စီဆှံအတၢ်ဂ့ၢ်တၢ်ကျိၤလၢအမ့ၢ်တၢ်အုၣ်က့ၤ ခီၣ်က့ၤအံၤန့ၣ်လီၤ. ခီဖျိတၢ်သ့ၣ်နီၣ်ထီၣ်က့ၤတၢ်ဆီတလဲထံဆူစပံးထံအပူၤ အံၤ, မ့ၢ်တၢ်ဒုးနဲၣ်ကဒါက့ၤဆူတၢ်ဟးထီၣ်လၢကီၢ်အဲၤကူပတူးအပူၤ ဒီးစီၤယိၤဟၣ်က့ၤဒုးနဲၣ်က့ၤကစၢ်ခ၇ံၥ်လၢအမ့ၢ်ပတၢ်အုၣ်က့ၤခီၣ်က့ၤ အကစၢ်န့ၣ်လီၤ.
+
+မူးအကစၢ်အံၤ မ့ၢ်ကဆိကမိၣ်တၢ်မနုၤတမံၤလၢ အဘၣ်ဃးဒီး စပံးထံအဂ့ၤ လၢကစၢ်ခ၇ံၥ်ကတီၤပၥ်ဝဲအံၤန့ၣ်လဲၣ်. အဝဲကမၢကမၣ်ဘၣ် အသးလၢ စပံးထံအတၢ်ဂ့ၤဒိၣ်ဒီး လၢတၢ်တသ့ၣ်ညါလၢအမ့ၢ်ကစၢ်ခ၇ံၥ် မၤတၢ်လီၤလးဘၣ်အပူၤ, ဆိကမိၣ်ဝဲလၢ အဝဲသ့ၣ်ပၥ်ဃၥ်တၢ်လၢအဂ့ၤ ကတၢၢ်လၢအလီၢ်ခံန့ၣ်လီၤ.
+
+ဟ့းလ့ၣ်အကျိၥ်လၢအမ့ၢ် oinos ဘၣ်တၢ်သူအီၤလၢစပံးထံကဆှီ, သံကစဲၥ်, ဒီးစပံးထံလၢတၢ်စုၣ်အီၤလၢကိၣ်မံၣ်ခံမံၤလၢၥ်အံၤန့ၣ်လီၤ. (ကွၢ် The Seventh-day Adventist Bible Dictionary, p. 1177 တက့ၢ်). E. G. White ပၥ်ဖျါထီၣ်ဝဲလၢ စပံးထံလၢကစၢ်ခ၇ံၥ်ဒုးအိၣ်ထီၣ်လၢ တၢ်လီၤလးအပူၤအံၤန့ၣ် တမ့ၢ်တၢ်စုၣ်အီၤဒီးကိၣ်မံၣ်လီၤဂၥ်ဒ်သိးသံးန့ၣ်ဘၣ် (ကွၢ် At the Marriage Feast, The Desire of Ages, p. 149). ၦၤဖဲန့ၣ်သ့ၣ်တဖၣ်န့ၣ် လီၤကမၢကမၣ်ဘၣ်အသးဖဲအသ့ၣ်ညါတၢ်မၤအသး ဖဲအံၤန့ၣ် ပလီၤကမၢကမၣ်အလီၢ်တအိၣ်ဝဲဘၣ်.
+
+`နပိၥ်ကစၢ်ခ၇ံၥ်အခံလၢတၢ်ဂ့ၢ်တၢ်ကျိၤမနုၤသ့ၣ်တဖၣ်အဃိလဲၣ်. (တၢ်ဟ့ၣ်တ့ၢ်ၦၤအါမးလံတမ့ၢ်ဧါ).`