1 files changed, 36 insertions, 55 deletions

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 687f2e60b..c00205e8f 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -3,54 +3,47 @@ import { access, constants } from 'fs-extra'
 import { isAbsolute } from 'path'
 import { getClient, login } from '../../shared/extra-utils'
 import { uploadVideo } from '../../shared/extra-utils/'
-import { VideoPrivacy } from '../../shared/models/videos'
-import { getRemoteObjectOrDie, getSettings } from './cli'
+import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getNetrc, getRemoteObjectOrDie, getSettings } from './cli'
 
-program
+let command = program
   .name('upload')
+
+command = buildCommonVideoOptions(command)
+
+command
+
   .option('-u, --url <url>', 'Server url')
   .option('-U, --username <username>', 'Username')
   .option('-p, --password <token>', 'Password')
-  .option('-n, --video-name <name>', 'Video name')
-  .option('-P, --privacy <privacy_number>', 'Privacy')
-  .option('-N, --nsfw', 'Video is Not Safe For Work')
-  .option('-c, --category <category_number>', 'Category number')
-  .option('-C, --channel-id <channel_id>', 'Channel ID')
-  .option('-m, --comments-enabled', 'Enable comments')
-  .option('-l, --licence <licence_number>', 'Licence number')
-  .option('-L, --language <language_code>', 'Language ISO 639 code (fr or en...)')
-  .option('-d, --video-description <description>', 'Video description')
-  .option('-t, --tags <tags>', 'Video tags', list)
   .option('-b, --thumbnail <thumbnailPath>', 'Thumbnail path')
   .option('-v, --preview <previewPath>', 'Preview path')
   .option('-f, --file <file>', 'Video absolute file path')
   .parse(process.argv)
 
-getSettings()
-  .then(settings => {
-    const { url, username, password } = getRemoteObjectOrDie(program, settings)
+Promise.all([ getSettings(), getNetrc() ])
+       .then(([ settings, netrc ]) => {
+         const { url, username, password } = getRemoteObjectOrDie(program, settings, netrc)
 
-    if (!program['videoName'] || !program['file'] || !program['channelId']) {
-      if (!program['videoName']) console.error('--video-name is required.')
-      if (!program['file']) console.error('--file is required.')
-      if (!program['channelId']) console.error('--channel-id is required.')
+         if (!program[ 'videoName' ] || !program[ 'file' ]) {
+           if (!program[ 'videoName' ]) console.error('--video-name is required.')
+           if (!program[ '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(program[ '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)
+         })
+       })
 
 async function run (url: string, username: string, password: string) {
-  const resClient = await getClient(program[ 'url' ])
+  const resClient = await getClient(url)
   const client = {
     id: resClient.body.client_id,
     secret: resClient.body.client_secret
@@ -70,38 +63,26 @@ async function run (url: string, username: string, password: string) {
 
   console.log('Uploading %s video...', program[ 'videoName' ])
 
-  const videoAttributes = {
-    name: program['videoName'],
-    category: program['category'] || undefined,
-    channelId: program['channelId'],
-    licence: program['licence'] || undefined,
-    language: program['language'] || undefined,
-    nsfw: program['nsfw'] !== undefined ? program['nsfw'] : false,
-    description: program['videoDescription'] || '',
-    tags: program['tags'] || [],
-    commentsEnabled: program['commentsEnabled'] !== undefined ? program['commentsEnabled'] : true,
-    downloadEnabled: program['downloadEnabled'] !== undefined ? program['downloadEnabled'] : true,
-    fixture: program['file'],
-    thumbnailfile: program['thumbnail'],
-    previewfile: program['preview'],
-    waitTranscoding: true,
-    privacy: program['privacy'] || VideoPrivacy.PUBLIC,
-    support: undefined
+  const defaultAttributes = {
+    tags: command[ 'tags' ],
+    description: command[ 'videoDescription' ]
   }
+  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.`)
+    console.log(`Video ${program[ 'videoName' ]} uploaded.`)
     process.exit(0)
   } catch (err) {
-    console.log('coucou')
     console.error(require('util').inspect(err))
     process.exit(-1)
   }
 }
 
 // ----------------------------------------------------------------------------
-
-function list (val) {
-  return val.split(',')
-}