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

[Brightcove:new] reorder doc references in order of HTML page

Browse Source 
Otherwise it is very confusing to read them out of order.
This commit is contained in:
John Hawkinson 2017-03-07 01:06:19 -05:00
parent 99a9ff2423
commit 15859c6845
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/brightcove.py
View File

@ -480,23 +480,23 @@ class BrightcoveNewIE(InfoExtractor):
@staticmethod @staticmethod
def _extract_urls(webpage): 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#tag
# 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
# 3. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/in-page-embed-player-implementation.html # 3. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideoiniframe
# 4. https://support.brightcove.com/en/video-cloud/docs/dynamically-assigning-videos-player # 4. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/in-page-embed-player-implementation.html
# 5. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#tag # 5. https://support.brightcove.com/en/video-cloud/docs/dynamically-assigning-videos-player
# [5] looks like: # [1] looks like:
# <video data-video-id="5320421710001" data-account="245991542" data-player="SJWAiyYWg" data-embed="default" class="video-js" controls itemscope itemtype="http://schema.org/VideoObject"> # <video data-video-id="5320421710001" data-account="245991542" data-player="SJWAiyYWg" data-embed="default" class="video-js" controls itemscope itemtype="http://schema.org/VideoObject">
entries = [] entries = []
# Look for iframe embeds [1] # Look for iframe embeds [3]
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(url if url.startswith('http') else 'http:' + url) entries.append(url if url.startswith('http') else 'http:' + url)
# Look for embed_in_page embeds [2] and <video> tags [5] # Look for <video> tags [1] and embed_in_page embeds [2]
for video, script_tag, account_id, player_id, embed in re.findall( for video, script_tag, account_id, player_id, embed in re.findall(
r'''(?isx) r'''(?isx)
(<video[^>]+>) (<video[^>]+>)
@ -509,7 +509,7 @@ class BrightcoveNewIE(InfoExtractor):
''', webpage): ''', webpage):
attrs = extract_attributes(video) attrs = extract_attributes(video)
# According to examples from [3] it's unclear whether video id # According to examples from [4] it's unclear whether video id
# may be optional and what to do when it is # may be optional and what to do when it is
video_id = attrs.get('data-video-id') video_id = attrs.get('data-video-id')
# See PR#12099/bostonglobe.py for 'data-brightcove-video-id' variant # See PR#12099/bostonglobe.py for 'data-brightcove-video-id' variant
@ -518,7 +518,7 @@ class BrightcoveNewIE(InfoExtractor):
if not player_id: player_id = attrs.get('data-player') if not player_id: player_id = attrs.get('data-player')
if not embed: embed = attrs.get('data-embed') if not embed: embed = attrs.get('data-embed')
# According to [4] data-video-id may be prefixed with 'ref:' # According to [5] data-video-id may be prefixed with 'ref:'
video_id = video_id.rpartition('ref:')[2] video_id = video_id.rpartition('ref:')[2]
if video_id and account_id and player_id and embed: if video_id and account_id and player_id and embed: