R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[extractor/generic] fix RollingStone test and improve Brightcove embed extraction

Browse Source
This commit is contained in:
TRox1972 2016-05-22 18:15:01 +02:00
parent db3b8b2103
commit a74abd8be0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/extractor/generic.py
View File

@ -385,17 +385,16 @@ class GenericIE(InfoExtractor):
'skip_download': True, # m3u8 download 'skip_download': True, # m3u8 download
}, },
}, },
# ooyala video
{ {
'url': 'http://www.rollingstone.com/music/videos/norwegian-dj-cashmere-cat-goes-spartan-on-with-me-premiere-20131219', 'url': 'http://www.rollingstone.com/music/videos/norwegian-dj-cashmere-cat-goes-spartan-on-with-me-premiere-20131219',
'md5': '166dd577b433b4d4ebfee10b0824d8ff', 'md5': '1cef60edeafd0800b57bf8cbb851ae72',
'info_dict': { 'info_dict': {
'id': 'BwY2RxaTrTkslxOfcan0UCf0YqyvWysJ', 'id': '4404576300001',
'ext': 'mp4', 'ext': 'mp4',
'title': '2cc213299525360.mov', # that's what we get 'title': 'Music Video',
'duration': 238.231, 'duration': 238.231,
}, },
'add_ie': ['Ooyala'], 'add_ie': ['BrightcoveNew'],
}, },
{ {
# ooyala video embedded with http://player.ooyala.com/iframe.js # ooyala video embedded with http://player.ooyala.com/iframe.js
@ -1659,9 +1658,10 @@ class GenericIE(InfoExtractor):
# Look for Ooyala videos # Look for Ooyala videos
mobj = (re.search(r'player\.ooyala\.com/[^"?]+[?#][^"]*?(?:embedCode|ec)=(?P<ec>[^"&]+)', webpage) or mobj = (re.search(r'player\.ooyala\.com/[^"?]+[?#][^"]*?(?:embedCode|ec)=(?P<ec>[^"&]+)', webpage) or
re.search(r'OO\.Player\.create\([\'"].*?[\'"],\s*[\'"](?P<ec>.{32})[\'"]', webpage) or re.search(r'OO\.Player\.create\([\'"].*?[\'"],\s*[\'"](?P<ec>\w{32})[\'"]', webpage) or
re.search(r'SBN\.VideoLinkset\.ooyala\([\'"](?P<ec>.{32})[\'"]\)', webpage) or re.search(r'SBN\.VideoLinkset\.ooyala\([\'"](?P<ec>\w{32})[\'"]\)', webpage) or
re.search(r'data-ooyala-video-id\s*=\s*[\'"](?P<ec>.{32})[\'"]', webpage)) re.search(r'data-ooyala-video-id\s*=\s*[\'"](?P<ec>\w{32})[\'"]', webpage) or
re.search(r'"ooyalaplayer-1",\s*"(?P<ec>\w{32})"', webpage))
if mobj is not None: if mobj is not None:
return OoyalaIE._build_url_result(smuggle_url(mobj.group('ec'), {'domain': url})) return OoyalaIE._build_url_result(smuggle_url(mobj.group('ec'), {'domain': url}))