Introduce import command

4 files changed, 99 insertions, 92 deletions

diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index bd5c29e51..95c876110 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -18,7 +18,16 @@ import { makeGetRequest } from '../requests/requests'
 import { SearchCommand } from '../search'
 import { SocketIOCommand } from '../socket'
 import { AccountsCommand, BlocklistCommand, SubscriptionsCommand } from '../users'
-import { BlacklistCommand, CaptionsCommand, ChangeOwnershipCommand, HistoryCommand, LiveCommand, PlaylistsCommand, ServicesCommand } from '../videos'
+import {
+  BlacklistCommand,
+  CaptionsCommand,
+  ChangeOwnershipCommand,
+  HistoryCommand,
+  ImportsCommand,
+  LiveCommand,
+  PlaylistsCommand,
+  ServicesCommand
+} from '../videos'
 import { ConfigCommand } from './config-command'
 import { ContactFormCommand } from './contact-form-command'
 import { DebugCommand } from './debug-command'
@@ -107,6 +116,7 @@ interface ServerInfo {
   changeOwnershipCommand?: ChangeOwnershipCommand
   playlistsCommand?: PlaylistsCommand
   historyCommand?: HistoryCommand
+  importsCommand?: ImportsCommand
 }
 
 function parallelTests () {
@@ -339,6 +349,7 @@ async function runServer (server: ServerInfo, configOverrideArg?: any, args = []
       server.changeOwnershipCommand = new ChangeOwnershipCommand(server)
       server.playlistsCommand = new PlaylistsCommand(server)
       server.historyCommand = new HistoryCommand(server)
+      server.importsCommand = new ImportsCommand(server)
 
       res(server)
     })
diff --git a/shared/extra-utils/videos/imports-command.ts b/shared/extra-utils/videos/imports-command.ts
new file mode 100644
index 000000000..024aa363f
--- /dev/null
+++ b/shared/extra-utils/videos/imports-command.ts
@@ -0,0 +1,86 @@
+
+import { ResultList } from '@shared/models'
+import { HttpStatusCode } from '../../core-utils/miscs/http-error-codes'
+import { VideoImport, VideoImportCreate } from '../../models/videos'
+import { unwrapBody } from '../requests'
+import { AbstractCommand, OverrideCommandOptions } from '../shared'
+
+export class ImportsCommand extends AbstractCommand {
+
+  static getYoutubeVideoUrl () {
+    return 'https://www.youtube.com/watch?v=msX3jv1XdvM'
+  }
+
+  static getYoutubeHDRVideoUrl () {
+    /**
+     * The video is used to check format-selection correctness wrt. HDR,
+     * which brings its own set of oddities outside of a MediaSource.
+     * FIXME: refactor once HDR is supported at playback
+     *
+     * The video needs to have the following format_ids:
+     * (which you can check by using `youtube-dl <url> -F`):
+     * - 303 (1080p webm vp9)
+     * - 299 (1080p mp4 avc1)
+     * - 335 (1080p webm vp9.2 HDR)
+     *
+     * 15 jan. 2021: TEST VIDEO NOT CURRENTLY PROVIDING
+     * - 400 (1080p mp4 av01)
+     * - 315 (2160p webm vp9 HDR)
+     * - 337 (2160p webm vp9.2 HDR)
+     * - 401 (2160p mp4 av01 HDR)
+     */
+    return 'https://www.youtube.com/watch?v=qR5vOXbZsI4'
+  }
+
+  static getMagnetURI () {
+    // eslint-disable-next-line max-len
+    return 'magnet:?xs=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Ftorrents%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.torrent&xt=urn:btih:0f498834733e8057ed5c6f2ee2b4efd8d84a76ee&dn=super+peertube2+video&tr=wss%3A%2F%2Fpeertube2.cpy.re%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube2.cpy.re%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Fwebseed%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.mp4'
+  }
+
+  static getBadVideoUrl () {
+    return 'https://download.cpy.re/peertube/bad_video.mp4'
+  }
+
+  static getGoodVideoUrl () {
+    return 'https://download.cpy.re/peertube/good_video.mp4'
+  }
+
+  importVideo (options: OverrideCommandOptions & {
+    attributes: VideoImportCreate & { torrentfile?: string }
+  }) {
+    const { attributes } = options
+    const path = '/api/v1/videos/imports'
+
+    let attaches: any = {}
+    if (attributes.torrentfile) attaches = { torrentfile: attributes.torrentfile }
+
+    return unwrapBody<VideoImport>(this.postUploadRequest({
+      ...options,
+
+      path,
+      attaches,
+      fields: options.attributes,
+      implicitToken: true,
+      defaultExpectedStatus: HttpStatusCode.OK_200
+    }))
+  }
+
+  getMyVideoImports (options: OverrideCommandOptions & {
+    sort?: string
+  } = {}) {
+    const { sort } = options
+    const path = '/api/v1/users/me/videos/imports'
+
+    const query = {}
+    if (sort) query['sort'] = sort
+
+    return this.getRequestBody<ResultList<VideoImport>>({
+      ...options,
+
+      path,
+      query: { sort },
+      implicitToken: true,
+      defaultExpectedStatus: HttpStatusCode.OK_200
+    })
+  }
+}
diff --git a/shared/extra-utils/videos/index.ts b/shared/extra-utils/videos/index.ts
index 74667fc06..372cf7a90 100644
--- a/shared/extra-utils/videos/index.ts
+++ b/shared/extra-utils/videos/index.ts
@@ -3,6 +3,7 @@ export * from './captions'
 export * from './captions-command'
 export * from './change-ownership-command'
 export * from './history-command'
