import { generateVideoMiniature } from '@server/lib/thumbnail'
import { publishAndFederateIfNeeded } from '@server/lib/video'
import { getHLSDirectory } from '@server/lib/video-paths'
-import { generateHlsPlaylistFromTS } from '@server/lib/video-transcoding'
+import { generateHlsPlaylistResolutionFromTS } 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'
const rootFiles = await readdir(hlsDirectory)
- const playlistFiles: string[] = []
-
- for (const file of rootFiles) {
- // Move remaining files in the replay directory
- if (file.endsWith('.ts')) {
- await LiveManager.Instance.addSegmentToReplay(hlsDirectory, join(hlsDirectory, file))
- }
-
- if (file.endsWith('.m3u8') && file !== 'master.m3u8') {
- playlistFiles.push(file)
- }
- }
+ const playlistFiles = rootFiles.filter(file => {
+ return file.endsWith('.m3u8') && file !== 'master.m3u8'
+ })
await cleanupLiveFiles(hlsDirectory)
await video.save()
// Remove old HLS playlist video files
- const videoWithFiles = await VideoModel.loadWithFiles(video.id)
+ const videoWithFiles = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.id)
const hlsPlaylist = videoWithFiles.getHLSPlaylist()
await VideoFileModel.removeHLSFilesOfVideoId(hlsPlaylist.id)
hlsPlaylist.VideoFiles = []
- let durationDone: boolean
+ let durationDone = false
for (const playlistFile of playlistFiles) {
const concatenatedTsFile = LiveManager.Instance.buildConcatenatedName(playlistFile)
const { videoFileResolution, isPortraitMode } = await getVideoFileResolution(concatenatedTsFilePath, probe)
- const outputPath = await generateHlsPlaylistFromTS({
+ const outputPath = await generateHlsPlaylistResolutionFromTS({
video: videoWithFiles,
concatenatedTsFilePath,
resolution: videoFileResolution,
// Regenerate the thumbnail & preview?
if (videoWithFiles.getMiniature().automaticallyGenerated === true) {
- await generateVideoMiniature(videoWithFiles, videoWithFiles.getMaxQualityFile(), ThumbnailType.MINIATURE)
+ await generateVideoMiniature({
+ video: videoWithFiles,
+ videoFile: videoWithFiles.getMaxQualityFile(),
+ type: ThumbnailType.MINIATURE
+ })
}
if (videoWithFiles.getPreview().automaticallyGenerated === true) {
- await generateVideoMiniature(videoWithFiles, videoWithFiles.getMaxQualityFile(), ThumbnailType.PREVIEW)
+ await generateVideoMiniature({
+ video: videoWithFiles,
+ videoFile: videoWithFiles.getMaxQualityFile(),
+ type: ThumbnailType.PREVIEW
+ })
}
await publishAndFederateIfNeeded(videoWithFiles, true)