aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-11-06 16:40:24 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-11-06 16:58:03 +0100
commiteeb165e674e07aaa798f69e15f16faa01bc8feaa (patch)
tree196b2cf1da4e10b7e54f8c405ed47f4d1ae02ddc /youtube_dl/extractor/generic.py
parent9ee2b5f6f2a6e07ab901e47ede59eb5382ebb6ef (diff)
downloadyoutube-dl-eeb165e674e07aaa798f69e15f16faa01bc8feaa.tar.xz
[brightcove] Add the extraction of the url from generic
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py20
1 files changed, 17 insertions, 3 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 76d369273..04b7212f4 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -54,6 +54,21 @@ class GenericIE(InfoExtractor):
},
u'skip': u'There is a limit of 200 free downloads / month for the test song',
},
+ # embedded brightcove video
+ {
+ u'add_ie': ['Brightcove'],
+ u'url': u'http://www.scientificamerican.com/article.cfm?id=soap-bubble-physics',
+ u'info_dict': {
+ u'id': u'2365799484001',
+ u'ext': u'mp4',
+ u'title': u'Bubble Simulation',
+ u'description': u'A visualization from a new computer model of foam behavior.',
+ u'uploader': u'Scientific American',
+ },
+ u'params': {
+ u'skip_download': True,
+ },
+ },
]
def report_download_webpage(self, video_id):
@@ -146,10 +161,9 @@ class GenericIE(InfoExtractor):
self.report_extraction(video_id)
# Look for BrightCove:
- m_brightcove = re.search(r'<object[^>]+?class=([\'"])[^>]*?BrightcoveExperience.*?\1.+?</object>', webpage, re.DOTALL)
- if m_brightcove is not None:
+ bc_url = BrightcoveIE._extract_brightcove_url(webpage)
+ if bc_url is not None:
self.to_screen(u'Brightcove video detected.')
- bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group())
return self.url_result(bc_url, 'Brightcove')
# Look for embedded Vimeo player