X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-upload.ts;h=c94b0585729b8a643a6c8cc718984d0f024c0d85;hb=d0a0fa429d4651710ed951a3c11af0219e408964;hp=687f2e60b9f319bcd6c4b2020ed0871c6c6adbc8;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 687f2e60b..c94b05857 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,44 +1,38 @@
-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 { VideoPrivacy } from '../../shared/models/videos'
-import { getRemoteObjectOrDie, getSettings } from './cli'
+import { assignToken, buildCommonVideoOptions, buildServer, 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('-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)
+const options = command.opts()
 
-    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.')
+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)
     }
 
-    if (isAbsolute(program['file']) === false) {
+    if (isAbsolute(options.file) === false) {
       console.error('File path should be absolute.')
       process.exit(-1)
     }
@@ -48,60 +42,32 @@ getSettings()
       process.exit(-1)
     })
   })
+  .catch(err => console.error(err))
 
 async function run (url: string, username: string, password: string) {
-  const resClient = await getClient(program[ '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)
-
-  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 videoAttributes = await buildVideoAttributesFromCommander(server, program)
+
+  Object.assign(videoAttributes, {
+    fixture: options.file,
+    thumbnailfile: options.thumbnail,
+    previewfile: options.preview
+  })
 
   try {
-    await uploadVideo(url, accessToken, videoAttributes)
-    console.log(`Video ${program['videoName']} uploaded.`)
+    await uploadVideo(url, server.accessToken, videoAttributes)
+    console.log(`Video ${options.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(',')
-}