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, buildServer, buildVideoAttributesFromCommander, getServerCredentials } from './cli'
+import { assignToken, buildCommonVideoOptions, buildServer, buildVideoAttributesFromCommander, getServerCredentials } from './cli'
let command = program
.name('upload')
.catch(err => console.error(err))
async function run (url: string, username: string, password: string) {
- const token = await getAccessToken(url, username, password)
- const server = buildServer(url, token)
+ const server = buildServer(url)
+ await assignToken(server, username, password)
await access(options.file, constants.F_OK)
console.log('Uploading %s video...', options.videoName)
- const videoAttributes = await buildVideoAttributesFromCommander(server, program)
+ const baseAttributes = await buildVideoAttributesFromCommander(server, program)
+
+ const attributes = {
+ ...baseAttributes,
- Object.assign(videoAttributes, {
fixture: options.file,
thumbnailfile: options.thumbnail,
previewfile: options.preview
- })
+ }
try {
- await uploadVideo(url, token, videoAttributes)
+ await server.videos.upload({ attributes })
console.log(`Video ${options.videoName} uploaded.`)
process.exit(0)
} catch (err) {