-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 { getNetrc, 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)
-Promise.all([ getSettings(), getNetrc() ])
- .then(([ settings, netrc ]) => {
- const { url, username, password } = getRemoteObjectOrDie(program, settings, netrc)
+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)
- }
+ process.exit(-1)
+ }
- if (isAbsolute(program[ 'file' ]) === false) {
- console.error('File path should be absolute.')
- process.exit(-1)
- }
+ if (isAbsolute(options.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)
+ })
+ })
+ .catch(err => console.error(err))
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 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)
+
+ const baseAttributes = await buildVideoAttributesFromCommander(server, program)
+
+ const attributes = {
+ ...baseAttributes,
- 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,
- fixture: program[ 'file' ],
- thumbnailfile: program[ 'thumbnail' ],
- previewfile: program[ 'preview' ],
- waitTranscoding: true,
- privacy: program[ 'privacy' ] || VideoPrivacy.PUBLIC,
- support: undefined
+ fixture: options.file,
+ thumbnailfile: options.thumbnail,
+ previewfile: options.preview
}
try {
- await uploadVideo(url, accessToken, videoAttributes)
- console.log(`Video ${program[ 'videoName' ]} uploaded.`)
+ await server.videos.upload({ attributes })
+ console.log(`Video ${options.videoName} uploaded.`)
process.exit(0)
} catch (err) {
console.error(require('util').inspect(err))
}
// ----------------------------------------------------------------------------
-
-function list (val) {
- return val.split(',')
-}