diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-01-28 23:07:37 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-01-28 23:07:37 +0600 |
| commit | cb454b333d91718a0c2b36c34c8b0d6858ff9505 (patch) | |
| tree | 99dd55124d8a420e5315746f3b89a72099e6baeb /youtube_dl/extractor | |
| parent | e0d9f85aee92ebcb40ce688ed43172c718751e27 (diff) | |
[generic] Improve some regexes
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index a937a1e09..41884ed7a 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -874,15 +874,15 @@ class GenericIE(InfoExtractor): return self.url_result(mobj.group('url')) # Look for embedded Viddler player - mobj = (re.search(r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?viddler\.com/embed/.+?)\1', webpage) or - re.search(r'<param[^>]+?value=(["\'])(?P<url>(?:https?:)?//(?:www\.)?viddler\.com/player/.+?)\1', webpage)) - + mobj = re.search( + r'<(?:iframe[^>]+?src|param[^>]+?value)=(["\'])(?P<url>(?:https?:)?//(?:www\.)?viddler\.com/(?:embed|player)/.+?)\1', + webpage) if mobj is not None: return self.url_result(mobj.group('url')) # Look for Ooyala videos - mobj = (re.search(r'player.ooyala.com/[^"?]+\?[^"]*?(?:embedCode|ec)=(?P<ec>[^"&]+)', webpage) or - re.search(r'OO.Player.create\([\'"].*?[\'"],\s*[\'"](?P<ec>.{32})[\'"]', webpage)) + mobj = (re.search(r'player\.ooyala\.com/[^"?]+\?[^"]*?(?:embedCode|ec)=(?P<ec>[^"&]+)', webpage) or + re.search(r'OO\.Player\.create\([\'"].*?[\'"],\s*[\'"](?P<ec>.{32})[\'"]', webpage)) if mobj is not None: return OoyalaIE._build_url_result(mobj.group('ec')) |