X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fcli.ts;h=4607d052a9a19051fe0b9c009a0a85aa08f4bdb8;hb=bd09dfaf8dcb0ca4cd5dac9f13e3117486f3bcce;hp=d1a631b69efbde489f49722689eb7e340f6d65fa;hpb=4c1def5fd8e9f483238eb38e221f555e2e6bbf07;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tools/cli.ts b/server/tools/cli.ts index d1a631b69..4607d052a 100644 --- a/server/tools/cli.ts +++ b/server/tools/cli.ts @@ -1,33 +1,31 @@ +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 { getMyUserInformation } from '@shared/extra-utils/users/users' -import { User, UserRole } from '@shared/models' -import { getAccessToken } from '@shared/extra-utils/users/login' +import { loadLanguages } from '@server/initializers/constants' +import { root } from '@shared/core-utils' +import { UserRole } from '@shared/models' +import { PeerTubeServer } from '@shared/server-commands' +import { VideoPrivacy } from '../../shared/models/videos' +import { getAppNumber, isTestInstance } from '../helpers/core-utils' let configName = 'PeerTube/CLI' if (isTestInstance()) configName += `-${getAppNumber()}` const config = require('application-config')(configName) -const version = require('../../../package.json').version +const version = require(join(root(), 'package.json')).version -async function getAdminTokenOrDie (url: string, username: string, password: string) { - const accessToken = await getAccessToken(url, username, password) - const resMe = await getMyUserInformation(url, accessToken) - const me: User = resMe.body +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) { + if (me.role.id !== UserRole.ADMINISTRATOR) { console.error('You must be an administrator.') process.exit(-1) } - return accessToken + return token } interface Settings { @@ -35,19 +33,17 @@ interface Settings { 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 () { @@ -62,60 +58,66 @@ 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']) { - // 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.') - - return process.exit(-1) - } + const options = program.opts() - let url: string = program['url'] - let username: string = program['username'] - let password: string = program['password'] + function exitIfNoOptions (optionNames: string[], errorPrefix: string = '') { + let exit = false + + for (const key of optionNames) { + if (!options[key]) { + if (exit === false && errorPrefix) console.error(errorPrefix) + + console.error(`--${key} field is required`) + exit = true + } + } - if (!url && settings.default !== -1) url = settings.remotes[settings.default] + if (exit) process.exit(-1) + } - const machine = netrc.machines[url] + // If username or password are specified, both are mandatory + if (options.username || options.password) { + exitIfNoOptions([ 'username', 'password' ]) + } - if (!username && machine) username = machine.login - if (!password && machine) password = machine.password + // If no available machines, url, username and password args are mandatory + if (Object.keys(netrc.machines).length === 0) { + exitIfNoOptions([ 'url', 'username', 'password' ], 'No account found in netrc') + } - return { url, username, password } + if (settings.remotes.length === 0 || settings.default === -1) { + exitIfNoOptions([ 'url' ], 'No default instance found') } - return { - url: program['url'], - username: program['username'], - password: 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] + + const machine = netrc.machines[url] + if ((!username || !password) && !machine) { + console.error('Cannot find existing configuration for %s.', url) + process.exit(-1) } + + if (!username && machine) username = machine.login + if (!password && machine) password = machine.password + + return { url, username, password } } function buildCommonVideoOptions (command: Command) { @@ -133,13 +135,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, @@ -150,8 +155,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 { @@ -160,21 +165,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 }) @@ -186,13 +190,27 @@ 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) }) } +function buildServer (url: string) { + loadLanguages() + 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') { const logLevels = { 0: 0, @@ -227,7 +245,6 @@ function getLogger (logLevel = 'info') { export { version, - config, getLogger, getSettings, getNetrc, @@ -240,5 +257,7 @@ export { buildCommonVideoOptions, buildVideoAttributesFromCommander, - getAdminTokenOrDie + getAdminTokenOrDie, + buildServer, + assignToken }