From a87d467ad76505312fe63c597ee03a66126d0492 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 12 Feb 2018 12:48:58 +0100 Subject: [PATCH] Fix upload from CLI script --- server/tests/utils/videos/videos.ts | 4 +- server/tools/import-youtube.ts | 3 +- server/tools/upload-directory.ts | 82 ---------------------- server/tools/upload.ts | 103 ++++++++++++++-------------- 4 files changed, 58 insertions(+), 134 deletions(-) delete mode 100644 server/tools/upload-directory.ts diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 923ca48f1..9105b5f13 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -251,10 +251,12 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg .field('name', attributes.name) .field('nsfw', JSON.stringify(attributes.nsfw)) .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) - .field('description', attributes.description) .field('privacy', attributes.privacy.toString()) .field('channelId', attributes.channelId) + if (attributes.description !== undefined) { + req.field('description', attributes.description) + } if (attributes.language !== undefined) { req.field('language', attributes.language.toString()) } diff --git a/server/tools/import-youtube.ts b/server/tools/import-youtube.ts index d57798d5b..96bce29b5 100644 --- a/server/tools/import-youtube.ts +++ b/server/tools/import-youtube.ts @@ -20,7 +20,8 @@ if ( !program['password'] || !program['youtubeUrl'] ) { - throw new Error('All arguments are required.') + console.error('All arguments are required.') + process.exit(-1) } run().catch(err => console.error(err)) diff --git a/server/tools/upload-directory.ts b/server/tools/upload-directory.ts deleted file mode 100644 index c0094f852..000000000 --- a/server/tools/upload-directory.ts +++ /dev/null @@ -1,82 +0,0 @@ -import * as program from 'commander' -import * as Promise from 'bluebird' -import { isAbsolute, join } from 'path' - -import { readdirPromise } from '../helpers/core-utils' -import { execCLI } from '../tests/utils/index' - -program - .option('-u, --url ', 'Server url') - .option('-U, --username ', 'Username') - .option('-p, --password ', 'Password') - .option('-i, --input ', 'Videos directory absolute path') - .option('-d, --description ', 'Video descriptions') - .option('-c, --category ', 'Video categories') - .option('-l, --licence ', 'Video licences') - .option('-t, --tags ', 'Video tags', list) - .parse(process.argv) - -if ( - !program['url'] || - !program['username'] || - !program['password'] || - !program['input'] || - !program['description'] || - !program['category'] || - !program['licence'] || - !program['tags'] -) { - throw new Error('All arguments are required.') -} - -if (isAbsolute(program['input']) === false) { - throw new Error('Input path should be absolute.') -} - -let command = `npm run ts-node -- ${__dirname}/get-access-token.ts` -command += ` -u "${program['url']}"` -command += ` -n "${program['username']}"` -command += ` -p "${program['password']}"` - -execCLI(command) - .then(stdout => { - const accessToken = stdout.replace('\n', '') - - console.log(accessToken) - - return readdirPromise(program['input']).then(files => ({ accessToken, files })) - }) - .then(({ accessToken, files }) => { - return Promise.each(files, file => { - const video = { - tags: program['tags'], - name: file, - description: program['description'], - category: program['category'], - licence: program['licence'] - } - - let command = `npm run ts-node -- ${__dirname}/upload.ts` - command += ` -u "${program['url']}"` - command += ` -a "${accessToken}"` - command += ` -n "${video.name}"` - command += ` -d "${video.description}"` - command += ` -c "${video.category}"` - command += ` -l "${video.licence}"` - command += ` -t "${video.tags.join(',')}"` - command += ` -f "${join(program['input'], file)}"` - - return execCLI(command).then(stdout => console.log(stdout)) - }) - }) - .then(() => process.exit(0)) - .catch(err => { - console.error(err) - process.exit(-1) - }) - -// ---------------------------------------------------------------------------- - -function list (val) { - return val.split(',') -} diff --git a/server/tools/upload.ts b/server/tools/upload.ts index db59bbdff..3bf9dd65e 100644 --- a/server/tools/upload.ts +++ b/server/tools/upload.ts @@ -2,84 +2,87 @@ import * as program from 'commander' import { access, constants } from 'fs' import { isAbsolute } from 'path' import { promisify } from 'util' +import { getClient, login } from '../tests/utils' +import { uploadVideo } from '../tests/utils/index' const accessPromise = promisify(access) -import { uploadVideo } from '../tests/utils/index' - program .option('-u, --url ', 'Server url') - .option('-a, --access-token ', 'Access token') - .option('-n, --name ', 'Video name') + .option('-U, --username ', 'Username') + .option('-p, --password ', 'Password') + .option('-n, --video-name ', 'Video name') .option('-N, --nsfw', 'Video is Not Safe For Work') .option('-c, --category ', 'Category number') + .option('-m, --comments-enabled', 'Enable comments') .option('-l, --licence ', 'Licence number') .option('-L, --language ', 'Language number') - .option('-d, --description ', 'Video description') + .option('-d, --video-description ', 'Video description') .option('-t, --tags ', 'Video tags', list) .option('-f, --file ', 'Video absolute file path') .parse(process.argv) if (!program['tags']) program['tags'] = [] if (!program['nsfw']) program['nsfw'] = false +if (!program['commentsEnabled']) program['commentsEnabled'] = false if ( !program['url'] || - !program['accessToken'] || - !program['name'] || - !program['category'] || - !program['licence'] || - !program['description'] || + !program['username'] || + !program['password'] || + !program['videoName'] || !program['file'] ) { - throw new Error('All arguments but tags, language and nsfw are required.') + console.error('Url, username, password, name and input file are required.') + process.exit(-1) } if (isAbsolute(program['file']) === false) { - throw new Error('File path should be absolute.') + console.error('File path should be absolute.') + process.exit(-1) } -accessPromise(program['file'], constants.F_OK) - .then(() => { - return upload( - program['url'], - program['accessToken'], - program['name'], - program['category'], - program['licence'], - program['language'], - program['nsfw'], - program['description'], - program['tags'], - program['file'] - ) - }) - .then(() => process.exit(0)) - .catch(err => { - console.error(err) - process.exit(-1) - }) +run().catch(err => console.error(err)) + +async function run () { + const res = await getClient(program[ 'url' ]) + const client = { + id: res.body.client_id, + secret: res.body.client_secret + } + + const user = { + username: program[ 'username' ], + password: program[ 'password' ] + } + + const res2 = await login(program[ 'url' ], client, user) + const accessToken = res2.body.access_token + + await accessPromise(program[ 'file' ], constants.F_OK) + + console.log('Uploading %s video...', program[ 'videoName' ]) + + const videoAttributes = { + name: program['videoName'], + category: program['category'], + licence: program['licence'], + language: program['language'], + nsfw: program['nsfw'], + description: program['videoDescription'], + tags: program['tags'], + commentsEnabled: program['commentsEnabled'], + fixture: program['file'] + } + + await uploadVideo(program['url'], accessToken, videoAttributes) + + console.log(`Video ${program['videoName']} uploaded.`) + process.exit(0) +} // ---------------------------------------------------------------------------- function list (val) { return val.split(',') } - -function upload (url, accessToken, name, category, licence, language, nsfw, description, tags, fixture) { - console.log('Uploading %s video...', program['name']) - - const videoAttributes = { - name, - category, - licence, - language, - nsfw, - description, - tags, - fixture - } - return uploadVideo(url, accessToken, videoAttributes).then(() => { - console.log(`Video ${name} uploaded.`) - }) -}