projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FFmpegMergerPP: use the new system for specifying which files can be delete
[youtube-dl]
/
youtube_dl
/
extractor
/
khanacademy.py
diff --git
a/youtube_dl/extractor/khanacademy.py
b/youtube_dl/extractor/khanacademy.py
index 04bac7517134d3c7f78f4ee467506bc38374593b..08a671fa86a007d3327ef03c257f1b943bd425db 100644
(file)
--- a/
youtube_dl/extractor/khanacademy.py
+++ b/
youtube_dl/extractor/khanacademy.py
@@
-9,7
+9,7
@@
from ..utils import (
class KhanAcademyIE(InfoExtractor):
class KhanAcademyIE(InfoExtractor):
- _VALID_URL = r'^https?://(?:
www
\.)?khanacademy\.org/(?P<key>[^/]+)/(?:[^/]+/){,2}(?P<id>[^?#/]+)(?:$|[?#])'
+ _VALID_URL = r'^https?://(?:
(?:www|api)
\.)?khanacademy\.org/(?P<key>[^/]+)/(?:[^/]+/){,2}(?P<id>[^?#/]+)(?:$|[?#])'
IE_NAME = 'KhanAcademy'
_TESTS = [{
IE_NAME = 'KhanAcademy'
_TESTS = [{
@@
-22,8
+22,10
@@
class KhanAcademyIE(InfoExtractor):
'description': 'The perfect cipher',
'duration': 176,
'uploader': 'Brit Cruise',
'description': 'The perfect cipher',
'duration': 176,
'uploader': 'Brit Cruise',
+ 'uploader_id': 'khanacademy',
'upload_date': '20120411',
'upload_date': '20120411',
- }
+ },
+ 'add_ie': ['Youtube'],
}, {
'url': 'https://www.khanacademy.org/math/applied-math/cryptography',
'info_dict': {
}, {
'url': 'https://www.khanacademy.org/math/applied-math/cryptography',
'info_dict': {