X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-upload.ts;h=02edbd809296e3ec7d4d875e3957b573af22eefc;hb=12152aa09ff47dc5c5a627c27030855e254e58ad;hp=4569cbb85b31dd89802d1d36304bb29403f521a8;hpb=6f530096cbceda09377c2e8e235cf02c36226989;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 4569cbb85..02edbd809 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,4 +1,7 @@
-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 { getAccessToken } from '../../shared/extra-utils'
@@ -19,16 +22,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)
     }
@@ -38,25 +43,26 @@ getServerCredentials(command)
       process.exit(-1)
     })
   })
+  .catch(err => console.error(err))
 
 async function run (url: string, username: string, password: string) {
   const accessToken = await getAccessToken(url, 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)
 
   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.`)
+    console.log(`Video ${options.videoName} uploaded.`)
     process.exit(0)
   } catch (err) {
     console.error(require('util').inspect(err))