aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/extra-utils
diff options
context:
space:
mode:
Diffstat (limited to 'shared/extra-utils')
-rw-r--r--shared/extra-utils/server/servers.ts5
-rw-r--r--shared/extra-utils/videos/live.ts14
2 files changed, 12 insertions, 7 deletions
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 994aac628..b4bd55968 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -10,10 +10,12 @@ import { randomInt } from '../../core-utils/miscs/miscs'
10 10
11interface ServerInfo { 11interface ServerInfo {
12 app: ChildProcess 12 app: ChildProcess
13
13 url: string 14 url: string
14 host: string 15 host: string
15 16 hostname: string
16 port: number 17 port: number
18
17 parallel: boolean 19 parallel: boolean
18 internalServerNumber: number 20 internalServerNumber: number
19 serverNumber: number 21 serverNumber: number
@@ -109,6 +111,7 @@ async function flushAndRunServer (serverNumber: number, configOverride?: Object,
109 serverNumber, 111 serverNumber,
110 url: `http://localhost:${port}`, 112 url: `http://localhost:${port}`,
111 host: `localhost:${port}`, 113 host: `localhost:${port}`,
114 hostname: 'localhost',
112 client: { 115 client: {
113 id: null, 116 id: null,
114 secret: null 117 secret: null
diff --git a/shared/extra-utils/videos/live.ts b/shared/extra-utils/videos/live.ts
index f500fdc3e..65942db0a 100644
--- a/shared/extra-utils/videos/live.ts
+++ b/shared/extra-utils/videos/live.ts
@@ -2,8 +2,8 @@ import * as ffmpeg from 'fluent-ffmpeg'
2import { LiveVideoCreate, LiveVideoUpdate, VideoDetails, VideoState } from '@shared/models' 2import { LiveVideoCreate, LiveVideoUpdate, VideoDetails, VideoState } from '@shared/models'
3import { buildAbsoluteFixturePath, wait } from '../miscs/miscs' 3import { buildAbsoluteFixturePath, wait } from '../miscs/miscs'
4import { makeGetRequest, makePutBodyRequest, makeUploadRequest } from '../requests/requests' 4import { makeGetRequest, makePutBodyRequest, makeUploadRequest } from '../requests/requests'
5import { ServerInfo } from '../server/servers' 5import { getVideoWithToken } from './videos'
6import { getVideo, getVideoWithToken } from './videos' 6import { omit } from 'lodash'
7 7
8function getLive (url: string, token: string, videoId: number | string, statusCodeExpected = 200) { 8function getLive (url: string, token: string, videoId: number | string, statusCodeExpected = 200) {
9 const path = '/api/v1/videos/live' 9 const path = '/api/v1/videos/live'
@@ -31,16 +31,18 @@ function updateLive (url: string, token: string, videoId: number | string, field
31function createLive (url: string, token: string, fields: LiveVideoCreate, statusCodeExpected = 200) { 31function createLive (url: string, token: string, fields: LiveVideoCreate, statusCodeExpected = 200) {
32 const path = '/api/v1/videos/live' 32 const path = '/api/v1/videos/live'
33 33
34 let attaches: any = {} 34 const attaches: any = {}
35 if (fields.thumbnailfile) attaches = { thumbnailfile: fields.thumbnailfile } 35 if (fields.thumbnailfile) attaches.thumbnailfile = fields.thumbnailfile
36 if (fields.previewfile) attaches = { previewfile: fields.previewfile } 36 if (fields.previewfile) attaches.previewfile = fields.previewfile
37
38 const updatedFields = omit(fields, 'thumbnailfile', 'previewfile')
37 39
38 return makeUploadRequest({ 40 return makeUploadRequest({
39 url, 41 url,
40 path, 42 path,
41 token, 43 token,
42 attaches, 44 attaches,
43 fields, 45 fields: updatedFields,
44 statusCodeExpected 46 statusCodeExpected
45 }) 47 })
46} 48}