diff options
Diffstat (limited to 'server/lib/schedulers')
-rw-r--r-- | server/lib/schedulers/videos-redundancy-scheduler.ts | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/server/lib/schedulers/videos-redundancy-scheduler.ts b/server/lib/schedulers/videos-redundancy-scheduler.ts index 103ab1fab..137ae53a0 100644 --- a/server/lib/schedulers/videos-redundancy-scheduler.ts +++ b/server/lib/schedulers/videos-redundancy-scheduler.ts | |||
@@ -4,9 +4,7 @@ import { getServerActor } from '@server/models/application/application' | |||
4 | import { TrackerModel } from '@server/models/server/tracker' | 4 | import { TrackerModel } from '@server/models/server/tracker' |
5 | import { VideoModel } from '@server/models/video/video' | 5 | import { VideoModel } from '@server/models/video/video' |
6 | import { | 6 | import { |
7 | MStreamingPlaylist, | ||
8 | MStreamingPlaylistFiles, | 7 | MStreamingPlaylistFiles, |
9 | MStreamingPlaylistVideo, | ||
10 | MVideoAccountLight, | 8 | MVideoAccountLight, |
11 | MVideoFile, | 9 | MVideoFile, |
12 | MVideoFileVideo, | 10 | MVideoFileVideo, |
@@ -249,7 +247,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler { | |||
249 | private async createStreamingPlaylistRedundancy ( | 247 | private async createStreamingPlaylistRedundancy ( |
250 | redundancy: VideosRedundancyStrategy, | 248 | redundancy: VideosRedundancyStrategy, |
251 | video: MVideoAccountLight, | 249 | video: MVideoAccountLight, |
252 | playlistArg: MStreamingPlaylist | 250 | playlistArg: MStreamingPlaylistFiles |
253 | ) { | 251 | ) { |
254 | let strategy = 'manual' | 252 | let strategy = 'manual' |
255 | let expiresOn: Date = null | 253 | let expiresOn: Date = null |
@@ -259,16 +257,17 @@ export class VideosRedundancyScheduler extends AbstractScheduler { | |||
259 | expiresOn = this.buildNewExpiration(redundancy.minLifetime) | 257 | expiresOn = this.buildNewExpiration(redundancy.minLifetime) |
260 | } | 258 | } |
261 | 259 | ||
262 | const playlist = playlistArg as MStreamingPlaylistVideo | 260 | const playlist = Object.assign(playlistArg, { Video: video }) |
263 | playlist.Video = video | ||
264 | |||
265 | const serverActor = await getServerActor() | 261 | const serverActor = await getServerActor() |
266 | 262 | ||
267 | logger.info('Duplicating %s streaming playlist in videos redundancy with "%s" strategy.', video.url, strategy) | 263 | logger.info('Duplicating %s streaming playlist in videos redundancy with "%s" strategy.', video.url, strategy) |
268 | 264 | ||
269 | const destDirectory = join(HLS_REDUNDANCY_DIRECTORY, video.uuid) | 265 | const destDirectory = join(HLS_REDUNDANCY_DIRECTORY, video.uuid) |
270 | const masterPlaylistUrl = playlist.getMasterPlaylistUrl(video) | 266 | const masterPlaylistUrl = playlist.getMasterPlaylistUrl(video) |
271 | await downloadPlaylistSegments(masterPlaylistUrl, destDirectory, VIDEO_IMPORT_TIMEOUT) | 267 | |
268 | const maxSizeKB = this.getTotalFileSizes([], [ playlist ]) / 1000 | ||
269 | const toleranceKB = maxSizeKB + ((5 * maxSizeKB) / 100) // 5% more tolerance | ||
270 | await downloadPlaylistSegments(masterPlaylistUrl, destDirectory, VIDEO_IMPORT_TIMEOUT, toleranceKB) | ||
272 | 271 | ||
273 | const createdModel: MVideoRedundancyStreamingPlaylistVideo = await VideoRedundancyModel.create({ | 272 | const createdModel: MVideoRedundancyStreamingPlaylistVideo = await VideoRedundancyModel.create({ |
274 | expiresOn, | 273 | expiresOn, |
@@ -334,7 +333,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler { | |||
334 | return `${object.VideoStreamingPlaylist.getMasterPlaylistUrl(object.VideoStreamingPlaylist.Video)}` | 333 | return `${object.VideoStreamingPlaylist.getMasterPlaylistUrl(object.VideoStreamingPlaylist.Video)}` |
335 | } | 334 | } |
336 | 335 | ||
337 | private getTotalFileSizes (files: MVideoFile[], playlists: MStreamingPlaylistFiles[]) { | 336 | private getTotalFileSizes (files: MVideoFile[], playlists: MStreamingPlaylistFiles[]): number { |
338 | const fileReducer = (previous: number, current: MVideoFile) => previous + current.size | 337 | const fileReducer = (previous: number, current: MVideoFile) => previous + current.size |
339 | 338 | ||
340 | let allFiles = files | 339 | let allFiles = files |