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

Fix channel import with some channels

pull/5325/head
Chocobozzz 2022-10-10 15:33:32 +02:00
parent c43ed8e862
commit 5cc2f0ea0a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/helpers/youtube-dl/youtube-dl-cli.ts
View File

@ -128,14 +128,14 @@ export class YoutubeDLCLI {
const data = await this.run({ url, args: completeArgs, processOptions })
if (!data) return undefined
const info = data.map(this.parseInfo)
const info = data.map(d => JSON.parse(d))
return info.length === 1
? info[0]
: info
}
getListInfo (options: {
async getListInfo (options: {
url: string
latestVideosCount?: number
processOptions: execa.NodeOptions
@ -151,12 +151,17 @@ export class YoutubeDLCLI {
additionalYoutubeDLArgs.push('--playlist-end', options.latestVideosCount.toString())
}
return this.getInfo({
const result = await this.getInfo({
url: options.url,
format: YoutubeDLCLI.getYoutubeDLVideoFormat([], false),
processOptions: options.processOptions,
additionalYoutubeDLArgs
})
if (!result) return result
if (!Array.isArray(result)) return [ result ]
return result
}
async getSubs (options: {
@ -241,8 +246,4 @@ export class YoutubeDLCLI {
return args
}
private parseInfo (data: string) {
return JSON.parse(data)
}
}