|
@@ -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'))
|
|
|
|