Optimize torrent URL update

[github/Chocobozzz/PeerTube.git] / shared / extra-utils / videos / videos-command.ts

diff --git a/shared/extra-utils/videos/videos-command.ts b/shared/extra-utils/videos/videos-command.ts
index 5556cddf6c7da4a0c5379c701a1267c6b23023b0..d35339c8d4770b3e57b3041da73967df3420b7c6 100644 (file)
--- a/shared/extra-utils/videos/videos-command.ts
+++ b/shared/extra-utils/videos/videos-command.ts
@@ -3,12 +3,13 @@
 import { expect } from 'chai'
 import { createReadStream, stat } from 'fs-extra'
 import got, { Response as GotResponse } from 'got'
-import { omit, pick } from 'lodash'
+import { omit } from 'lodash'
 import validator from 'validator'
 import { buildUUID } from '@server/helpers/uuid'
 import { loadLanguages } from '@server/initializers/constants'
-import { HttpStatusCode } from '@shared/core-utils'
+import { pick } from '@shared/core-utils'
 import {
+  HttpStatusCode,
   ResultList,
   UserVideoRateType,
   Video,
@@ -22,7 +23,7 @@ import {
 } from '@shared/models'
 import { buildAbsoluteFixturePath, wait } from '../miscs'
 import { unwrapBody } from '../requests'
-import { ServerInfo, waitJobs } from '../server'
+import { PeerTubeServer, waitJobs } from '../server'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile'>> & {
@@ -33,7 +34,7 @@ export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile
 
 export class VideosCommand extends AbstractCommand {
 
-  constructor (server: ServerInfo) {
+  constructor (server: PeerTubeServer) {
     super(server)
 
     loadLanguages()
@@ -187,6 +188,17 @@ export class VideosCommand extends AbstractCommand {
     return id
   }
 
+  async listFiles (options: OverrideCommandOptions & {
+    id: number | string
+  }) {
+    const video = await this.get(options)
+
+    const files = video.files || []
+    const hlsFiles = video.streamingPlaylists[0]?.files || []
+
+    return files.concat(hlsFiles)
+  }
+
   // ---------------------------------------------------------------------------
 
   listMyVideos (options: OverrideCommandOptions & {
@@ -234,10 +246,10 @@ export class VideosCommand extends AbstractCommand {
   }
 
   listByAccount (options: OverrideCommandOptions & VideosWithSearchCommonQuery & {
-    accountName: string
+    handle: string
   }) {
-    const { accountName, search } = options
-    const path = '/api/v1/accounts/' + accountName + '/videos'
+    const { handle, search } = options
+    const path = '/api/v1/accounts/' + handle + '/videos'
 
     return this.getRequestBody<ResultList<Video>>({
       ...options,
@@ -250,10 +262,10 @@ export class VideosCommand extends AbstractCommand {
   }
 
   listByChannel (options: OverrideCommandOptions & VideosWithSearchCommonQuery & {
-    videoChannelName: string
+    handle: string
   }) {
-    const { videoChannelName } = options
-    const path = '/api/v1/video-channels/' + videoChannelName + '/videos'
+    const { handle } = options
+    const path = '/api/v1/video-channels/' + handle + '/videos'
 
     return this.getRequestBody<ResultList<Video>>({
       ...options,
@@ -267,6 +279,16 @@ export class VideosCommand extends AbstractCommand {
 
   // ---------------------------------------------------------------------------
 
+  async find (options: OverrideCommandOptions & {
+    name: string
+  }) {
+    const { data } = await this.list(options)
+
+    return data.find(v => v.name === options.name)
+  }
+
+  // ---------------------------------------------------------------------------
+
   update (options: OverrideCommandOptions & {
     id: number | string
     attributes?: VideoEdit
@@ -309,13 +331,13 @@ export class VideosCommand extends AbstractCommand {
   }) {
     const path = '/api/v1/videos/' + options.id
 
-    return this.deleteRequest({
+    return unwrapBody(this.deleteRequest({
       ...options,
 
       path,
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
+    }))
   }
 
   async removeAll () {
@@ -332,7 +354,7 @@ export class VideosCommand extends AbstractCommand {
     attributes?: VideoEdit
     mode?: 'legacy' | 'resumable' // default legacy
   } = {}) {
-    const { mode = 'legacy', expectedStatus } = options
+    const { mode = 'legacy' } = options
     let defaultChannelId = 1
 
     try {
@@ -360,22 +382,23 @@ export class VideosCommand extends AbstractCommand {
       ...options.attributes
     }
 
-    const res = mode === 'legacy'
+    const created = mode === 'legacy'
       ? await this.buildLegacyUpload({ ...options, attributes })
       : await this.buildResumeUpload({ ...options, attributes })
 
     // Wait torrent generation
+    const expectedStatus = this.buildExpectedStatus({ ...options, defaultExpectedStatus: HttpStatusCode.OK_200 })
     if (expectedStatus === HttpStatusCode.OK_200) {
       let video: VideoDetails
 
       do {
-        video = await this.getWithToken({ ...options, id: video.uuid })
+        video = await this.getWithToken({ ...options, id: created.uuid })
 
         await wait(50)
       } while (!video.files[0].torrentUrl)
     }
 
-    return res
+    return created
   }
 
   async buildLegacyUpload (options: OverrideCommandOptions & {
@@ -396,7 +419,7 @@ export class VideosCommand extends AbstractCommand {
 
   async buildResumeUpload (options: OverrideCommandOptions & {
     attributes: VideoEdit
-  }) {
+  }): Promise<VideoCreateResult> {
     const { attributes, expectedStatus } = options
 
     let size = 0
@@ -414,7 +437,8 @@ export class VideosCommand extends AbstractCommand {
       }
     }
 
-    const initializeSessionRes = await this.prepareResumableUpload({ ...options, attributes, size, mimetype })
+    // Do not check status automatically, we'll check it manually
+    const initializeSessionRes = await this.prepareResumableUpload({ ...options, expectedStatus: null, attributes, size, mimetype })
     const initStatus = initializeSessionRes.status
 
     if (videoFilePath && initStatus === HttpStatusCode.CREATED_201) {
@@ -425,7 +449,7 @@ export class VideosCommand extends AbstractCommand {
 
       const result = await this.sendResumableChunks({ ...options, pathUploadId, videoFilePath, size })
 
-      return result.body.video
+      return result.body?.video || result.body as any
     }
 
     const expectedInitStatus = expectedStatus === HttpStatusCode.OK_200
@@ -434,7 +458,7 @@ export class VideosCommand extends AbstractCommand {
 
     expect(initStatus).to.equal(expectedInitStatus)
 
-    return initializeSessionRes.body.video as VideoCreateResult
+    return initializeSessionRes.body.video || initializeSessionRes.body
   }
 
   async prepareResumableUpload (options: OverrideCommandOptions & {
@@ -455,7 +479,10 @@ export class VideosCommand extends AbstractCommand {
         'X-Upload-Content-Length': size.toString()
       },
       fields: { filename: attributes.fixture, ...this.buildUploadFields(options.attributes) },
+      // Fixture will be sent later
+      attaches: this.buildUploadAttaches(omit(options.attributes, 'fixture')),
       implicitToken: true,
+
       defaultExpectedStatus: null
     })
   }
@@ -531,18 +558,18 @@ export class VideosCommand extends AbstractCommand {
 
   async randomUpload (options: OverrideCommandOptions & {
     wait?: boolean // default true
-    additionalParams?: VideoEdit & { prefixName: string }
+    additionalParams?: VideoEdit & { prefixName?: string }
   } = {}) {
     const { wait = true, additionalParams } = options
     const prefixName = additionalParams?.prefixName || ''
     const name = prefixName + buildUUID()
 
-    const attributes = { name, additionalParams }
-
-    if (wait) await waitJobs([ this.server ])
+    const attributes = { name, ...additionalParams }
 
     const result = await this.upload({ ...options, attributes })
 
+    if (wait) await waitJobs([ this.server ])
+
     return { ...result, name }
   }
 
@@ -566,7 +593,7 @@ export class VideosCommand extends AbstractCommand {
   }
 
   private buildUploadFields (attributes: VideoEdit) {
-    return omit(attributes, [ 'thumbnailfile', 'previewfile' ])
+    return omit(attributes, [ 'fixture', 'thumbnailfile', 'previewfile' ])
   }
 
   private buildUploadAttaches (attributes: VideoEdit) {