X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fbrightcove.py;h=71e3c7883338154eea0c3d369a0fdd0bee828e26;hb=739674cd77d6a6c7025878701939d987fac5b446;hp=c784ba785010e00a7c22ea8590fff5a38f7f84f9;hpb=5de3ece2256584732a4b2c74a499f36577c42008;p=youtube-dl diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py index c784ba785..71e3c7883 100644 --- a/youtube_dl/extractor/brightcove.py +++ b/youtube_dl/extractor/brightcove.py @@ -5,6 +5,8 @@ import xml.etree.ElementTree from .common import InfoExtractor from ..utils import ( compat_urllib_parse, + find_xpath_attr, + compat_urlparse, ) class BrightcoveIE(InfoExtractor): @@ -38,15 +40,15 @@ class BrightcoveIE(InfoExtractor): def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - query = mobj.group('query') + query_str = mobj.group('query') + query = compat_urlparse.parse_qs(query_str) - m_video_id = re.search(r'videoPlayer=(\d+)', query) - if m_video_id is not None: - video_id = m_video_id.group(1) - return self._get_video_info(video_id, query) + videoPlayer = query.get('@videoPlayer') + if videoPlayer: + return self._get_video_info(videoPlayer[0], query_str) else: - player_key = self._search_regex(r'playerKey=(.+?)(&|$)', query, 'playlist_id') - return self._get_playlist_info(player_key) + player_key = query['playerKey'] + return self._get_playlist_info(player_key[0]) def _get_video_info(self, video_id, query): request_url = self._FEDERATED_URL_TEMPLATE % query