projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
95a1322
)
[nationalgeographic] Add support for new URL schema (closes #16001)
author
kenavera
<kenavera@users.noreply.github.com>
Sun, 1 Apr 2018 14:22:51 +0000
(16:22 +0200)
committer
Sergey M
<dstftw@gmail.com>
Sun, 1 Apr 2018 14:22:51 +0000
(21:22 +0700)
youtube_dl/extractor/nationalgeographic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/nationalgeographic.py
b/youtube_dl/extractor/nationalgeographic.py
index 246f6795a131908bf62c2b8c1477a7bc327afce5..4d2ee64080710a0a531aaf391eeb116da730cc89 100644
(file)
--- a/
youtube_dl/extractor/nationalgeographic.py
+++ b/
youtube_dl/extractor/nationalgeographic.py
@@
-68,11
+68,11
@@
class NationalGeographicVideoIE(InfoExtractor):
class NationalGeographicIE(ThePlatformIE, AdobePassIE):
IE_NAME = 'natgeo'
class NationalGeographicIE(ThePlatformIE, AdobePassIE):
IE_NAME = 'natgeo'
- _VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:(?:
wild/)?[^/]+/)?(?:videos|episodes
)/(?P<id>[^/?]+)'
+ _VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:(?:
(?:wild/)?[^/]+/)?(?:videos|episodes)|u
)/(?P<id>[^/?]+)'
_TESTS = [
{
_TESTS = [
{
- 'url': 'http://channel.nationalgeographic.com/
the-story-of-god-with-morgan-freeman/videos/uncovering-a-universal-knowledge
/',
+ 'url': 'http://channel.nationalgeographic.com/
u/kdi9Ld0PN2molUUIMSBGxoeDhD729KRjQcnxtetilWPMevo8ZwUBIDuPR0Q3D2LVaTsk0MPRkRWDB8ZhqWVeyoxfsZZm36yRp1j-zPfsHEyI_EgAeFY
/',
'md5': '518c9aa655686cf81493af5cc21e2a04',
'info_dict': {
'id': 'vKInpacll2pC',
'md5': '518c9aa655686cf81493af5cc21e2a04',
'info_dict': {
'id': 'vKInpacll2pC',
@@
-86,7
+86,7
@@
class NationalGeographicIE(ThePlatformIE, AdobePassIE):
'add_ie': ['ThePlatform'],
},
{
'add_ie': ['ThePlatform'],
},
{
- 'url': 'http://channel.nationalgeographic.com/
wild/destination-wild/videos/the-stunning-red-bird-of-paradise
/',
+ 'url': 'http://channel.nationalgeographic.com/
u/kdvOstqYaBY-vSBPyYgAZRUL4sWUJ5XUUPEhc7ISyBHqoIO4_dzfY3K6EjHIC0hmFXoQ7Cpzm6RkET7S3oMlm6CFnrQwSUwo
/',
'md5': 'c4912f656b4cbe58f3e000c489360989',
'info_dict': {
'id': 'Pok5lWCkiEFA',
'md5': 'c4912f656b4cbe58f3e000c489360989',
'info_dict': {
'id': 'Pok5lWCkiEFA',
@@
-106,6
+106,14
@@
class NationalGeographicIE(ThePlatformIE, AdobePassIE):
{
'url': 'http://channel.nationalgeographic.com/videos/treasures-rediscovered/',
'only_matching': True,
{
'url': 'http://channel.nationalgeographic.com/videos/treasures-rediscovered/',
'only_matching': True,
+ },
+ {
+ 'url': 'http://channel.nationalgeographic.com/the-story-of-god-with-morgan-freeman/videos/uncovering-a-universal-knowledge/',
+ 'only_matching': True,
+ },
+ {
+ 'url': 'http://channel.nationalgeographic.com/wild/destination-wild/videos/the-stunning-red-bird-of-paradise/',
+ 'only_matching': True,
}
]
}
]