From: Philipp Hagemeister Date: Mon, 21 Apr 2014 14:16:53 +0000 (+0200) Subject: [generic] Improve jwplayer detection (Fixes #2731) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c0292e8ab716ea48655a4d301b4ca34ddbe24250;p=youtube-dl [generic] Improve jwplayer detection (Fixes #2731) --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 3c9f98dc3..13064e2cd 100644 --- 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)