import { Netrc } from 'netrc-parser'
import { join } from 'path'
import { createLogger, format, transports } from 'winston'
-import { assignCommands, ServerInfo } from '@shared/extra-utils'
+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'
const version = require('../../../package.json').version
-async function getAdminTokenOrDie (server: ServerInfo, username: string, password: string) {
- const token = await server.loginCommand.getAccessToken(username, password)
- const me = await server.usersCommand.getMyInfo({ token })
+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.')
.option('-v, --verbose <verbose>', 'Verbosity, from 0/\'error\' to 4/\'debug\'', 'info')
}
-async function buildVideoAttributesFromCommander (server: ServerInfo, command: Command, defaultAttributes: any = {}) {
+async function buildVideoAttributesFromCommander (server: PeerTubeServer, command: Command, defaultAttributes: any = {}) {
const options = command.opts()
const defaultBooleanAttributes = {
Object.assign(videoAttributes, booleanAttributes)
if (options.channelName) {
- const videoChannel = await server.channelsCommand.get({ channelName: options.channelName })
+ const videoChannel = await server.channels.get({ channelName: options.channelName })
Object.assign(videoAttributes, { channelId: videoChannel.id })
})
}
-function buildServer (url: string): ServerInfo {
- const server = { url, internalServerNumber: undefined }
- assignCommands(server)
-
- return server
+function buildServer (url: string) {
+ return new PeerTubeServer({ url })
}
-async function assignToken (server: ServerInfo, username: string, password: string) {
- const bodyClient = await server.loginCommand.getClient()
+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.loginCommand.login({ client, user: { username, password } })
+ const body = await server.login.login({ client, user: { username, password } })
server.accessToken = body.access_token
}