projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5eb778b
)
[npo] Extend _VALID_URL to support ntr.nl (Closes #6248)
author
Sergey M․
<dstftw@gmail.com>
Thu, 16 Jul 2015 17:21:04 +0000
(23:21 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 16 Jul 2015 17:21:04 +0000
(23:21 +0600)
youtube_dl/extractor/npo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/npo.py
b/youtube_dl/extractor/npo.py
index 62d12b7a66c7722c0b51d15092a26aa9e1f03416..1c823ec7f4a5e5d2a88825a9545008f26a87019b 100644
(file)
--- a/
youtube_dl/extractor/npo.py
+++ b/
youtube_dl/extractor/npo.py
@@
-37,8
+37,9
@@
class NPOBaseIE(InfoExtractor):
class NPOIE(NPOBaseIE):
class NPOIE(NPOBaseIE):
- IE_NAME = 'npo.nl'
- _VALID_URL = r'https?://(?:www\.)?npo\.nl/(?!live|radio)[^/]+/[^/]+/(?P<id>[^/?]+)'
+ IE_NAME = 'npo'
+ IE_DESC = 'npo.nl and ntr.nl'
+ _VALID_URL = r'https?://(?:www\.)?(?:npo|ntr)\.nl/(?!live|radio)(?:[^/]+/){2,}(?P<id>[^/?#]+)'
_TESTS = [
{
_TESTS = [
{
@@
-100,6
+101,18
@@
class NPOIE(NPOBaseIE):
'title': 'Hoe gaat Europa verder na Parijs?',
},
},
'title': 'Hoe gaat Europa verder na Parijs?',
},
},
+ {
+ 'url': 'http://www.ntr.nl/Aap-Poot-Pies/27/detail/Aap-poot-pies/VPWON_1233944#content',
+ 'md5': '01c6a2841675995da1f0cf776f03a9c3',
+ 'info_dict': {
+ 'id': 'VPWON_1233944',
+ 'ext': 'm4v',
+ 'title': 'Aap, poot, pies',
+ 'description': 'md5:c9c8005d1869ae65b858e82c01a91fde',
+ 'upload_date': '20150508',
+ 'duration': 599,
+ },
+ }
]
def _real_extract(self, url):
]
def _real_extract(self, url):