Browse Source

Fix youtube-dl ipv4 PR

pull/3334/head
Chocobozzz 1 week ago
parent
commit
e0409585a7
No known key found for this signature in database GPG Key ID: 583A612D890159BE
4 changed files with 12 additions and 8 deletions
  1. +3
    -2
      config/default.yaml
  2. +3
    -2
      config/production.yaml.example
  3. +5
    -1
      server/helpers/youtube-dl.ts
  4. +1
    -3
      server/initializers/config.ts

+ 3
- 2
config/default.yaml View File

@@ -285,9 +285,10 @@ 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
force_ipv4: false
# You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
proxy:
enabled: false


+ 3
- 2
config/production.yaml.example View File

@@ -299,9 +299,10 @@ 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
force_ipv4: false
# You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
proxy:
enabled: false


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

@@ -34,7 +34,11 @@ 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')

if (CONFIG.IMPORT.VIDEOS.HTTP.FORCE_IPV4) {
args.push('--force-ipv4')
}

args = wrapWithProxyOptions(args)

safeGetYoutubeDL()


+ 1
- 3
server/initializers/config.ts View File

@@ -229,9 +229,7 @@ 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') }
},
get FORCE_IPV4 () { return config.get<boolean>('import.videos.http.force_ipv4') },
PROXY: {
get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') },
get URL () { return config.get<string>('import.videos.http.proxy.url') }


Loading…
Cancel
Save