aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/extra-utils
diff options
context:
space:
mode:
Diffstat (limited to 'shared/extra-utils')
-rw-r--r--shared/extra-utils/server/jobs.ts5
-rw-r--r--shared/extra-utils/videos/video-playlists.ts8
2 files changed, 6 insertions, 7 deletions
diff --git a/shared/extra-utils/server/jobs.ts b/shared/extra-utils/server/jobs.ts
index 11b570f60..b3db885e8 100644
--- a/shared/extra-utils/server/jobs.ts
+++ b/shared/extra-utils/server/jobs.ts
@@ -2,7 +2,6 @@ import * as request from 'supertest'
2import { Job, JobState } from '../../models' 2import { Job, JobState } from '../../models'
3import { wait } from '../miscs/miscs' 3import { wait } from '../miscs/miscs'
4import { ServerInfo } from './servers' 4import { ServerInfo } from './servers'
5import { inspect } from 'util'
6 5
7function getJobsList (url: string, accessToken: string, state: JobState) { 6function getJobsList (url: string, accessToken: string, state: JobState) {
8 const path = '/api/v1/jobs/' + state 7 const path = '/api/v1/jobs/' + state
@@ -37,11 +36,10 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
37 else servers = serversArg as ServerInfo[] 36 else servers = serversArg as ServerInfo[]
38 37
39 const states: JobState[] = [ 'waiting', 'active', 'delayed' ] 38 const states: JobState[] = [ 'waiting', 'active', 'delayed' ]
40 let pendingRequests = false 39 let pendingRequests: boolean
41 40
42 function tasksBuilder () { 41 function tasksBuilder () {
43 const tasks: Promise<any>[] = [] 42 const tasks: Promise<any>[] = []
44 pendingRequests = false
45 43
46 // Check if each server has pending request 44 // Check if each server has pending request
47 for (const server of servers) { 45 for (const server of servers) {
@@ -62,6 +60,7 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
62 } 60 }
63 61
64 do { 62 do {
63 pendingRequests = false
65 await Promise.all(tasksBuilder()) 64 await Promise.all(tasksBuilder())
66 65
67 // Retry, in case of new jobs were created 66 // Retry, in case of new jobs were created
diff --git a/shared/extra-utils/videos/video-playlists.ts b/shared/extra-utils/videos/video-playlists.ts
index fd62bef19..cbb073fbc 100644
--- a/shared/extra-utils/videos/video-playlists.ts
+++ b/shared/extra-utils/videos/video-playlists.ts
@@ -196,11 +196,11 @@ function updateVideoPlaylistElement (options: {
196 url: string, 196 url: string,
197 token: string, 197 token: string,
198 playlistId: number | string, 198 playlistId: number | string,
199 videoId: number | string, 199 playlistElementId: number | string,
200 elementAttrs: VideoPlaylistElementUpdate, 200 elementAttrs: VideoPlaylistElementUpdate,
201 expectedStatus?: number 201 expectedStatus?: number
202}) { 202}) {
203 const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.videoId 203 const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.playlistElementId
204 204
205 return makePutBodyRequest({ 205 return makePutBodyRequest({
206 url: options.url, 206 url: options.url,
@@ -215,10 +215,10 @@ function removeVideoFromPlaylist (options: {
215 url: string, 215 url: string,
216 token: string, 216 token: string,
217 playlistId: number | string, 217 playlistId: number | string,
218 videoId: number | string, 218 playlistElementId: number,
219 expectedStatus?: number 219 expectedStatus?: number
220}) { 220}) {
221 const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.videoId 221 const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.playlistElementId
222 222
223 return makeDeleteRequest({ 223 return makeDeleteRequest({
224 url: options.url, 224 url: options.url,