from .common import InfoExtractor
from ..utils import (
compat_urllib_parse,
+ find_xpath_attr,
+ compat_urlparse,
)
class BrightcoveIE(InfoExtractor):
<object class="BrightcoveExperience">{params}</object>
"""
object_doc = xml.etree.ElementTree.fromstring(object_str)
- assert object_doc.attrib['class'] == u'BrightcoveExperience'
+ assert u'BrightcoveExperience' in object_doc.attrib['class']
params = {'flashID': object_doc.attrib['id'],
- 'playerID': object_doc.find('./param[@name="playerID"]').attrib['value'],
+ 'playerID': find_xpath_attr(object_doc, './param', 'name', 'playerID').attrib['value'],
}
- playerKey = object_doc.find('./param[@name="playerKey"]')
+ playerKey = find_xpath_attr(object_doc, './param', 'name', 'playerKey')
# Not all pages define this value
if playerKey is not None:
params['playerKey'] = playerKey.attrib['value']
- videoPlayer = object_doc.find('./param[@name="@videoPlayer"]')
+ videoPlayer = find_xpath_attr(object_doc, './param', 'name', '@videoPlayer')
if videoPlayer is not None:
params['@videoPlayer'] = videoPlayer.attrib['value']
data = compat_urllib_parse.urlencode(params)
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