Browse Source

[generic] Improve jwplayer detection (Fixes #2731)

totalwebcasting
Philipp Hagemeister 11 years ago
parent
commit
c0292e8ab7
1 changed files with 7 additions and 1 deletions
  1. +7
    -1
      youtube_dl/extractor/generic.py

+ 7
- 1
youtube_dl/extractor/generic.py View File

@ -619,7 +619,13 @@ class GenericIE(InfoExtractor):
mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage)
if mobj is None:
# Look for gorilla-vid style embedding
mobj = re.search(r'(?s)(?:jw_plugins|JWPlayerOptions).*?file\s*:\s*["\'](.*?)["\']', webpage)
mobj = re.search(r'''(?sx)
(?:
jw_plugins|
JWPlayerOptions|
jwplayer\s*\(\s*["'][^'"]+["']\s*\)\s*\.setup
)
.*?file\s*:\s*["\'](.*?)["\']''', webpage)
if mobj is None:
# Broaden the search a little bit
mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"&]*)', webpage)


Loading…
Cancel
Save