-import * as program from 'commander'
+import { program } from 'commander'
import { access, constants } from 'fs-extra'
import { isAbsolute } from 'path'
-import { getAccessToken } from '../../shared/extra-utils'
-import { uploadVideo } from '../../shared/extra-utils/'
-import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getServerCredentials } from './cli'
+import { assignToken, buildCommonVideoOptions, buildServer, buildVideoAttributesFromCommander, getServerCredentials } from './shared'
let command = program
.name('upload')
.option('-f, --file <file>', 'Video absolute file path')
.parse(process.argv)
+const options = command.opts()
+
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 (!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)
}
process.exit(-1)
})
})
+ .catch(err => console.error(err))
async function run (url: string, username: string, password: string) {
- const accessToken = await getAccessToken(url, username, password)
+ const server = buildServer(url)
+ await assignToken(server, username, password)
- await access(program[ 'file' ], constants.F_OK)
+ await access(options.file, constants.F_OK)
- console.log('Uploading %s video...', program[ 'videoName' ])
+ console.log('Uploading %s video...', options.videoName)
- const videoAttributes = await buildVideoAttributesFromCommander(url, program)
+ const baseAttributes = await buildVideoAttributesFromCommander(server, program)
- Object.assign(videoAttributes, {
- fixture: program[ 'file' ],
- thumbnailfile: program[ 'thumbnail' ],
- previewfile: program[ 'preview' ]
- })
+ const attributes = {
+ ...baseAttributes,
+
+ 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))
+ const message = err.message || ''
+ if (message.includes('413')) {
+ console.error('Aborted: user quota is exceeded or video file is too big for this PeerTube instance.')
+ } else {
+ console.error(require('util').inspect(err))
+ }
+
process.exit(-1)
}
}