X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-upload.ts;h=01fb1fe8d5e3e76151f91ed62426d94a029d0eb6;hb=b65de1be4dcf626c552be613d531d3f6e23c6085;hp=8de952e7b377488d4a4dd3104acbd437ec0aba9d;hpb=a3b7421abb4192e215aa280418b62e96958c5e42;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 8de952e7b..01fb1fe8d 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,12 +1,10 @@
 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 +20,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 +44,26 @@ 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 baseAttributes = await buildVideoAttributesFromCommander(server, program)
 
-  Object.assign(videoAttributes, {
-    fixture: program['file'],
-    thumbnailfile: program['thumbnail'],
-    previewfile: program['preview']
-  })
+  const attributes = {
+    ...baseAttributes,
+
+    fixture: options.file,
+    thumbnailfile: options.thumbnail,
+    previewfile: options.preview
+  }
 
   try {
-    await uploadVideo(url, accessToken, videoAttributes)
-    console.log(`Video ${program['videoName']} uploaded.`)
+    await server.videos.upload({ attributes })
+    console.log(`Video ${options.videoName} uploaded.`)
     process.exit(0)
   } catch (err) {
     console.error(require('util').inspect(err))