Merge remote-tracking branch 'weblate/develop' into develop

[github/Chocobozzz/PeerTube.git] / server / tools / cli.ts

diff --git a/server/tools/cli.ts b/server/tools/cli.ts
index d1a631b69efbde489f49722689eb7e340f6d65fa..cc89fe46e5150b622d8e227ad91aaf5d4e87c308 100644 (file)
--- a/server/tools/cli.ts
+++ b/server/tools/cli.ts
@@ -3,7 +3,7 @@ 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 { CommanderStatic } from 'commander'
 import { VideoChannel, VideoPrivacy } from '../../shared/models/videos'
 import { createLogger, format, transports } from 'winston'
 import { getMyUserInformation } from '@shared/extra-utils/users/users'
@@ -35,19 +35,17 @@ interface Settings {
   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 () {
@@ -62,44 +60,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: CommanderStatic,
   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]
 
@@ -112,13 +100,13 @@ function getRemoteObjectOrDie (
   }
 
   return {
-    url: program['url'],
-    username: program['username'],
-    password: program['password']
+    url: options.url,
+    username: options.username,
+    password: options.password
   }
 }
 
-function buildCommonVideoOptions (command: Command) {
+function buildCommonVideoOptions (command: CommanderStatic) {
   function list (val) {
     return val.split(',')
   }
@@ -133,13 +121,16 @@ function buildCommonVideoOptions (command: Command) {
     .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 (url: string, command: CommanderStatic, defaultAttributes: any = {}) {
+  const options = command.opts()
+
   const defaultBooleanAttributes = {
     nsfw: false,
     commentsEnabled: true,
@@ -150,8 +141,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,20 +151,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'])
+  if (options.channelName) {
+    const res = await getVideoChannel(url, options.channelName)
     const videoChannel: VideoChannel = res.body
 
     Object.assign(videoAttributes, { channelId: videoChannel.id })
@@ -186,7 +177,7 @@ async function buildVideoAttributesFromCommander (url: string, command: Command,
   return videoAttributes
 }
 
-function getServerCredentials (program: any) {
+function getServerCredentials (program: CommanderStatic) {
   return Promise.all([ getSettings(), getNetrc() ])
                 .then(([ settings, netrc ]) => {
                   return getRemoteObjectOrDie(program, settings, netrc)
@@ -227,7 +218,6 @@ function getLogger (logLevel = 'info') {
 
 export {
   version,
-  config,
   getLogger,
   getSettings,
   getNetrc,