X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fjob-queue%2Fhandlers%2Fvideo-live-ending.ts;h=447744224bea38e224dafdf087974659eea528a6;hb=daf6e4801052d3ca6be2fafd20bae2323b1ce175;hp=32eeff4d1d40205369607d67e97e10d24905da32;hpb=d846d99c6c81028bb7bd3cb20abd433cbf396a22;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts
index 32eeff4d1..447744224 100644
--- a/server/lib/job-queue/handlers/video-live-ending.ts
+++ b/server/lib/job-queue/handlers/video-live-ending.ts
@@ -1,26 +1,38 @@
 import * as Bull from 'bull'
 import { readdir, remove } from 'fs-extra'
 import { join } from 'path'
-import { getDurationFromVideoFile, getVideoFileResolution, hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils'
+import { hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils'
+import { getDurationFromVideoFile, getVideoFileResolution } from '@server/helpers/ffprobe-utils'
+import { generateVideoMiniature } from '@server/lib/thumbnail'
 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, MVideoLive } from '@server/types/models'
-import { VideoLiveEndingPayload, VideoState } from '@shared/models'
+import { ThumbnailType, VideoLiveEndingPayload, VideoState } from '@shared/models'
 import { logger } from '../../../helpers/logger'
 
 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
   }
 
@@ -51,17 +63,17 @@ async function saveLive (video: MVideo, live: MVideoLive) {
     const playlistPath = join(hlsDirectory, playlistFile)
     const { videoFileResolution } = await getVideoFileResolution(playlistPath)
 
-    const mp4TmpName = buildMP4TmpName(videoFileResolution)
+    const mp4TmpPath = buildMP4TmpPath(hlsDirectory, videoFileResolution)
 
     // 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, mp4TmpName)
+    await hlsPlaylistToFragmentedMP4(hlsDirectory, segmentFiles, mp4TmpPath)
 
     if (!duration) {
-      duration = await getDurationFromVideoFile(mp4TmpName)
+      duration = await getDurationFromVideoFile(mp4TmpPath)
     }
 
     resolutions.push(videoFileResolution)
@@ -72,15 +84,22 @@ async function saveLive (video: MVideo, live: MVideoLive) {
   await live.destroy()
 
   video.isLive = false
+  // Reinit views
+  video.views = 0
   video.state = VideoState.TO_TRANSCODE
   video.duration = duration
 
   await video.save()
 
+  // Remove old HLS playlist video files
   const videoWithFiles = await VideoModel.loadWithFiles(video.id)
 
+  const hlsPlaylist = videoWithFiles.getHLSPlaylist()
+  await VideoFileModel.removeHLSFilesOfVideoId(hlsPlaylist.id)
+  hlsPlaylist.VideoFiles = []
+
   for (const resolution of resolutions) {
-    const videoInputPath = buildMP4TmpName(resolution)
+    const videoInputPath = buildMP4TmpPath(hlsDirectory, resolution)
     const { isPortraitMode } = await getVideoFileResolution(videoInputPath)
 
     await generateHlsPlaylist({
@@ -90,18 +109,26 @@ async function saveLive (video: MVideo, live: MVideoLive) {
       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)
+  }
 
-  await publishAndFederateIfNeeded(video)
+  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 }))
@@ -126,6 +153,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')
 }