forks
/
peertube
1
0
Fork 0
Code Releases Activity

default youtube-dl to use ipv4 (#3311) 

Co-authored-by: Rigel Kent <sendmemail@rigelk.eu>
This commit is contained in:
Mark Van den Borre 2020-11-18 14:06:20 +01:00 committed by GitHub
parent 7f88a58e3f
commit 677012b4ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/default.yaml
View File

@ -285,6 +285,9 @@ import:
videos:
http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
enabled: false
# IPv6 is very strongly rate-limited on most sites supported by youtube-dl
forceipv4:
enabled: true
# You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
proxy:
enabled: false

3
config/production.yaml.example
View File

@ -299,6 +299,9 @@ import:
videos:
http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
enabled: false
# IPv6 is very strongly rate-limited on most sites supported by youtube-dl
forceipv4:
enabled: true
# You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
proxy:
enabled: false

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

@ -34,6 +34,7 @@ const processOptions = {
function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> {
return new Promise<YoutubeDLInfo>((res, rej) => {
let args = opts || [ '-j', '--flat-playlist' ]
if (CONFIG.IMPORT.VIDEOS.HTTP.FORCEIPV4) args.push('--force-ipv4')
args = wrapWithProxyOptions(args)
safeGetYoutubeDL()

3
server/initializers/config.ts
View File

@ -229,6 +229,9 @@ const CONFIG = {
VIDEOS: {
HTTP: {
get ENABLED () { return config.get<boolean>('import.videos.http.enabled') },
FORCEIPV4: {
get ENABLED () { return config.get<boolean>('import.videos.http.forceipv4.enabled') }
},
PROXY: {
get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') },
get URL () { return config.get<string>('import.videos.http.proxy.url') }