+export * from './imports-command'
 export * from './live-command'
 export * from './live'
 export * from './playlists-command'
@@ -10,6 +11,5 @@ export * from './playlists'
 export * from './services-command'
 export * from './video-channels'
 export * from './video-comments'
-export * from './video-imports'
 export * from './video-streaming-playlists'
 export * from './videos'
diff --git a/shared/extra-utils/videos/video-imports.ts b/shared/extra-utils/videos/video-imports.ts
deleted file mode 100644
index 81c0163cb..000000000
--- a/shared/extra-utils/videos/video-imports.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-
-import { VideoImportCreate } from '../../models/videos'
-import { makeGetRequest, makeUploadRequest } from '../requests/requests'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
-
-function getYoutubeVideoUrl () {
-  return 'https://www.youtube.com/watch?v=msX3jv1XdvM'
-}
-
-function getYoutubeHDRVideoUrl () {
-  /**
-   * The video is used to check format-selection correctness wrt. HDR,
-   * which brings its own set of oddities outside of a MediaSource.
-   * FIXME: refactor once HDR is supported at playback
-   *
-   * The video needs to have the following format_ids:
-   * (which you can check by using `youtube-dl <url> -F`):
-   * - 303 (1080p webm vp9)
-   * - 299 (1080p mp4 avc1)
-   * - 335 (1080p webm vp9.2 HDR)
-   *
-   * 15 jan. 2021: TEST VIDEO NOT CURRENTLY PROVIDING
-   * - 400 (1080p mp4 av01)
-   * - 315 (2160p webm vp9 HDR)
-   * - 337 (2160p webm vp9.2 HDR)
-   * - 401 (2160p mp4 av01 HDR)
-   */
-  return 'https://www.youtube.com/watch?v=qR5vOXbZsI4'
-}
-
-function getMagnetURI () {
-  // eslint-disable-next-line max-len
-  return 'magnet:?xs=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Ftorrents%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.torrent&xt=urn:btih:0f498834733e8057ed5c6f2ee2b4efd8d84a76ee&dn=super+peertube2+video&tr=wss%3A%2F%2Fpeertube2.cpy.re%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube2.cpy.re%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Fwebseed%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.mp4'
-}
-
-function getBadVideoUrl () {
-  return 'https://download.cpy.re/peertube/bad_video.mp4'
-}
-
-function getGoodVideoUrl () {
-  return 'https://download.cpy.re/peertube/good_video.mp4'
-}
-
-function importVideo (
-  url: string,
-  token: string,
-  attributes: VideoImportCreate & { torrentfile?: string },
-  statusCodeExpected = HttpStatusCode.OK_200
-) {
-  const path = '/api/v1/videos/imports'
-
-  let attaches: any = {}
-  if (attributes.torrentfile) attaches = { torrentfile: attributes.torrentfile }
-
-  return makeUploadRequest({
-    url,
-    path,
-    token,
-    attaches,
-    fields: attributes,
-    statusCodeExpected
-  })
-}
-
-function getMyVideoImports (url: string, token: string, sort?: string) {
-  const path = '/api/v1/users/me/videos/imports'
-
-  const query = {}
-  if (sort) query['sort'] = sort
-
-  return makeGetRequest({
-    url,
-    query,
-    path,
-    token,
-    statusCodeExpected: HttpStatusCode.OK_200
-  })
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  getBadVideoUrl,
-  getYoutubeVideoUrl,
-  getYoutubeHDRVideoUrl,
-  importVideo,
-  getMagnetURI,
-  getMyVideoImports,
-  getGoodVideoUrl
-}