attempt emergency hotfix

package.json

@@ -5,7 +5,6 @@
   "main": "src/index.mts",
   "scripts": {
     "start": "node --loader ts-node/esm src/index.mts",
-    "batch:updatePlaylists": "node --loader ts-node/esm src/batch/updatePlaylists.mts",
     "batch:interpolate": "node --loader ts-node/esm src/batch/interpolate_legacy.mts",
     "docker": "npm run docker:build && npm run docker:run",
     "docker:build": "docker build -t  media-server .",

scripts/channel_random.sh

@@ -2,10 +2,11 @@
 
 echo "Starting FFMPEG live stream for channel random"
 while true; do
-    if [ -f channel_random.txt ] && [ -f channel_1_audio.txt ]; then
+    # TODO use channel_random.txt
+    if [ -f channel_3_video.txt ] && [ -f channel_1_audio.txt ]; then
         echo "Files exist, starting stream"
         # Note: for now we also use channel 1 for audio!
-        ffmpeg -y -nostdin -re -f concat -safe 0 -i channel_random.txt -stream_loop -1 -safe 0 -i channel_1_audio.txt -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -shortest -f flv rtmp://localhost/live/random
+        ffmpeg -y -nostdin -re -f concat -safe 0 -i channel_3_video.txt -stream_loop -1 -safe 0 -i channel_1_audio.txt -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -shortest -f flv rtmp://localhost/live/random
     else
         echo "Files do not exist, waiting for files"
         sleep 1  # check every second

scripts/legacy_video3.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+echo "Starting the video collection stream for channel 3.."
+echo "listing files in $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_3*.mp4"
+current_count=0
+
+while true; do
+    new_count=$(ls $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_3*.mp4 2> /dev/null | wc -l)
+
+    if [ $new_count -ne $current_count ]; then
+        echo "there are $new_count videos files for channel 3"
+
+        echo "Updating playlist for channel 3.."
+        current_count=$new_count
+        files=($WEBTV_VIDEO_STORAGE_PATH_CHANNEL_3*.mp4)
+
+        echo "ffconcat version 1.0" > channel_3_video_tmp.txt
+        for (( i=0; i<${#files[@]}; i++ )); do
+            echo "file '${files[$i]}'" >> channel_3_video_tmp.txt
+        done
+        rm channel_3_video.txt
+        mv channel_3_video_tmp.txt channel_3_video.txt
+    fi
+
+    # the new playlist will only be updated after the current playlist ended
+    # so there is no emergency here
+    sleep 60
+done

src/index.mts

@@ -9,7 +9,7 @@ import { downloadVideo } from './downloadVideo.mts'
 import { getDatabase } from './getDatabase.mts'
 import { callMusicgen } from './callMusicgen.mts'
 import { interpolateVideo } from './interpolateVideo.mts'
-import { updatePlaylists } from './batch/updatePlaylists.mts'
+import { updatePlaylists } from './updatePlaylists.mts'
 
 let hasReachedStartingPoint = false
 

src/{batch/updatePlaylists.mts → updatePlaylists.mts}

@@ -1,13 +1,49 @@
 import fs from "fs"
 import path from "path"
 
-import { Database } from "../types.mts"
+import { Database } from "./types.mts"
 
 export const updatePlaylists = async (db: Database) => {
   // TODO we should DROP THE CHANNEL 3 name,
   // and only keep WEBTV_VIDEO_STORAGE_PATH
   const directoryPath = process.env.WEBTV_VIDEO_STORAGE_PATH_CHANNEL_3
 
+  console.log("Generating playlist for all the videos..")
+
+  // Get all the file paths in the directory
+  const allFiles = await fs.promises.readdir(directoryPath)
+  const allFilePaths = allFiles
+    .map(file => path.join(directoryPath, file))
+    .filter(filePath => filePath.endsWith('.mp4'))
+
+  // Create channel_random.txt with all files
+  let randomData = 'ffconcat version 1.0\n'
+  allFilePaths.forEach(filePath => {
+    randomData += `file '${filePath}'\n`
+  })
+  await fs.promises.writeFile("channel_random.txt", randomData)
+  console.log("Created playlist channel_random.txt")
+
+  console.log("Generating playlist for the last files..")
+  // Filter the list for the last 400 updated files
+  const lastUpdatedFilePaths = allFilePaths
+    .map(filePath => ({
+      filePath,
+      mtime: fs.statSync(filePath).mtime
+    }))
+    .sort((a, b) => b.mtime.getTime() - a.mtime.getTime())
+    .slice(0, 400)
+    .map(file => file.filePath)
+
+  // Create channel_fresh.txt
+  let freshData = 'ffconcat version 1.0\n'
+  lastUpdatedFilePaths.forEach(filePath => {
+    freshData += `file '${filePath}'\n`
+  })
+  await fs.promises.writeFile("channel_fresh.txt", freshData)
+  console.log("Created playlist channel_fresh.txt")
+
+
   // Record of file paths categorized by tags
   const categoryToFilePaths: Record<string, string[]> = {}
 
@@ -60,36 +96,4 @@ export const updatePlaylists = async (db: Database) => {
       console.log(`Created playlist channel_${category}.txt`)
     }
   }
-
-  // Get all the file paths in the directory
-  const allFiles = await fs.promises.readdir(directoryPath)
-  const allFilePaths = allFiles
-    .map(file => path.join(directoryPath, file))
-    .filter(filePath => filePath.endsWith('.mp4'))
-
-  // Create channel_random.txt with all files
-  let randomData = 'ffconcat version 1.0\n'
-  allFilePaths.forEach(filePath => {
-    randomData += `file '${filePath}'\n`
-  })
-  await fs.promises.writeFile("channel_random.txt", randomData)
-  console.log("Created playlist channel_random.txt")
-
-  // Filter the list for the last 400 updated files
-  const lastUpdatedFilePaths = allFilePaths
-    .map(filePath => ({
-      filePath,
-      mtime: fs.statSync(filePath).mtime
-    }))
-    .sort((a, b) => b.mtime.getTime() - a.mtime.getTime())
-    .slice(0, 400)
-    .map(file => file.filePath)
-
-  // Create channel_fresh.txt
-  let freshData = 'ffconcat version 1.0\n'
-  lastUpdatedFilePaths.forEach(filePath => {
-    freshData += `file '${filePath}'\n`
-  })
-  await fs.promises.writeFile("channel_fresh.txt", freshData)
-  console.log("Created playlist channel_fresh.txt")
 }

start.sh

@@ -28,16 +28,12 @@ sleep 1
 bash scripts/audio1.sh &
 # bash scripts/audio2.sh &
 
-# background process that creates a video stream from video files
-# bash scripts/video1.sh &
-# bash scripts/video2.sh &
-# bash scripts/video3.sh &
+# [LEGACY] background process that creates a video stream from video files
+bash scripts/legacy_video3.sh &
 
 sleep 1
 
 # background process that sends data to the media server
-# bash scripts/stream1.sh &
-# bash scripts/stream2.sh &
 bash scripts/channel_random.sh &
 bash scripts/channel_random_twitch.sh &
 bash scripts/channel_comedy.sh &