From 24af85298ed1862ac809677e70ff59f3e9ee3234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sat, 14 Nov 2015 06:01:56 +0600 Subject: [PATCH] [brightcove] Fix _extract_urls --- youtube_dl/extractor/brightcove.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py index 8ee5486fe..1c7783dcb 100644 --- a/youtube_dl/extractor/brightcove.py +++ b/youtube_dl/extractor/brightcove.py @@ -372,7 +372,8 @@ class BrightcoveNewIE(InfoExtractor): } } - def _extract_urls(self, webpage): + @staticmethod + def _extract_urls(webpage): # Reference: # 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) @@ -383,7 +384,7 @@ class BrightcoveNewIE(InfoExtractor): # Look for iframe embeds [1] for _, url in re.findall( r']+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] # According to examples from [3] it's unclear whether video id may be optional # and what to do when it is @@ -396,9 +397,9 @@ class BrightcoveNewIE(InfoExtractor): src=["\'](?:https?:)?//players\.brightcove\.net/ (\d+)/([\da-f-]+)_([^/]+)/index\.min\.js ''', webpage): - entries.append(self.url_result( + entries.append( '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 def _real_extract(self, url):