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

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 1f871e660..4569cbb85 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,127 +1,67 @@
 import * as program from 'commander'
 import { access, constants } from 'fs-extra'
 import { isAbsolute } from 'path'
-import { getClient, login } from '../tests/utils'
-import { uploadVideo } from '../tests/utils/index'
-import { VideoPrivacy } from '../../shared/models/videos'
-import { netrc, getSettings } from './cli'
+import { getAccessToken } from '../../shared/extra-utils'
+import { uploadVideo } from '../../shared/extra-utils/'
+import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getServerCredentials } 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('-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)
 
-if (!program['tags']) program['tags'] = []
-if (!program['nsfw']) program['nsfw'] = false
-if (!program['privacy']) program['privacy'] = VideoPrivacy.PUBLIC
-if (!program['commentsEnabled']) program['commentsEnabled'] = false
+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.')
 
-getSettings()
-  .then(settings => {
-    if (
-      (!program['url'] ||
-      !program['username'] ||
-      !program['password']) &&
-      (settings.remotes.length === 0)
-    ) {
-      if (!program['url']) console.error('--url field is required.')
-      if (!program['username']) console.error('--username field is required.')
-      if (!program['password']) console.error('--password field is required.')
-      if (!program['videoName']) console.error('--video-name field is required.')
-      if (!program['file']) console.error('--file field is required.')
       process.exit(-1)
     }
 
-    if (
-      (!program['url'] ||
-      !program['username'] ||
-      !program['password']) &&
-      (settings.remotes.length > 0)
-    ) {
-      if (!program['url']) {
-        program['url'] = (settings.default !== -1) ?
-          settings.remotes[settings.default] :
-          settings.remotes[0]
-      }
-      if (!program['username']) program['username'] = netrc.machines[program['url']].login
-      if (!program['password']) program['password'] = netrc.machines[program['url']].password
-    }
-
-    if (
-      !program['videoName'] ||
-      !program['file']
-    ) {
-      if (!program['videoName']) console.error('--video-name field is required.')
-      if (!program['file']) console.error('--file field is required.')
-      process.exit(-1)
-    }
-
-    if (isAbsolute(program['file']) === false) {
+    if (isAbsolute(program[ 'file' ]) === false) {
       console.error('File path should be absolute.')
       process.exit(-1)
     }
 
-    run().catch(err => console.error(err))
+    run(url, username, password).catch(err => {
+      console.error(err)
+      process.exit(-1)
+    })
   })
 
-async function run () {
-  const res = await getClient(program[ 'url' ])
-  const client = {
-    id: res.body.client_id,
-    secret: res.body.client_secret
-  }
-
-  const user = {
-    username: program[ 'username' ],
-    password: program[ 'password' ]
-  }
-
-  const res2 = await login(program[ 'url' ], client, user)
-  const accessToken = res2.body.access_token
+async function run (url: string, username: string, password: string) {
+  const accessToken = await getAccessToken(url, username, password)
 
   await access(program[ 'file' ], constants.F_OK)
 
   console.log('Uploading %s video...', program[ 'videoName' ])
 
-  const videoAttributes = {
-    name: program['videoName'],
-    category: program['category'],
-    licence: program['licence'],
-    language: program['language'],
-    nsfw: program['nsfw'],
-    description: program['videoDescription'],
-    tags: program['tags'],
-    commentsEnabled: program['commentsEnabled'],
-    fixture: program['file'],
-    thumbnailfile: program['thumbnail'],
-    previewfile: program['preview'],
-    waitTranscoding: true,
-    privacy: program['privacy'],
-    support: undefined
-  }
+  const videoAttributes = await buildVideoAttributesFromCommander(url, program)
 
-  await uploadVideo(program['url'], accessToken, videoAttributes)
+  Object.assign(videoAttributes, {
+    fixture: program[ 'file' ],
+    thumbnailfile: program[ 'thumbnail' ],
+    previewfile: program[ 'preview' ]
+  })
 
-  console.log(`Video ${program['videoName']} uploaded.`)
-  process.exit(0)
+  try {
+    await uploadVideo(url, accessToken, videoAttributes)
+    console.log(`Video ${program[ 'videoName' ]} uploaded.`)
+    process.exit(0)
+  } catch (err) {
+    console.error(require('util').inspect(err))
+    process.exit(-1)
+  }
 }
 
 // ----------------------------------------------------------------------------
-
-function list (val) {
-  return val.split(',')
-}