youtube-dl

commit c0292e8ab716ea48655a4d301b4ca34ddbe24250
parent f44e5d8b43a5890fcdd962b5300da71dad323b63
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Mon, 21 Apr 2014 16:16:53 +0200

[generic] Improve jwplayer detection (Fixes #2731)

Diffstat:
M
youtube_dl/extractor/generic.py
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
@@ -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)