]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[generic] Match JWPlayerOptions
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 30 Jan 2014 04:29:09 +0000 (05:29 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 30 Jan 2014 04:29:10 +0000 (05:29 +0100)
This adds support for The Guardian, among others
Closes #2271, fixes #2267

youtube_dl/extractor/generic.py

index e0d51996ded5f1604bebe5d0c03c1dbc815f31ce..88d768bddce9165e8c10c0a313fdf29dfa7a0258 100644 (file)
@@ -358,7 +358,7 @@ 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.*?file:\s*["\'](.*?)["\']', webpage)
+            mobj = re.search(r'(?s)(?:jw_plugins|JWPlayerOptions).*?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)