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

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 1da52da31..4569cbb85 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,93 +1,58 @@
 import * as program from 'commander'
 import { access, constants } from 'fs-extra'
 import { isAbsolute } from 'path'
-import { getClient, login } from '../../shared/extra-utils'
+import { getAccessToken } from '../../shared/extra-utils'
 import { uploadVideo } from '../../shared/extra-utils/'
-import { VideoPrivacy } from '../../shared/models/videos'
-import { getNetrc, getRemoteObjectOrDie, getSettings } from './cli'
+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('-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)
 
-Promise.all([ getSettings(), getNetrc() ])
-       .then(([ settings, netrc ]) => {
-         const { url, username, password } = getRemoteObjectOrDie(program, settings, netrc)
+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 (!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.')
+      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(url)
-  const client = {
-    id: resClient.body.client_id,
-    secret: resClient.body.client_secret
-  }
-
-  const user = { username, password }
-
-  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.')
-  }
+  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' ] || undefined,
-    channelId: program[ 'channelId' ],
-    licence: program[ 'licence' ] || undefined,
-    language: program[ 'language' ] || undefined,
-    nsfw: program[ 'nsfw' ] !== undefined ? program[ 'nsfw' ] : false,
-    description: program[ 'videoDescription' ] || undefined,
-    tags: program[ 'tags' ] || [],
-    commentsEnabled: program[ 'commentsEnabled' ] !== undefined ? program[ 'commentsEnabled' ] : true,
-    downloadEnabled: program[ 'downloadEnabled' ] !== undefined ? program[ 'downloadEnabled' ] : true,
+  const videoAttributes = await buildVideoAttributesFromCommander(url, program)
+
+  Object.assign(videoAttributes, {
     fixture: program[ 'file' ],
     thumbnailfile: program[ 'thumbnail' ],
-    previewfile: program[ 'preview' ],
-    waitTranscoding: true,
-    privacy: program[ 'privacy' ] || VideoPrivacy.PUBLIC,
-    support: undefined
-  }
+    previewfile: program[ 'preview' ]
+  })
 
   try {
     await uploadVideo(url, accessToken, videoAttributes)
@@ -100,7 +65,3 @@ async function run (url: string, username: string, password: string) {
 }
 
 // ----------------------------------------------------------------------------
-
-function list (val) {
-  return val.split(',')
-}