+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 { 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()}`
const version = require('../../../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) {
console.error('You must be an administrator.')
process.exit(-1)
}
- return accessToken
+ return token
}
interface Settings {
- remotes: any[],
+ remotes: any[]
default: number
}
-function getSettings () {
- return new Promise<Settings>((res, rej) => {
- const defaultSettings = {
- remotes: [],
- default: -1
- }
+async function getSettings (): Promise<Settings> {
+ 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 () {
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]
}
return {
- url: program[ 'url' ],
- username: program[ 'username' ],
- password: program[ 'password' ]
+ url: options.url,
+ username: options.username,
+ password: options.password
}
}
.option('-d, --video-description <description>', 'Video description')
.option('-P, --privacy <privacy_number>', 'Privacy')
.option('-C, --channel-name <channel_name>', 'Channel name')
- .option('-m, --comments-enabled', 'Enable comments')
+ .option('--no-comments-enabled', 'Disable video comments')
.option('-s, --support <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 <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,
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 {
}
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 })
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') {
export {
version,
- config,
getLogger,
getSettings,
getNetrc,
buildCommonVideoOptions,
buildVideoAttributesFromCommander,
- getAdminTokenOrDie
+ getAdminTokenOrDie,
+ buildServer,
+ assignToken
}
projects / github / Chocobozzz / PeerTube.git / blobdiff