X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fcli.ts;h=52e6ea593ef662811f828efa061275118a33559b;hb=e1ab52d7ec7370a6f9f5937192d6003206af1ac0;hp=58e2445ac47f0c40e9f1e4f2cafa1ff8c860ca26;hpb=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tools/cli.ts b/server/tools/cli.ts index 58e2445ac..52e6ea593 100644 --- a/server/tools/cli.ts +++ b/server/tools/cli.ts @@ -1,11 +1,11 @@ +import { Command } from 'commander' import { Netrc } from 'netrc-parser' -import { getAppNumber, isTestInstance } from '../helpers/core-utils' import { join } from 'path' -import { root } from '../../shared/extra-utils/miscs/miscs' -import { getVideoChannel } from '../../shared/extra-utils/videos/video-channels' -import { Command } from 'commander' -import { VideoChannel, VideoPrivacy } from '../../shared/models/videos' import { createLogger, format, transports } from 'winston' +import { PeerTubeServer } from '@shared/extra-utils' +import { UserRole } from '@shared/models' +import { VideoPrivacy } from '../../shared/models/videos' +import { getAppNumber, isTestInstance, root } from '../helpers/core-utils' let configName = 'PeerTube/CLI' if (isTestInstance()) configName += `-${getAppNumber()}` @@ -14,24 +14,34 @@ const config = require('application-config')(configName) const version = require('../../../package.json').version +async function getAdminTokenOrDie (server: PeerTubeServer, username: string, password: string) { + const token = await server.login.getAccessToken(username, password) + const me = await server.users.getMyInfo({ token }) + + if (me.role !== UserRole.ADMINISTRATOR) { + console.error('You must be an administrator.') + process.exit(-1) + } + + return token +} + interface Settings { - remotes: any[], + remotes: any[] default: number } -function getSettings () { - return new Promise((res, rej) => { - const defaultSettings = { - remotes: [], - default: -1 - } +async function getSettings (): Promise { + const defaultSettings = { + remotes: [], + default: -1 + } - config.read((err, data) => { - if (err) return rej(err) + const data = await config.read() - return res(Object.keys(data).length === 0 ? defaultSettings : data) - }) - }) + return Object.keys(data).length === 0 + ? defaultSettings + : data } async function getNetrc () { @@ -46,44 +56,34 @@ async function getNetrc () { return netrc } -function writeSettings (settings) { - return new Promise((res, rej) => { - config.write(settings, err => { - if (err) return rej(err) - - return res() - }) - }) +function writeSettings (settings: Settings) { + return config.write(settings) } function deleteSettings () { - return new Promise((res, rej) => { - config.trash((err) => { - if (err) return rej(err) - - return res() - }) - }) + return config.trash() } function getRemoteObjectOrDie ( - program: any, + program: Command, settings: Settings, netrc: Netrc ): { url: string, username: string, password: string } { - if (!program['url'] || !program['username'] || !program['password']) { + const options = program.opts() + + if (!options.url || !options.username || !options.password) { // No remote and we don't have program parameters: quit if (settings.remotes.length === 0 || Object.keys(netrc.machines).length === 0) { - if (!program[ 'url' ]) console.error('--url field is required.') - if (!program[ 'username' ]) console.error('--username field is required.') - if (!program[ 'password' ]) console.error('--password field is required.') + if (!options.url) console.error('--url field is required.') + if (!options.username) console.error('--username field is required.') + if (!options.password) console.error('--password field is required.') return process.exit(-1) } - let url: string = program['url'] - let username: string = program['username'] - let password: string = program['password'] + let url: string = options.url + let username: string = options.username + let password: string = options.password if (!url && settings.default !== -1) url = settings.remotes[settings.default] @@ -96,9 +96,9 @@ function getRemoteObjectOrDie ( } return { - url: program[ 'url' ], - username: program[ 'username' ], - password: program[ 'password' ] + url: options.url, + username: options.username, + password: options.password } } @@ -117,13 +117,16 @@ function buildCommonVideoOptions (command: Command) { .option('-d, --video-description ', 'Video description') .option('-P, --privacy ', 'Privacy') .option('-C, --channel-name ', 'Channel name') - .option('-m, --comments-enabled', 'Enable comments') + .option('--no-comments-enabled', 'Disable video comments') .option('-s, --support ', 'Video support text') - .option('-w, --wait-transcoding', 'Wait transcoding before publishing the video') + .option('--no-wait-transcoding', 'Do not wait transcoding before publishing the video') + .option('--no-download-enabled', 'Disable video download') .option('-v, --verbose ', 'Verbosity, from 0/\'error\' to 4/\'debug\'', 'info') } -async function buildVideoAttributesFromCommander (url: string, command: Command, defaultAttributes: any = {}) { +async function buildVideoAttributesFromCommander (server: PeerTubeServer, command: Command, defaultAttributes: any = {}) { + const options = command.opts() + const defaultBooleanAttributes = { nsfw: false, commentsEnabled: true, @@ -134,8 +137,8 @@ async function buildVideoAttributesFromCommander (url: string, command: Command, const booleanAttributes: { [id in keyof typeof defaultBooleanAttributes]: boolean } | {} = {} for (const key of Object.keys(defaultBooleanAttributes)) { - if (command[ key ] !== undefined) { - booleanAttributes[key] = command[ key ] + if (options[key] !== undefined) { + booleanAttributes[key] = options[key] } else if (defaultAttributes[key] !== undefined) { booleanAttributes[key] = defaultAttributes[key] } else { @@ -144,21 +147,20 @@ async function buildVideoAttributesFromCommander (url: string, command: Command, } const videoAttributes = { - name: command[ 'videoName' ] || defaultAttributes.name, - category: command[ 'category' ] || defaultAttributes.category || undefined, - licence: command[ 'licence' ] || defaultAttributes.licence || undefined, - language: command[ 'language' ] || defaultAttributes.language || undefined, - privacy: command[ 'privacy' ] || defaultAttributes.privacy || VideoPrivacy.PUBLIC, - support: command[ 'support' ] || defaultAttributes.support || undefined, - description: command[ 'videoDescription' ] || defaultAttributes.description || undefined, - tags: command[ 'tags' ] || defaultAttributes.tags || undefined + name: options.videoName || defaultAttributes.name, + category: options.category || defaultAttributes.category || undefined, + licence: options.licence || defaultAttributes.licence || undefined, + language: options.language || defaultAttributes.language || undefined, + privacy: options.privacy || defaultAttributes.privacy || VideoPrivacy.PUBLIC, + support: options.support || defaultAttributes.support || undefined, + description: options.videoDescription || defaultAttributes.description || undefined, + tags: options.tags || defaultAttributes.tags || undefined } Object.assign(videoAttributes, booleanAttributes) - if (command[ 'channelName' ]) { - const res = await getVideoChannel(url, command['channelName']) - const videoChannel: VideoChannel = res.body + if (options.channelName) { + const videoChannel = await server.channels.get({ channelName: options.channelName }) Object.assign(videoAttributes, { channelId: videoChannel.id }) @@ -170,11 +172,24 @@ async function buildVideoAttributesFromCommander (url: string, command: Command, return videoAttributes } -function getServerCredentials (program: any) { +function getServerCredentials (program: Command) { return Promise.all([ getSettings(), getNetrc() ]) - .then(([ settings, netrc ]) => { - return getRemoteObjectOrDie(program, settings, netrc) - }) + .then(([ settings, netrc ]) => { + return getRemoteObjectOrDie(program, settings, netrc) + }) +} + +function buildServer (url: string) { + return new PeerTubeServer({ url }) +} + +async function assignToken (server: PeerTubeServer, username: string, password: string) { + const bodyClient = await server.login.getClient() + const client = { id: bodyClient.client_id, secret: bodyClient.client_secret } + + const body = await server.login.login({ client, user: { username, password } }) + + server.accessToken = body.access_token } function getLogger (logLevel = 'info') { @@ -211,7 +226,6 @@ function getLogger (logLevel = 'info') { export { version, - config, getLogger, getSettings, getNetrc, @@ -222,5 +236,9 @@ export { getServerCredentials, buildCommonVideoOptions, - buildVideoAttributesFromCommander + buildVideoAttributesFromCommander, + + getAdminTokenOrDie, + buildServer, + assignToken }