w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

GenericIE: detect more Brightcove videos

Browse source 
In some sites "class" contains more that BrightcoveExperience
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-07-11 00:25:38 +02:00
parent abb285fb1b
commit 117adb0f0f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
youtube_dl/extractor/brightcove.py
View file

@ -22,7 +22,7 @@ class BrightcoveIE(InfoExtractor):
<object class="BrightcoveExperience">{params}</object> <object class="BrightcoveExperience">{params}</object>
""" """
object_doc = xml.etree.ElementTree.fromstring(object_str) 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'], params = {'flashID': object_doc.attrib['id'],
'playerID': object_doc.find('./param[@name="playerID"]').attrib['value'], 'playerID': object_doc.find('./param[@name="playerID"]').attrib['value'],
} }

2
youtube_dl/extractor/generic.py
View file

@ -120,7 +120,7 @@ class GenericIE(InfoExtractor):
self.report_extraction(video_id) self.report_extraction(video_id)
# Look for BrigthCove: # Look for BrigthCove:
m_brightcove = re.search(r'<object.+?class="BrightcoveExperience".+?</object>', webpage, re.DOTALL) m_brightcove = re.search(r'<object.+?class=".*?BrightcoveExperience.*?".+?</object>', webpage, re.DOTALL)
if m_brightcove is not None: if m_brightcove is not None:
self.to_screen(u'Brightcove video detected.') self.to_screen(u'Brightcove video detected.')
bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group()) bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group())