X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fspace.py;h=ebb5d6ec0ffe6f0b9056bdbe58ab36abea019c3d;hb=3047121c639428235191ff5f7afbda7ecda38779;hp=0d32a068895e1c0a53cd23c61d6cdc233d82826d;hpb=065472936a81fcad263dc2f1b04fdfe4a221eeb9;p=youtube-dl diff --git a/youtube_dl/extractor/space.py b/youtube_dl/extractor/space.py index 0d32a0688..ebb5d6ec0 100644 --- a/youtube_dl/extractor/space.py +++ b/youtube_dl/extractor/space.py @@ -1,21 +1,23 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor -from .brightcove import BrightcoveIE +from .brightcove import BrightcoveLegacyIE from ..utils import RegexNotFoundError, ExtractorError class SpaceIE(InfoExtractor): - _VALID_URL = r'https?://www\.space\.com/\d+-(?P[^/\.\?]*?)-video.html' + _VALID_URL = r'https?://(?:(?:www|m)\.)?space\.com/\d+-(?P<title>[^/\.\?]*?)-video\.html' _TEST = { - u'add_ie': ['Brightcove'], - u'url': u'http://www.space.com/23373-huge-martian-landforms-detail-revealed-by-european-probe-video.html', - u'info_dict': { - u'id': u'2780937028001', - u'ext': u'mp4', - u'title': u'Huge Martian Landforms\' Detail Revealed By European Probe | Video', - u'description': u'md5:db81cf7f3122f95ed234b631a6ea1e61', - u'uploader': u'TechMedia Networks', + 'add_ie': ['BrightcoveLegacy'], + 'url': 'http://www.space.com/23373-huge-martian-landforms-detail-revealed-by-european-probe-video.html', + 'info_dict': { + 'id': '2780937028001', + 'ext': 'mp4', + 'title': 'Huge Martian Landforms\' Detail Revealed By European Probe | Video', + 'description': 'md5:db81cf7f3122f95ed234b631a6ea1e61', + 'uploader': 'TechMedia Networks', }, } @@ -29,7 +31,8 @@ class SpaceIE(InfoExtractor): brightcove_url = self._og_search_video_url(webpage) except RegexNotFoundError: # Other videos works fine with the info from the object - brightcove_url = BrightcoveIE._extract_brightcove_url(webpage) + brightcove_url = BrightcoveLegacyIE._extract_brightcove_url(webpage) if brightcove_url is None: - raise ExtractorError(u'The webpage does not contain a video', expected=True) - return self.url_result(brightcove_url, BrightcoveIE.ie_key()) + raise ExtractorError( + 'The webpage does not contain a video', expected=True) + return self.url_result(brightcove_url, BrightcoveLegacyIE.ie_key())