interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly import tags in CLI

This commit is contained in:
Chocobozzz 2019-07-29 14:10:31 +02:00
parent 2284f20207
commit 6f530096cb
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/tools/cli.ts
View File

@ -121,7 +121,7 @@ function buildCommonVideoOptions (command: Command) {
.option('-w, --wait-transcoding', 'Wait transcoding before publishing the video') .option('-w, --wait-transcoding', 'Wait transcoding before publishing the video')
} }
async function buildVideoAttributesFromCommander (url: string, command: Command, defaultAttributes: any) { async function buildVideoAttributesFromCommander (url: string, command: Command, defaultAttributes: any = {}) {
const defaultBooleanAttributes = { const defaultBooleanAttributes = {
nsfw: false, nsfw: false,
commentsEnabled: true, commentsEnabled: true,
@ -147,7 +147,9 @@ async function buildVideoAttributesFromCommander (url: string, command: Command,
licence: command[ 'licence' ] || defaultAttributes.licence || undefined, licence: command[ 'licence' ] || defaultAttributes.licence || undefined,
language: command[ 'language' ] || defaultAttributes.language || undefined, language: command[ 'language' ] || defaultAttributes.language || undefined,
privacy: command[ 'privacy' ] || defaultAttributes.privacy || VideoPrivacy.PUBLIC, privacy: command[ 'privacy' ] || defaultAttributes.privacy || VideoPrivacy.PUBLIC,
support: command[ 'support' ] || defaultAttributes.support || undefined support: command[ 'support' ] || defaultAttributes.support || undefined,
description: command[ 'videoDescription' ] || defaultAttributes.description || undefined,
tags: command[ 'tags' ] || defaultAttributes.tags || undefined
} }
Object.assign(videoAttributes, booleanAttributes) Object.assign(videoAttributes, booleanAttributes)

6
server/tools/peertube-upload.ts
View File

@ -46,11 +46,7 @@ async function run (url: string, username: string, password: string) {
console.log('Uploading %s video...', program[ 'videoName' ]) console.log('Uploading %s video...', program[ 'videoName' ])
const defaultAttributes = { const videoAttributes = await buildVideoAttributesFromCommander(url, program)
tags: command[ 'tags' ],
description: command[ 'videoDescription' ]
}
const videoAttributes = await buildVideoAttributesFromCommander(url, program, defaultAttributes)
Object.assign(videoAttributes, { Object.assign(videoAttributes, {
fixture: program[ 'file' ], fixture: program[ 'file' ],