From e8a739e880593c3ffd07a634d5ff62690ed844f6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 24 Apr 2019 16:51:25 +0200
Subject: [PATCH] Fix video import CLI script

Password is an optional argument
---
 server/tools/peertube-import-videos.ts | 26 ++++++++------------------
 support/doc/tools.md                   |  2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts
index 8c4c711f7..024f640a4 100644
--- a/server/tools/peertube-import-videos.ts
+++ b/server/tools/peertube-import-videos.ts
@@ -11,7 +11,7 @@ import { truncate } from 'lodash'
 import * as prompt from 'prompt'
 import { remove } from 'fs-extra'
 import { sha256 } from '../helpers/core-utils'
-import { safeGetYoutubeDL, buildOriginallyPublishedAt } from '../helpers/youtube-dl'
+import { buildOriginallyPublishedAt, safeGetYoutubeDL } from '../helpers/youtube-dl'
 import { getSettings, netrc } from './cli'
 
 let accessToken: string
@@ -34,29 +34,19 @@ program
 
 getSettings()
 .then(settings => {
-  if (
-    (!program['url'] ||
-    !program['username'] ||
-    !program['password']) &&
-    (settings.remotes.length === 0)
-  ) {
+  if ((!program['url'] || !program['username'] || !program['targetUrl']) && settings.remotes.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 (!program['targetUrl']) console.error('--targetUrl field is required.')
+
     process.exit(-1)
   }
 
-  if (
-    (!program['url'] ||
-    !program['username'] ||
-    !program['password']) &&
-    (settings.remotes.length > 0)
-  ) {
-    if (!program['url']) {
-      program['url'] = (settings.default !== -1) ?
-        settings.remotes[settings.default] :
-        settings.remotes[0]
+  if ((!program[ 'url' ] || !program[ 'username' ]) && settings.remotes.length > 0) {
+    if (!program[ 'url' ]) {
+      program[ 'url' ] = settings.default !== -1
+        ? settings.remotes[ settings.default ]
+        : settings.remotes[ 0 ]
     }
 
     if (!program['username']) program['username'] = netrc.machines[program['url']].login
diff --git a/support/doc/tools.md b/support/doc/tools.md
index 2ca1d508b..086cd5cff 100644
--- a/support/doc/tools.md
+++ b/support/doc/tools.md
@@ -120,7 +120,7 @@ $ node dist/server/tools/peertube-import-videos.js \
 
 * `PEERTUBE_URL` : the full URL of your PeerTube server where you want to import, eg: https://peertube.cpy.re
 * `PEERTUBE_USER` : your PeerTube account where videos will be uploaded
-* `PEERTUBE_PASSWORD` : password of your PeerTube account (if `PEERTUBE_PASSWORD` is omitted, you will be prompted for it)
+* `PEERTUBE_PASSWORD` : password of your PeerTube account (if `--password PEERTUBE_PASSWORD` is omitted, you will be prompted for it)
 * `TARGET_URL` : the target url you want to import. Examples:
   * YouTube:
     * Channel: https://www.youtube.com/channel/ChannelId
-- 
2.25.1