diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-11-18 14:11:15 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-11-18 14:11:15 +0100 |
| commit | e0409585a744ab7b41869bc08bfb2b33febe3bba (patch) | |
| tree | f43718d68fa7adaad65c846af1fc9b280829b7a1 /server | |
| parent | 677012b4ee53e5099e8c90445616644e1a6af9ef (diff) | |
| download | PeerTube-e0409585a744ab7b41869bc08bfb2b33febe3bba.tar.gz PeerTube-e0409585a744ab7b41869bc08bfb2b33febe3bba.tar.zst PeerTube-e0409585a744ab7b41869bc08bfb2b33febe3bba.zip | |
Fix youtube-dl ipv4 PR
Diffstat (limited to 'server')
| -rw-r--r-- | server/helpers/youtube-dl.ts | 6 | ||||
| -rw-r--r-- | server/initializers/config.ts | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts index 8733fe6cf..302b2e206 100644 --- a/server/helpers/youtube-dl.ts +++ b/server/helpers/youtube-dl.ts | |||
| @@ -34,7 +34,11 @@ const processOptions = { | |||
| 34 | function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> { | 34 | function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> { |
| 35 | return new Promise<YoutubeDLInfo>((res, rej) => { | 35 | return new Promise<YoutubeDLInfo>((res, rej) => { |
| 36 | let args = opts || [ '-j', '--flat-playlist' ] | 36 | let args = opts || [ '-j', '--flat-playlist' ] |
| 37 | if (CONFIG.IMPORT.VIDEOS.HTTP.FORCEIPV4) args.push('--force-ipv4') | 37 | |
| 38 | if (CONFIG.IMPORT.VIDEOS.HTTP.FORCE_IPV4) { | ||
| 39 | args.push('--force-ipv4') | ||
| 40 | } | ||
| 41 | |||
| 38 | args = wrapWithProxyOptions(args) | 42 | args = wrapWithProxyOptions(args) |
| 39 | 43 | ||
| 40 | safeGetYoutubeDL() | 44 | safeGetYoutubeDL() |
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index d1bbbc9a7..705223b0a 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
| @@ -229,9 +229,7 @@ const CONFIG = { | |||
| 229 | VIDEOS: { | 229 | VIDEOS: { |
| 230 | HTTP: { | 230 | HTTP: { |
| 231 | get ENABLED () { return config.get<boolean>('import.videos.http.enabled') }, | 231 | get ENABLED () { return config.get<boolean>('import.videos.http.enabled') }, |
| 232 | FORCEIPV4: { | 232 | get FORCE_IPV4 () { return config.get<boolean>('import.videos.http.force_ipv4') }, |
| 233 | get ENABLED () { return config.get<boolean>('import.videos.http.forceipv4.enabled') } | ||
| 234 | }, | ||
| 235 | PROXY: { | 233 | PROXY: { |
| 236 | get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') }, | 234 | get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') }, |
| 237 | get URL () { return config.get<string>('import.videos.http.proxy.url') } | 235 | get URL () { return config.get<string>('import.videos.http.proxy.url') } |