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

Proxy youtube-dl format command too

This commit is contained in:
Chocobozzz 2020-01-22 17:19:03 +01:00
parent fef213cae1
commit 93905586ee
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/helpers/youtube-dl.ts
View File

@ -25,7 +25,8 @@ const processOptions = {
function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> { function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> {
return new Promise<YoutubeDLInfo>(async (res, rej) => { return new Promise<YoutubeDLInfo>(async (res, rej) => {
const args = opts || [ '-j', '--flat-playlist' ] let args = opts || [ '-j', '--flat-playlist' ]
args = wrapWithProxyOptions(args)
const youtubeDL = await safeGetYoutubeDL() const youtubeDL = await safeGetYoutubeDL()
youtubeDL.getInfo(url, args, processOptions, (err, info) => { youtubeDL.getInfo(url, args, processOptions, (err, info) => {
@ -47,12 +48,7 @@ function downloadYoutubeDLVideo (url: string, timeout: number) {
logger.info('Importing youtubeDL video %s', url) logger.info('Importing youtubeDL video %s', url)
let options = [ '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best', '-o', path ] let options = [ '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best', '-o', path ]
options = wrapWithProxyOptions(options)
if (CONFIG.IMPORT.VIDEOS.HTTP.PROXY.ENABLED) {
logger.debug('Using proxy for YoutubeDL')
options = [ '--proxy', CONFIG.IMPORT.VIDEOS.HTTP.PROXY.URL ].concat(options)
}
if (process.env.FFMPEG_PATH) { if (process.env.FFMPEG_PATH) {
options = options.concat([ '--ffmpeg-location', process.env.FFMPEG_PATH ]) options = options.concat([ '--ffmpeg-location', process.env.FFMPEG_PATH ])
@ -270,3 +266,13 @@ function getCategory (categories: string[]) {
return undefined return undefined
} }
function wrapWithProxyOptions (options: string[]) {
if (CONFIG.IMPORT.VIDEOS.HTTP.PROXY.ENABLED) {
logger.debug('Using proxy for YoutubeDL')
return [ '--proxy', CONFIG.IMPORT.VIDEOS.HTTP.PROXY.URL ].concat(options)
}
return options
}