Put private videos under a specific subdirectory

[github/Chocobozzz/PeerTube.git] / server / lib / live / live-manager.ts

diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts
index aadd8e30829e61b63aede0a8a00891e77f0013f3..9470b530b7955e725d3ecde3350188075b74b741 100644 (file)
--- a/server/lib/live/live-manager.ts
+++ b/server/lib/live/live-manager.ts
@@ -1,4 +1,3 @@
-
 import { readdir, readFile } from 'fs-extra'
 import { createServer, Server } from 'net'
 import { join } from 'path'
@@ -9,7 +8,8 @@ import {
   getLiveSegmentTime,
   getVideoStreamBitrate,
   getVideoStreamDimensionsInfo,
-  getVideoStreamFPS
+  getVideoStreamFPS,
+  hasAudioStream
 } from '@server/helpers/ffmpeg'
 import { logger, loggerTagsFactory } from '@server/helpers/logger'
 import { CONFIG, registerConfigChangedHandler } from '@server/initializers/config'
@@ -20,15 +20,15 @@ import { VideoLiveModel } from '@server/models/video/video-live'
 import { VideoLiveSessionModel } from '@server/models/video/video-live-session'
 import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
 import { MStreamingPlaylistVideo, MVideo, MVideoLiveSession, MVideoLiveVideo } from '@server/types/models'
-import { wait } from '@shared/core-utils'
-import { LiveVideoError, VideoState, VideoStreamingPlaylistType } from '@shared/models'
+import { pick, wait } from '@shared/core-utils'
+import { LiveVideoError, VideoState, VideoStorage, VideoStreamingPlaylistType } from '@shared/models'
 import { federateVideoIfNeeded } from '../activitypub/videos'
 import { JobQueue } from '../job-queue'
 import { generateHLSMasterPlaylistFilename, generateHlsSha256SegmentsFilename, getLiveReplayBaseDirectory } from '../paths'
 import { PeerTubeSocket } from '../peertube-socket'
 import { Hooks } from '../plugins/hooks'
 import { LiveQuotaStore } from './live-quota-store'
-import { cleanupPermanentLive } from './live-utils'
+import { cleanupAndDestroyPermanentLive } from './live-utils'
 import { MuxingSession } from './shared'
 
 const NodeRtmpSession = require('node-media-server/src/node_rtmp_session')
@@ -224,7 +224,7 @@ class LiveManager {
     if (oldStreamingPlaylist) {
       if (!videoLive.permanentLive) throw new Error('Found previous session in a non permanent live: ' + video.uuid)
 
-      await cleanupPermanentLive(video, oldStreamingPlaylist)
+      await cleanupAndDestroyPermanentLive(video, oldStreamingPlaylist)
     }
 
     this.videoSessions.set(video.id, sessionId)
@@ -232,10 +232,11 @@ class LiveManager {
     const now = Date.now()
     const probe = await ffprobePromise(inputUrl)
 
-    const [ { resolution, ratio }, fps, bitrate ] = await Promise.all([
+    const [ { resolution, ratio }, fps, bitrate, hasAudio ] = await Promise.all([
       getVideoStreamDimensionsInfo(inputUrl, probe),
       getVideoStreamFPS(inputUrl, probe),
-      getVideoStreamBitrate(inputUrl, probe)
+      getVideoStreamBitrate(inputUrl, probe),
+      hasAudioStream(inputUrl, probe)
     ])
 
     logger.info(
@@ -259,26 +260,30 @@ class LiveManager {
     return this.runMuxingSession({
       sessionId,
       videoLive,
+
       streamingPlaylist,
       inputUrl,
       fps,
       bitrate,
       ratio,
-      allResolutions
+      allResolutions,
+      hasAudio
     })
   }
 
   private async runMuxingSession (options: {
     sessionId: string
     videoLive: MVideoLiveVideo
+
     streamingPlaylist: MStreamingPlaylistVideo
     inputUrl: string
     fps: number
     bitrate: number
     ratio: number
     allResolutions: number[]
+    hasAudio: boolean
   }) {
-    const { sessionId, videoLive, streamingPlaylist, allResolutions, fps, bitrate, ratio, inputUrl } = options
+    const { sessionId, videoLive } = options
     const videoUUID = videoLive.Video.uuid
     const localLTags = lTags(sessionId, videoUUID)
 
@@ -289,18 +294,14 @@ class LiveManager {
 
     const muxingSession = new MuxingSession({
       context: this.getContext(),
-      user,
       sessionId,
       videoLive,
-      streamingPlaylist,
-      inputUrl,
-      bitrate,
-      ratio,
-      fps,
-      allResolutions
+      user,
+
+      ...pick(options, [ 'streamingPlaylist', 'inputUrl', 'bitrate', 'ratio', 'fps', 'allResolutions', 'hasAudio' ])
     })
 
-    muxingSession.on('master-playlist-created', () => this.publishAndFederateLive(videoLive, localLTags))
+    muxingSession.on('live-ready', () => this.publishAndFederateLive(videoLive, localLTags))
 
     muxingSession.on('bad-socket-health', ({ videoId }) => {
       logger.error(
@@ -484,6 +485,10 @@ class LiveManager {
 
     playlist.assignP2PMediaLoaderInfoHashes(video, allResolutions)
 
+    playlist.storage = CONFIG.OBJECT_STORAGE.ENABLED
+      ? VideoStorage.OBJECT_STORAGE
+      : VideoStorage.FILE_SYSTEM
+
     return playlist.save()
   }