aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-11 00:25:38 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-11 00:25:38 +0200
commit117adb0f0f14766189b3e2f635462990637d1274 (patch)
tree5c3f4656cef88f295546ac42f8c461e2a798a6cb
parentabb285fb1b36ebe226e4f757271545d9a1132160 (diff)
GenericIE: detect more Brightcove videos
In some sites "class" contains more that BrightcoveExperience
-rw-r--r--youtube_dl/extractor/brightcove.py2
-rw-r--r--youtube_dl/extractor/generic.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py
index 125c8a667..68ee5292b 100644
--- a/youtube_dl/extractor/brightcove.py
+++ b/youtube_dl/extractor/brightcove.py
@@ -22,7 +22,7 @@ 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'],
}
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index be9d29a63..33790741f 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -120,7 +120,7 @@ class GenericIE(InfoExtractor):
self.report_extraction(video_id)
# 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:
self.to_screen(u'Brightcove video detected.')
bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group())