From: Philipp Hagemeister Date: Thu, 21 Feb 2013 15:56:48 +0000 (+0100) Subject: Also check for JSLoader of JWSPlayer (thanks to @maximeg, Closes #685) X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=1013186a172a05d57e87857604719cae6b8d7049 Also check for JSLoader of JWSPlayer (thanks to @maximeg, Closes #685) --- diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 23bd21af5..d3c3ac264 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -1366,6 +1366,9 @@ class GenericIE(InfoExtractor): if mobj is None: # Broaden the search a little bit mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"&]*)', webpage) + if mobj is None: + # Broaden the search a little bit: JWPlayer JS loader + mobj = re.search(r'[^A-Za-z0-9]?file:\s*["\'](http[^\'"&]*)', webpage) if mobj is None: self._downloader.trouble(u'ERROR: Invalid URL: %s' % url) return