diff options
Diffstat (limited to 'shared/extra-utils/videos')
-rw-r--r-- | shared/extra-utils/videos/live.ts | 10 | ||||
-rw-r--r-- | shared/extra-utils/videos/videos.ts | 15 |
2 files changed, 9 insertions, 16 deletions
diff --git a/shared/extra-utils/videos/live.ts b/shared/extra-utils/videos/live.ts index 4bfcc583e..85c83c5bb 100644 --- a/shared/extra-utils/videos/live.ts +++ b/shared/extra-utils/videos/live.ts | |||
@@ -53,15 +53,15 @@ function createLive (url: string, token: string, fields: LiveVideoCreate, status | |||
53 | }) | 53 | }) |
54 | } | 54 | } |
55 | 55 | ||
56 | async function sendRTMPStreamInVideo (url: string, token: string, videoId: number | string) { | 56 | async function sendRTMPStreamInVideo (url: string, token: string, videoId: number | string, fixtureName?: string) { |
57 | const res = await getLive(url, token, videoId) | 57 | const res = await getLive(url, token, videoId) |
58 | const videoLive = res.body as LiveVideo | 58 | const videoLive = res.body as LiveVideo |
59 | 59 | ||
60 | return sendRTMPStream(videoLive.rtmpUrl, videoLive.streamKey) | 60 | return sendRTMPStream(videoLive.rtmpUrl, videoLive.streamKey, fixtureName) |
61 | } | 61 | } |
62 | 62 | ||
63 | function sendRTMPStream (rtmpBaseUrl: string, streamKey: string) { | 63 | function sendRTMPStream (rtmpBaseUrl: string, streamKey: string, fixtureName = 'video_short.mp4') { |
64 | const fixture = buildAbsoluteFixturePath('video_short.mp4') | 64 | const fixture = buildAbsoluteFixturePath(fixtureName) |
65 | 65 | ||
66 | const command = ffmpeg(fixture) | 66 | const command = ffmpeg(fixture) |
67 | command.inputOption('-stream_loop -1') | 67 | command.inputOption('-stream_loop -1') |
@@ -140,7 +140,7 @@ async function waitUntilLiveStarts (url: string, token: string, videoId: number | |||
140 | } | 140 | } |
141 | 141 | ||
142 | async function checkLiveCleanup (server: ServerInfo, videoUUID: string, resolutions: number[] = []) { | 142 | async function checkLiveCleanup (server: ServerInfo, videoUUID: string, resolutions: number[] = []) { |
143 | const basePath = buildServerDirectory(server.internalServerNumber, 'streaming-playlists') | 143 | const basePath = buildServerDirectory(server, 'streaming-playlists') |
144 | const hlsPath = join(basePath, 'hls', videoUUID) | 144 | const hlsPath = join(basePath, 'hls', videoUUID) |
145 | 145 | ||
146 | if (resolutions.length === 0) { | 146 | if (resolutions.length === 0) { |
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts index 29a646541..2b8c55acb 100644 --- a/shared/extra-utils/videos/videos.ts +++ b/shared/extra-utils/videos/videos.ts | |||
@@ -9,15 +9,7 @@ import { v4 as uuidv4 } from 'uuid' | |||
9 | import validator from 'validator' | 9 | import validator from 'validator' |
10 | import { loadLanguages, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants' | 10 | import { loadLanguages, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants' |
11 | import { VideoDetails, VideoPrivacy } from '../../models/videos' | 11 | import { VideoDetails, VideoPrivacy } from '../../models/videos' |
12 | import { | 12 | import { buildAbsoluteFixturePath, buildServerDirectory, dateIsValid, immutableAssign, testImage, webtorrentAdd } from '../miscs/miscs' |
13 | buildAbsoluteFixturePath, | ||
14 | buildServerDirectory, | ||
15 | dateIsValid, | ||
16 | immutableAssign, | ||
17 | root, | ||
18 | testImage, | ||
19 | webtorrentAdd | ||
20 | } from '../miscs/miscs' | ||
21 | import { makeGetRequest, makePutBodyRequest, makeUploadRequest } from '../requests/requests' | 13 | import { makeGetRequest, makePutBodyRequest, makeUploadRequest } from '../requests/requests' |
22 | import { waitJobs } from '../server/jobs' | 14 | import { waitJobs } from '../server/jobs' |
23 | import { ServerInfo } from '../server/servers' | 15 | import { ServerInfo } from '../server/servers' |
@@ -335,7 +327,7 @@ async function checkVideoFilesWereRemoved ( | |||
335 | ] | 327 | ] |
336 | ) { | 328 | ) { |
337 | for (const directory of directories) { | 329 | for (const directory of directories) { |
338 | const directoryPath = buildServerDirectory(serverNumber, directory) | 330 | const directoryPath = buildServerDirectory({ internalServerNumber: serverNumber }, directory) |
339 | 331 | ||
340 | const directoryExists = await pathExists(directoryPath) | 332 | const directoryExists = await pathExists(directoryPath) |
341 | if (directoryExists === false) continue | 333 | if (directoryExists === false) continue |
@@ -489,7 +481,8 @@ function rateVideo (url: string, accessToken: string, id: number, rating: string | |||
489 | function parseTorrentVideo (server: ServerInfo, videoUUID: string, resolution: number) { | 481 | function parseTorrentVideo (server: ServerInfo, videoUUID: string, resolution: number) { |
490 | return new Promise<any>((res, rej) => { | 482 | return new Promise<any>((res, rej) => { |
491 | const torrentName = videoUUID + '-' + resolution + '.torrent' | 483 | const torrentName = videoUUID + '-' + resolution + '.torrent' |
492 | const torrentPath = join(root(), 'test' + server.internalServerNumber, 'torrents', torrentName) | 484 | const torrentPath = buildServerDirectory(server, join('torrents', torrentName)) |
485 | |||
493 | readFile(torrentPath, (err, data) => { | 486 | readFile(torrentPath, (err, data) => { |
494 | if (err) return rej(err) | 487 | if (err) return rej(err) |
495 | 488 | ||