paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[brightcove] Rename extractor to brightcove legacy

Browse Source 
Old embedding approaches are now "Legacy Studio"
This commit is contained in:
Sergey M․ 2015-11-14 05:54:16 +06:00
parent 536f819eda
commit 4fcaa4f4a5
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/__init__.py
View File

@ -61,7 +61,7 @@ from .bpb import BpbIE
from .br import BRIE from .br import BRIE
from .breakcom import BreakIE from .breakcom import BreakIE
from .brightcove import ( from .brightcove import (
BrightcoveIE, BrightcoveLegacyIE,
BrightcoveInPageEmbedIE, BrightcoveInPageEmbedIE,
) )
from .buzzfeed import BuzzFeedIE from .buzzfeed import BuzzFeedIE

2
youtube_dl/extractor/brightcove.py
View File

@ -30,7 +30,7 @@ from ..utils import (
) )
class BrightcoveIE(InfoExtractor): class BrightcoveLegacyIE(InfoExtractor):
_VALID_URL = r'(?:https?://.*brightcove\.com/(services|viewer).*?\?|brightcove:)(?P<query>.*)' _VALID_URL = r'(?:https?://.*brightcove\.com/(services|viewer).*?\?|brightcove:)(?P<query>.*)'
_FEDERATED_URL_TEMPLATE = 'http://c.brightcove.com/services/viewer/htmlFederated?%s' _FEDERATED_URL_TEMPLATE = 'http://c.brightcove.com/services/viewer/htmlFederated?%s'

4
youtube_dl/extractor/generic.py
View File

@ -31,7 +31,7 @@ from ..utils import (
xpath_text, xpath_text,
) )
from .brightcove import ( from .brightcove import (
BrightcoveIE, BrightcoveLegacyIE,
BrightcoveInPageEmbedIE, BrightcoveInPageEmbedIE,
) )
from .nbc import NBCSportsVPlayerIE from .nbc import NBCSportsVPlayerIE
@ -1305,7 +1305,7 @@ class GenericIE(InfoExtractor):
urlrs, playlist_id=video_id, playlist_title=video_title) urlrs, playlist_id=video_id, playlist_title=video_title)
# Look for BrightCove: # Look for BrightCove:
bc_urls = BrightcoveIE._extract_brightcove_urls(webpage) bc_urls = BrightcoveLegacyIE._extract_brightcove_urls(webpage)
if bc_urls: if bc_urls:
self.to_screen('Brightcove video detected.') self.to_screen('Brightcove video detected.')
entries = [{ entries = [{

4
youtube_dl/extractor/nowness.py
View File

@ -1,7 +1,7 @@
# encoding: utf-8 # encoding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from .brightcove import BrightcoveIE from .brightcove import BrightcoveLegacyIE
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ExtractorError from ..utils import ExtractorError
from ..compat import ( from ..compat import (
@ -22,7 +22,7 @@ class NownessBaseIE(InfoExtractor):
'http://www.nowness.com/iframe?id=%s' % video_id, video_id, 'http://www.nowness.com/iframe?id=%s' % video_id, video_id,
note='Downloading player JavaScript', note='Downloading player JavaScript',
errnote='Unable to download 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: if bc_url is None:
raise ExtractorError('Could not find player definition') raise ExtractorError('Could not find player definition')
return self.url_result(bc_url, 'Brightcove') return self.url_result(bc_url, 'Brightcove')

4
youtube_dl/extractor/safari.py
View File

@ -4,7 +4,7 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from .brightcove import BrightcoveIE from .brightcove import BrightcoveLegacyIE
from ..compat import ( from ..compat import (
compat_urllib_parse, compat_urllib_parse,
@ -112,7 +112,7 @@ class SafariIE(SafariBaseIE):
'%s/%s/chapter-content/%s.html' % (self._API_BASE, course_id, part), '%s/%s/chapter-content/%s.html' % (self._API_BASE, course_id, part),
part) part)
bc_url = BrightcoveIE._extract_brightcove_url(webpage) bc_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)
if not bc_url: if not bc_url:
raise ExtractorError('Could not extract Brightcove URL from %s' % url, expected=True) raise ExtractorError('Could not extract Brightcove URL from %s' % url, expected=True)

6
youtube_dl/extractor/space.py
View File

@ -3,7 +3,7 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from .brightcove import BrightcoveIE from .brightcove import BrightcoveLegacyIE
from ..utils import RegexNotFoundError, ExtractorError from ..utils import RegexNotFoundError, ExtractorError
@ -31,8 +31,8 @@ class SpaceIE(InfoExtractor):
brightcove_url = self._og_search_video_url(webpage) brightcove_url = self._og_search_video_url(webpage)
except RegexNotFoundError: except RegexNotFoundError:
# Other videos works fine with the info from the object # 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: if brightcove_url is None:
raise ExtractorError( raise ExtractorError(
'The webpage does not contain a video', expected=True) '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())

6
youtube_dl/extractor/tlc.py
View File

@ -3,7 +3,7 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from .brightcove import BrightcoveIE from .brightcove import BrightcoveLegacyIE
from .discovery import DiscoveryIE from .discovery import DiscoveryIE
from ..compat import compat_urlparse from ..compat import compat_urlparse
@ -66,6 +66,6 @@ class TlcDeIE(InfoExtractor):
return { return {
'_type': 'url', '_type': 'url',
'url': BrightcoveIE._extract_brightcove_url(iframe), 'url': BrightcoveLegacyIE._extract_brightcove_url(iframe),
'ie': BrightcoveIE.ie_key(), 'ie': BrightcoveLegacyIE.ie_key(),
} }