pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-17 02:52:38 +09:00
Code Issues Projects Releases Wiki Activity

[brightcove] Fix _extract_urls

Browse Source
This commit is contained in:
Sergey M․ 2015-11-14 06:01:56 +06:00
parent e721d857c2
commit 24af85298e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/brightcove.py
View File

@ -372,7 +372,8 @@ class BrightcoveNewIE(InfoExtractor):
} }
} }
def _extract_urls(self, webpage): @staticmethod
def _extract_urls(webpage):
# Reference: # Reference:
# 1. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideoiniframe # 1. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideoiniframe
# 2. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideousingjavascript) # 2. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideousingjavascript)
@ -383,7 +384,7 @@ class BrightcoveNewIE(InfoExtractor):
# Look for iframe embeds [1] # Look for iframe embeds [1]
for _, url in re.findall( for _, url in re.findall(
r'<iframe[^>]+src=(["\'])((?:https?:)//players\.brightcove\.net/\d+/[^/]+/index\.html.+?)\1', webpage): r'<iframe[^>]+src=(["\'])((?:https?:)//players\.brightcove\.net/\d+/[^/]+/index\.html.+?)\1', webpage):
entries.append(self.url_result(self._proto_relative_url(url))) entries.append(url)
# Look for embed_in_page embeds [2] # Look for embed_in_page embeds [2]
# According to examples from [3] it's unclear whether video id may be optional # According to examples from [3] it's unclear whether video id may be optional
# and what to do when it is # and what to do when it is
@ -396,9 +397,9 @@ class BrightcoveNewIE(InfoExtractor):
src=["\'](?:https?:)?//players\.brightcove\.net/ src=["\'](?:https?:)?//players\.brightcove\.net/
(\d+)/([\da-f-]+)_([^/]+)/index\.min\.js (\d+)/([\da-f-]+)_([^/]+)/index\.min\.js
''', webpage): ''', webpage):
entries.append(self.url_result( entries.append(
'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s' 'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s'
% (account_id, player_id, embed, video_id))) % (account_id, player_id, embed, video_id))
return entries return entries
def _real_extract(self, url): def _real_extract(self, url):