projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ddfe501
)
[teachingchannel] fix extraction
author
Remita Amine
<remitamine@gmail.com>
Sat, 30 Nov 2019 22:49:45 +0000
(23:49 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Sat, 30 Nov 2019 22:49:45 +0000
(23:49 +0100)
youtube_dl/extractor/teachingchannel.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/teachingchannel.py
b/youtube_dl/extractor/teachingchannel.py
index e89759714e6e3cea3da8a7007df838618f6f1cc1..624cdb3adcaf8644fe2c816970fbe990656968ef 100644
(file)
--- a/
youtube_dl/extractor/teachingchannel.py
+++ b/
youtube_dl/extractor/teachingchannel.py
@@
-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 = {
'url': 'https://www.teachingchannel.org/videos/teacher-teaming-evolution',
_TEST = {
'url': 'https://www.teachingchannel.org/videos/teacher-teaming-evolution',
- 'md5': '3d6361864d7cac20b57c8784da17166f',
'info_dict': {
'info_dict': {
- 'id': '
F3bnlzbToeI6pLEfRyrlfooIILUjz4nM
',
+ 'id': '
3swwlzkT
',
'ext': 'mp4',
'title': 'A History of Teaming',
'description': 'md5:2a9033db8da81f2edffa4c99888140b3',
'ext': 'mp4',
'title': 'A History of Teaming',
'description': 'md5:2a9033db8da81f2edffa4c99888140b3',
- 'duration': 422.255,
+ 'duration': 422,
+ 'upload_date': '20170316',
+ 'timestamp': 1489691297,
},
'params': {
'skip_download': True,
},
},
'params': {
'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)
-
title = mobj.group('title'
)
- webpage = self._download_webpage(url, title)
- ooyala_code = self._search_regex(
-
r'data-embed-code=\'(.+?)\'', webpage, 'ooyala code
')
+
display_id = self._match_id(
url)
+
webpage = self._download_webpage(url, display_id
)
+ mid = self._search_regex(
+ r'(?:data-mid=["\']|id=["\']jw-video-player-)([a-zA-Z0-9]{8})',
+
webpage, 'media id
')
- return
OoyalaIE._build_url_result(ooyala_code
)
+ return
self.url_result('jwplatform:' + mid, 'JWPlatform', mid
)