Revert some mistakes

[github/Chocobozzz/PeerTube.git] / server / lib / job-queue / handlers / video-live-ending.ts

diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts
index 1a9a36129c21067a3a55b572522c944e6aba849c..55c7a4ccbc84dc74bdf331e1e702bba8ef213ac6 100644 (file)
--- a/server/lib/job-queue/handlers/video-live-ending.ts
+++ b/server/lib/job-queue/handlers/video-live-ending.ts
@@ -1,25 +1,37 @@
 import * as Bull from 'bull'
 import { readdir, remove } from 'fs-extra'
 import { join } from 'path'
-import { getVideoFileResolution, hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils'
+import { getDurationFromVideoFile, getVideoFileResolution, hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils'
+import { publishAndFederateIfNeeded } from '@server/lib/video'
 import { getHLSDirectory } from '@server/lib/video-paths'
 import { generateHlsPlaylist } from '@server/lib/video-transcoding'
 import { VideoModel } from '@server/models/video/video'
+import { VideoFileModel } from '@server/models/video/video-file'
 import { VideoLiveModel } from '@server/models/video/video-live'
 import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
-import { MStreamingPlaylist, MVideo } from '@server/types/models'
-import { VideoLiveEndingPayload, VideoState } from '@shared/models'
+import { MStreamingPlaylist, MVideo, MVideoLive } from '@server/types/models'
+import { ThumbnailType, VideoLiveEndingPayload, VideoState } from '@shared/models'
 import { logger } from '../../../helpers/logger'
+import { generateVideoMiniature } from '@server/lib/thumbnail'
 
 async function processVideoLiveEnding (job: Bull.Job) {
   const payload = job.data as VideoLiveEndingPayload
 
+  function logError () {
+    logger.warn('Video live %d does not exist anymore. Cannot process live ending.', payload.videoId)
+  }
+
   const video = await VideoModel.load(payload.videoId)
   const live = await VideoLiveModel.loadByVideoId(payload.videoId)
 
+  if (!video || !live) {
+    logError()
+    return
+  }
+
   const streamingPlaylist = await VideoStreamingPlaylistModel.loadHLSPlaylistByVideo(video.id)
-  if (!video || !streamingPlaylist || !live) {
-    logger.warn('Video live %d does not exist anymore. Cannot process live ending.', payload.videoId)
+  if (!streamingPlaylist) {
+    logError()
     return
   }
 
@@ -27,7 +39,7 @@ async function processVideoLiveEnding (job: Bull.Job) {
     return cleanupLive(video, streamingPlaylist)
   }
 
-  return saveLive(video, streamingPlaylist)
+  return saveLive(video, live)
 }
 
 // ---------------------------------------------------------------------------
@@ -38,46 +50,82 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function saveLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) {
-  const videoFiles = await streamingPlaylist.get('VideoFiles')
+async function saveLive (video: MVideo, live: MVideoLive) {
   const hlsDirectory = getHLSDirectory(video, false)
+  const files = await readdir(hlsDirectory)
+
+  const playlistFiles = files.filter(f => f.endsWith('.m3u8') && f !== 'master.m3u8')
+  const resolutions: number[] = []
+  let duration: number
+
+  for (const playlistFile of playlistFiles) {
+    const playlistPath = join(hlsDirectory, playlistFile)
+    const { videoFileResolution } = await getVideoFileResolution(playlistPath)
 
-  for (const videoFile of videoFiles) {
-    const playlistPath = join(hlsDirectory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(videoFile.resolution))
+    const mp4TmpPath = buildMP4TmpPath(hlsDirectory, videoFileResolution)
 
-    const mp4TmpName = buildMP4TmpName(videoFile.resolution)
-    await hlsPlaylistToFragmentedMP4(playlistPath, mp4TmpName)
+    // Playlist name is for example 3.m3u8
+    // Segments names are 3-0.ts 3-1.ts etc
+    const shouldStartWith = playlistFile.replace(/\.m3u8$/, '') + '-'
+
+    const segmentFiles = files.filter(f => f.startsWith(shouldStartWith) && f.endsWith('.ts'))
+    await hlsPlaylistToFragmentedMP4(hlsDirectory, segmentFiles, mp4TmpPath)
+
+    if (!duration) {
+      duration = await getDurationFromVideoFile(mp4TmpPath)
+    }
+
+    resolutions.push(videoFileResolution)
   }
 
   await cleanupLiveFiles(hlsDirectory)
 
+  await live.destroy()
+
   video.isLive = false
   video.state = VideoState.TO_TRANSCODE
+  video.duration = duration
+
   await video.save()
 
+  // Remove old HLS playlist video files
   const videoWithFiles = await VideoModel.loadWithFiles(video.id)
 
-  for (const videoFile of videoFiles) {
-    const videoInputPath = buildMP4TmpName(videoFile.resolution)
+  const hlsPlaylist = videoWithFiles.getHLSPlaylist()
+  await VideoFileModel.removeHLSFilesOfVideoId(hlsPlaylist.id)
+  hlsPlaylist.VideoFiles = []
+
+  for (const resolution of resolutions) {
+    const videoInputPath = buildMP4TmpPath(hlsDirectory, resolution)
     const { isPortraitMode } = await getVideoFileResolution(videoInputPath)
 
     await generateHlsPlaylist({
       video: videoWithFiles,
       videoInputPath,
-      resolution: videoFile.resolution,
+      resolution: resolution,
       copyCodecs: true,
       isPortraitMode
     })
+
+    await remove(videoInputPath)
   }
 
-  video.state = VideoState.PUBLISHED
-  await video.save()
+  // Regenerate the thumbnail & preview?
+  if (videoWithFiles.getMiniature().automaticallyGenerated === true) {
+    await generateVideoMiniature(videoWithFiles, videoWithFiles.getMaxQualityFile(), ThumbnailType.MINIATURE)
+  }
+
+  if (videoWithFiles.getPreview().automaticallyGenerated === true) {
+    await generateVideoMiniature(videoWithFiles, videoWithFiles.getMaxQualityFile(), ThumbnailType.PREVIEW)
+  }
+
+  await publishAndFederateIfNeeded(video, true)
 }
 
 async function cleanupLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) {
-  const hlsDirectory = getHLSDirectory(video, false)
+  const hlsDirectory = getHLSDirectory(video)
 
-  await cleanupLiveFiles(hlsDirectory)
+  await remove(hlsDirectory)
 
   streamingPlaylist.destroy()
     .catch(err => logger.error('Cannot remove live streaming playlist.', { err }))
@@ -102,6 +150,6 @@ async function cleanupLiveFiles (hlsDirectory: string) {
   }
 }
 
-function buildMP4TmpName (resolution: number) {
-  return resolution + 'tmp.mp4'
+function buildMP4TmpPath (basePath: string, resolution: number) {
+  return join(basePath, resolution + '-tmp.mp4')
 }