Adapt CLI to new commands

[github/Chocobozzz/PeerTube.git] / server / tools / peertube-upload.ts

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 8de952e7b377488d4a4dd3104acbd437ec0aba9d..c94b0585729b8a643a6c8cc718984d0f024c0d85 100644 (file)
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,12 +1,11 @@
 import { registerTSPaths } from '../helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import { access, constants } from 'fs-extra'
 import { isAbsolute } from 'path'
-import { getAccessToken } from '../../shared/extra-utils'
 import { uploadVideo } from '../../shared/extra-utils/'
-import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getServerCredentials } from './cli'
+import { assignToken, buildCommonVideoOptions, buildServer, buildVideoAttributesFromCommander, getServerCredentials } from './cli'
 
 let command = program
   .name('upload')
@@ -22,16 +21,18 @@ command
   .option('-f, --file <file>', 'Video absolute file path')
   .parse(process.argv)
 
+const options = command.opts()
+
 getServerCredentials(command)
   .then(({ url, username, password }) => {
-    if (!program['videoName'] || !program['file']) {
-      if (!program['videoName']) console.error('--video-name is required.')
-      if (!program['file']) console.error('--file is required.')
+    if (!options.videoName || !options.file) {
+      if (!options.videoName) console.error('--video-name is required.')
+      if (!options.file) console.error('--file is required.')
 
       process.exit(-1)
     }
 
-    if (isAbsolute(program['file']) === false) {
+    if (isAbsolute(options.file) === false) {
       console.error('File path should be absolute.')
       process.exit(-1)
     }
@@ -44,23 +45,24 @@ getServerCredentials(command)
   .catch(err => console.error(err))
 
 async function run (url: string, username: string, password: string) {
-  const accessToken = await getAccessToken(url, username, password)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
 
-  await access(program['file'], constants.F_OK)
+  await access(options.file, constants.F_OK)
 
-  console.log('Uploading %s video...', program['videoName'])
+  console.log('Uploading %s video...', options.videoName)
 
-  const videoAttributes = await buildVideoAttributesFromCommander(url, program)
+  const videoAttributes = await buildVideoAttributesFromCommander(server, program)
 
   Object.assign(videoAttributes, {
-    fixture: program['file'],
-    thumbnailfile: program['thumbnail'],
-    previewfile: program['preview']
+    fixture: options.file,
+    thumbnailfile: options.thumbnail,
+    previewfile: options.preview
   })
 
   try {
-    await uploadVideo(url, accessToken, videoAttributes)
-    console.log(`Video ${program['videoName']} uploaded.`)
+    await uploadVideo(url, server.accessToken, videoAttributes)
+    console.log(`Video ${options.videoName} uploaded.`)
     process.exit(0)
   } catch (err) {
     console.error(require('util').inspect(err))