mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-15 18:34:22 +00:00
[teachingchannel] fix extraction
This commit is contained in:
parent
ddfe50195b
commit
3765284476
@ -1,35 +1,33 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from .ooyala import OoyalaIE
|
|
||||||
|
|
||||||
|
|
||||||
class TeachingChannelIE(InfoExtractor):
|
class TeachingChannelIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?teachingchannel\.org/videos/(?P<title>.+)'
|
_VALID_URL = r'https?://(?:www\.)?teachingchannel\.org/videos?/(?P<id>[^/?&#]+)'
|
||||||
|
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'https://www.teachingchannel.org/videos/teacher-teaming-evolution',
|
'url': 'https://www.teachingchannel.org/videos/teacher-teaming-evolution',
|
||||||
'md5': '3d6361864d7cac20b57c8784da17166f',
|
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'F3bnlzbToeI6pLEfRyrlfooIILUjz4nM',
|
'id': '3swwlzkT',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'A History of Teaming',
|
'title': 'A History of Teaming',
|
||||||
'description': 'md5:2a9033db8da81f2edffa4c99888140b3',
|
'description': 'md5:2a9033db8da81f2edffa4c99888140b3',
|
||||||
'duration': 422.255,
|
'duration': 422,
|
||||||
|
'upload_date': '20170316',
|
||||||
|
'timestamp': 1489691297,
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
'add_ie': ['Ooyala'],
|
'add_ie': ['JWPlatform'],
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
display_id = self._match_id(url)
|
||||||
title = mobj.group('title')
|
webpage = self._download_webpage(url, display_id)
|
||||||
webpage = self._download_webpage(url, title)
|
mid = self._search_regex(
|
||||||
ooyala_code = self._search_regex(
|
r'(?:data-mid=["\']|id=["\']jw-video-player-)([a-zA-Z0-9]{8})',
|
||||||
r'data-embed-code=\'(.+?)\'', webpage, 'ooyala code')
|
webpage, 'media id')
|
||||||
|
|
||||||
return OoyalaIE._build_url_result(ooyala_code)
|
return self.url_result('jwplatform:' + mid, 'JWPlatform', mid)
|
||||||
|
Loading…
Reference in New Issue
Block a user