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

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index c00205e8f..01fb1fe8d 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,9 +1,10 @@
-import * as program from 'commander'
+import { registerTSPaths } from '../helpers/register-ts-paths'
+registerTSPaths()
+
+import { program } from 'commander'
 import { access, constants } from 'fs-extra'
 import { isAbsolute } from 'path'
-import { getClient, login } from '../../shared/extra-utils'
-import { uploadVideo } from '../../shared/extra-utils/'
-import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getNetrc, getRemoteObjectOrDie, getSettings } from './cli'
+import { assignToken, buildCommonVideoOptions, buildServer, buildVideoAttributesFromCommander, getServerCredentials } from './cli'
 
 let command = program
   .name('upload')
@@ -11,7 +12,6 @@ let command = program
 command = buildCommonVideoOptions(command)
 
 command
-
   .option('-u, --url <url>', 'Server url')
   .option('-U, --username <username>', 'Username')
   .option('-p, --password <token>', 'Password')
@@ -20,64 +20,50 @@ command
   .option('-f, --file <file>', 'Video absolute file path')
   .parse(process.argv)
 
-Promise.all([ getSettings(), getNetrc() ])
-       .then(([ settings, netrc ]) => {
-         const { url, username, password } = getRemoteObjectOrDie(program, settings, netrc)
+const options = command.opts()
 
-         if (!program[ 'videoName' ] || !program[ 'file' ]) {
-           if (!program[ 'videoName' ]) console.error('--video-name is required.')
-           if (!program[ 'file' ]) console.error('--file is required.')
+getServerCredentials(command)
+  .then(({ url, username, password }) => {
+    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)
-         }
+      process.exit(-1)
+    }
 
-         if (isAbsolute(program[ 'file' ]) === false) {
-           console.error('File path should be absolute.')
-           process.exit(-1)
-         }
+    if (isAbsolute(options.file) === false) {
+      console.error('File path should be absolute.')
+      process.exit(-1)
+    }
 
-         run(url, username, password).catch(err => {
-           console.error(err)
-           process.exit(-1)
-         })
-       })
+    run(url, username, password).catch(err => {
+      console.error(err)
+      process.exit(-1)
+    })
+  })
+  .catch(err => console.error(err))
 
 async function run (url: string, username: string, password: string) {
-  const resClient = await getClient(url)
-  const client = {
-    id: resClient.body.client_id,
-    secret: resClient.body.client_secret
-  }
+  const server = buildServer(url)
+  await assignToken(server, username, password)
 
-  const user = { username, password }
+  await access(options.file, constants.F_OK)
 
-  let accessToken: string
-  try {
-    const res = await login(url, client, user)
-    accessToken = res.body.access_token
-  } catch (err) {
-    throw new Error('Cannot authenticate. Please check your username/password.')
-  }
+  console.log('Uploading %s video...', options.videoName)
 
-  await access(program[ 'file' ], constants.F_OK)
+  const baseAttributes = await buildVideoAttributesFromCommander(server, program)
 
-  console.log('Uploading %s video...', program[ 'videoName' ])
+  const attributes = {
+    ...baseAttributes,
 
-  const defaultAttributes = {
-    tags: command[ 'tags' ],
-    description: command[ 'videoDescription' ]
+    fixture: options.file,
+    thumbnailfile: options.thumbnail,
+    previewfile: options.preview
   }
-  const videoAttributes = await buildVideoAttributesFromCommander(url, program, defaultAttributes)
-
-  Object.assign(videoAttributes, {
-    fixture: program[ 'file' ],
-    thumbnailfile: program[ 'thumbnail' ],
-    previewfile: program[ '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))