forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix video import CLI script 

Password is an optional argument
This commit is contained in:
Chocobozzz 2019-04-24 16:51:25 +02:00
parent cbe94af85a
commit e8a739e880
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/tools/peertube-import-videos.ts
View File

@ -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

2
support/doc/tools.md
View File

@ -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