From: Sergey M․ Date: Fri, 13 Nov 2015 23:54:16 +0000 (+0600) Subject: [brightcove] Rename extractor to brightcove legacy X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=4fcaa4f4a5ef328009bef53ebc491ebe76452550;p=youtube-dl [brightcove] Rename extractor to brightcove legacy Old embedding approaches are now "Legacy Studio" --- diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 08cb93d76..8a0f76d7e 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -61,7 +61,7 @@ from .bpb import BpbIE from .br import BRIE from .breakcom import BreakIE from .brightcove import ( - BrightcoveIE, + BrightcoveLegacyIE, BrightcoveInPageEmbedIE, ) from .buzzfeed import BuzzFeedIE diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py index d494b8b67..4dbc2e975 100644 --- a/youtube_dl/extractor/brightcove.py +++ b/youtube_dl/extractor/brightcove.py @@ -30,7 +30,7 @@ from ..utils import ( ) -class BrightcoveIE(InfoExtractor): +class BrightcoveLegacyIE(InfoExtractor): _VALID_URL = r'(?:https?://.*brightcove\.com/(services|viewer).*?\?|brightcove:)(?P.*)' _FEDERATED_URL_TEMPLATE = 'http://c.brightcove.com/services/viewer/htmlFederated?%s' diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 34d930a2d..8f99dd9b1 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -31,7 +31,7 @@ from ..utils import ( xpath_text, ) from .brightcove import ( - BrightcoveIE, + BrightcoveLegacyIE, BrightcoveInPageEmbedIE, ) from .nbc import NBCSportsVPlayerIE @@ -1305,7 +1305,7 @@ class GenericIE(InfoExtractor): urlrs, playlist_id=video_id, playlist_title=video_title) # Look for BrightCove: - bc_urls = BrightcoveIE._extract_brightcove_urls(webpage) + bc_urls = BrightcoveLegacyIE._extract_brightcove_urls(webpage) if bc_urls: self.to_screen('Brightcove video detected.') entries = [{ diff --git a/youtube_dl/extractor/nowness.py b/youtube_dl/extractor/nowness.py index b97f62fdb..dab487ea4 100644 --- a/youtube_dl/extractor/nowness.py +++ b/youtube_dl/extractor/nowness.py @@ -1,7 +1,7 @@ # encoding: utf-8 from __future__ import unicode_literals -from .brightcove import BrightcoveIE +from .brightcove import BrightcoveLegacyIE from .common import InfoExtractor from ..utils import ExtractorError from ..compat import ( @@ -22,7 +22,7 @@ class NownessBaseIE(InfoExtractor): 'http://www.nowness.com/iframe?id=%s' % video_id, video_id, note='Downloading player JavaScript', errnote='Unable to download player JavaScript') - bc_url = BrightcoveIE._extract_brightcove_url(player_code) + bc_url = BrightcoveLegacyIE._extract_brightcove_url(player_code) if bc_url is None: raise ExtractorError('Could not find player definition') return self.url_result(bc_url, 'Brightcove') diff --git a/youtube_dl/extractor/safari.py b/youtube_dl/extractor/safari.py index a602af692..4f1f05c6a 100644 --- a/youtube_dl/extractor/safari.py +++ b/youtube_dl/extractor/safari.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from .brightcove import BrightcoveIE +from .brightcove import BrightcoveLegacyIE from ..compat import ( compat_urllib_parse, @@ -112,7 +112,7 @@ class SafariIE(SafariBaseIE): '%s/%s/chapter-content/%s.html' % (self._API_BASE, course_id, part), part) - bc_url = BrightcoveIE._extract_brightcove_url(webpage) + bc_url = BrightcoveLegacyIE._extract_brightcove_url(webpage) if not bc_url: raise ExtractorError('Could not extract Brightcove URL from %s' % url, expected=True) diff --git a/youtube_dl/extractor/space.py b/youtube_dl/extractor/space.py index c2d0d36a6..2f190f764 100644 --- a/youtube_dl/extractor/space.py +++ b/youtube_dl/extractor/space.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from .brightcove import BrightcoveIE +from .brightcove import BrightcoveLegacyIE from ..utils import RegexNotFoundError, ExtractorError @@ -31,8 +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( 'The webpage does not contain a video', expected=True) - return self.url_result(brightcove_url, BrightcoveIE.ie_key()) + return self.url_result(brightcove_url, BrightcoveLegacyIE.ie_key()) diff --git a/youtube_dl/extractor/tlc.py b/youtube_dl/extractor/tlc.py index 13263614c..d6d038a8d 100644 --- a/youtube_dl/extractor/tlc.py +++ b/youtube_dl/extractor/tlc.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from .brightcove import BrightcoveIE +from .brightcove import BrightcoveLegacyIE from .discovery import DiscoveryIE from ..compat import compat_urlparse @@ -66,6 +66,6 @@ class TlcDeIE(InfoExtractor): return { '_type': 'url', - 'url': BrightcoveIE._extract_brightcove_url(iframe), - 'ie': BrightcoveIE.ie_key(), + 'url': BrightcoveLegacyIE._extract_brightcove_url(iframe), + 'ie': BrightcoveLegacyIE.ie_key(), }