From 078f17e6d90376050f43ce639e88e11869b49ee7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 9 Jul 2021 15:03:44 +0200 Subject: Fix CLI tools --- server/tools/peertube-plugins.ts | 49 ++++++++++++---------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) (limited to 'server/tools/peertube-plugins.ts') diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts index 54ea1264d..63541bf2c 100644 --- a/server/tools/peertube-plugins.ts +++ b/server/tools/peertube-plugins.ts @@ -4,9 +4,8 @@ import { registerTSPaths } from '../helpers/register-ts-paths' registerTSPaths() import { program, Command, OptionValues } from 'commander' -import { installPlugin, listPlugins, uninstallPlugin, updatePlugin } from '../../shared/extra-utils/server/plugins' -import { getAdminTokenOrDie, getServerCredentials } from './cli' -import { PeerTubePlugin, PluginType } from '../../shared/models' +import { buildServer, getAdminTokenOrDie, getServerCredentials } from './cli' +import { PluginType } from '../../shared/models' import { isAbsolute } from 'path' import * as CliTable3 from 'cli-table3' @@ -63,28 +62,21 @@ program.parse(process.argv) async function pluginsListCLI (command: Command, options: OptionValues) { const { url, username, password } = await getServerCredentials(command) - const accessToken = await getAdminTokenOrDie(url, username, password) + const token = await getAdminTokenOrDie(url, username, password) + const server = buildServer(url, token) let pluginType: PluginType if (options.onlyThemes) pluginType = PluginType.THEME if (options.onlyPlugins) pluginType = PluginType.PLUGIN - const res = await listPlugins({ - url, - accessToken, - start: 0, - count: 100, - sort: 'name', - pluginType - }) - const plugins: PeerTubePlugin[] = res.body.data + const { data } = await server.pluginsCommand.list({ start: 0, count: 100, sort: 'name', pluginType }) const table = new CliTable3({ head: [ 'name', 'version', 'homepage' ], colWidths: [ 50, 10, 50 ] }) as any - for (const plugin of plugins) { + for (const plugin of data) { const npmName = plugin.type === PluginType.PLUGIN ? 'peertube-plugin-' + plugin.name : 'peertube-theme-' + plugin.name @@ -113,15 +105,11 @@ async function installPluginCLI (command: Command, options: OptionValues) { } const { url, username, password } = await getServerCredentials(command) - const accessToken = await getAdminTokenOrDie(url, username, password) + const token = await getAdminTokenOrDie(url, username, password) + const server = buildServer(url, token) try { - await installPlugin({ - url, - accessToken, - npmName: options.npmName, - path: options.path - }) + await server.pluginsCommand.install({ npmName: options.npmName, path: options.path }) } catch (err) { console.error('Cannot install plugin.', err) process.exit(-1) @@ -144,15 +132,11 @@ async function updatePluginCLI (command: Command, options: OptionValues) { } const { url, username, password } = await getServerCredentials(command) - const accessToken = await getAdminTokenOrDie(url, username, password) + const token = await getAdminTokenOrDie(url, username, password) + const server = buildServer(url, token) try { - await updatePlugin({ - url, - accessToken, - npmName: options.npmName, - path: options.path - }) + await server.pluginsCommand.update({ npmName: options.npmName, path: options.path }) } catch (err) { console.error('Cannot update plugin.', err) process.exit(-1) @@ -170,14 +154,11 @@ async function uninstallPluginCLI (command: Command, options: OptionValues) { } const { url, username, password } = await getServerCredentials(command) - const accessToken = await getAdminTokenOrDie(url, username, password) + const token = await getAdminTokenOrDie(url, username, password) + const server = buildServer(url, token) try { - await uninstallPlugin({ - url, - accessToken, - npmName: options.npmName - }) + await server.pluginsCommand.uninstall({ npmName: options.npmName }) } catch (err) { console.error('Cannot uninstall plugin.', err) process.exit(-1) -- cgit v1.2.3 From d0a0fa429d4651710ed951a3c11af0219e408964 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 13 Jul 2021 11:44:16 +0200 Subject: Adapt CLI to new commands --- server/tools/peertube-plugins.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'server/tools/peertube-plugins.ts') diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts index 63541bf2c..22a09b779 100644 --- a/server/tools/peertube-plugins.ts +++ b/server/tools/peertube-plugins.ts @@ -4,7 +4,7 @@ import { registerTSPaths } from '../helpers/register-ts-paths' registerTSPaths() import { program, Command, OptionValues } from 'commander' -import { buildServer, getAdminTokenOrDie, getServerCredentials } from './cli' +import { assignToken, buildServer, getServerCredentials } from './cli' import { PluginType } from '../../shared/models' import { isAbsolute } from 'path' import * as CliTable3 from 'cli-table3' @@ -62,8 +62,8 @@ program.parse(process.argv) async function pluginsListCLI (command: Command, options: OptionValues) { const { url, username, password } = await getServerCredentials(command) - const token = await getAdminTokenOrDie(url, username, password) - const server = buildServer(url, token) + const server = buildServer(url) + await assignToken(server, username, password) let pluginType: PluginType if (options.onlyThemes) pluginType = PluginType.THEME @@ -105,8 +105,8 @@ async function installPluginCLI (command: Command, options: OptionValues) { } const { url, username, password } = await getServerCredentials(command) - const token = await getAdminTokenOrDie(url, username, password) - const server = buildServer(url, token) + const server = buildServer(url) + await assignToken(server, username, password) try { await server.pluginsCommand.install({ npmName: options.npmName, path: options.path }) @@ -132,8 +132,8 @@ async function updatePluginCLI (command: Command, options: OptionValues) { } const { url, username, password } = await getServerCredentials(command) - const token = await getAdminTokenOrDie(url, username, password) - const server = buildServer(url, token) + const server = buildServer(url) + await assignToken(server, username, password) try { await server.pluginsCommand.update({ npmName: options.npmName, path: options.path }) @@ -154,8 +154,8 @@ async function uninstallPluginCLI (command: Command, options: OptionValues) { } const { url, username, password } = await getServerCredentials(command) - const token = await getAdminTokenOrDie(url, username, password) - const server = buildServer(url, token) + const server = buildServer(url) + await assignToken(server, username, password) try { await server.pluginsCommand.uninstall({ npmName: options.npmName }) -- cgit v1.2.3 From 89d241a79c262b9775c233b73cff080043ebb5e6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 16 Jul 2021 09:04:35 +0200 Subject: Shorter server command names --- server/tools/peertube-plugins.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server/tools/peertube-plugins.ts') diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts index 22a09b779..d9c285115 100644 --- a/server/tools/peertube-plugins.ts +++ b/server/tools/peertube-plugins.ts @@ -69,7 +69,7 @@ async function pluginsListCLI (command: Command, options: OptionValues) { if (options.onlyThemes) pluginType = PluginType.THEME if (options.onlyPlugins) pluginType = PluginType.PLUGIN - const { data } = await server.pluginsCommand.list({ start: 0, count: 100, sort: 'name', pluginType }) + const { data } = await server.plugins.list({ start: 0, count: 100, sort: 'name', pluginType }) const table = new CliTable3({ head: [ 'name', 'version', 'homepage' ], @@ -109,7 +109,7 @@ async function installPluginCLI (command: Command, options: OptionValues) { await assignToken(server, username, password) try { - await server.pluginsCommand.install({ npmName: options.npmName, path: options.path }) + await server.plugins.install({ npmName: options.npmName, path: options.path }) } catch (err) { console.error('Cannot install plugin.', err) process.exit(-1) @@ -136,7 +136,7 @@ async function updatePluginCLI (command: Command, options: OptionValues) { await assignToken(server, username, password) try { - await server.pluginsCommand.update({ npmName: options.npmName, path: options.path }) + await server.plugins.update({ npmName: options.npmName, path: options.path }) } catch (err) { console.error('Cannot update plugin.', err) process.exit(-1) @@ -158,7 +158,7 @@ async function uninstallPluginCLI (command: Command, options: OptionValues) { await assignToken(server, username, password) try { - await server.pluginsCommand.uninstall({ npmName: options.npmName }) + await server.plugins.uninstall({ npmName: options.npmName }) } catch (err) { console.error('Cannot uninstall plugin.', err) process.exit(-1) -- cgit v1.2.3