projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[animeondemand] Improve and modernize
[youtube-dl]
/
youtube_dl
/
extractor
/
npo.py
diff --git
a/youtube_dl/extractor/npo.py
b/youtube_dl/extractor/npo.py
index d1c9bc20e42bdd061bceff8300026dbe42f3a4d3..fa4ef20c52959240af41a0c8a7b08c02fd3eb54c 100644
(file)
--- a/
youtube_dl/extractor/npo.py
+++ b/
youtube_dl/extractor/npo.py
@@
-28,17
+28,17
@@
class NPOBaseIE(InfoExtractor):
class NPOIE(NPOBaseIE):
IE_NAME = 'npo'
class NPOIE(NPOBaseIE):
IE_NAME = 'npo'
- IE_DESC = 'npo.nl
and ntr
.nl'
+ IE_DESC = 'npo.nl
, ntr.nl, omroepwnl.nl, zapp.nl and npo3
.nl'
_VALID_URL = r'''(?x)
(?:
npo:|
https?://
(?:www\.)?
(?:
_VALID_URL = r'''(?x)
(?:
npo:|
https?://
(?:www\.)?
(?:
- npo\.nl/(?!
live|radio
)(?:[^/]+/){2}|
+ npo\.nl/(?!
(?:live|radio)/
)(?:[^/]+/){2}|
ntr\.nl/(?:[^/]+/){2,}|
omroepwnl\.nl/video/fragment/[^/]+__|
ntr\.nl/(?:[^/]+/){2,}|
omroepwnl\.nl/video/fragment/[^/]+__|
- zapp\.nl/[^/]+/[^/]+/
+ (?:zapp|npo3)\.nl/(?:[^/]+/){2}
)
)
(?P<id>[^/?#]+)
)
)
(?P<id>[^/?#]+)
@@
-146,10
+146,16
@@
class NPOIE(NPOBaseIE):
}, {
'url': 'http://www.zapp.nl/beste-vrienden-quiz/extra-video-s/WO_NTR_1067990',
'only_matching': True,
}, {
'url': 'http://www.zapp.nl/beste-vrienden-quiz/extra-video-s/WO_NTR_1067990',
'only_matching': True,
+ }, {
+ 'url': 'https://www.npo3.nl/3onderzoekt/16-09-2015/VPWON_1239870',
+ 'only_matching': True,
}, {
# live stream
'url': 'npo:LI_NL1_4188102',
'only_matching': True,
}, {
# live stream
'url': 'npo:LI_NL1_4188102',
'only_matching': True,
+ }, {
+ 'url': 'http://www.npo.nl/radio-gaga/13-06-2017/BNN_101383373',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-313,7
+319,7
@@
class NPOIE(NPOBaseIE):
class NPOLiveIE(NPOBaseIE):
IE_NAME = 'npo.nl:live'
class NPOLiveIE(NPOBaseIE):
IE_NAME = 'npo.nl:live'
- _VALID_URL = r'https?://(?:www\.)?npo\.nl/live(/(?P<id>[^/?#&]+))?'
+ _VALID_URL = r'https?://(?:www\.)?npo\.nl/live(
?:
/(?P<id>[^/?#&]+))?'
_TESTS = [{
'url': 'http://www.npo.nl/live/npo-1',
_TESTS = [{
'url': 'http://www.npo.nl/live/npo-1',
@@
-329,16
+335,7
@@
class NPOLiveIE(NPOBaseIE):
}
}, {
'url': 'http://www.npo.nl/live',
}
}, {
'url': 'http://www.npo.nl/live',
- 'info_dict': {
- 'id': 'LI_NL1_4188102',
- 'display_id': 'npo-1',
- 'ext': 'mp4',
- 'title': 're:^NPO 1 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
- 'is_live': True,
- },
- 'params': {
- 'skip_download': True,
- }
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-347,7
+344,7
@@
class NPOLiveIE(NPOBaseIE):
webpage = self._download_webpage(url, display_id)
live_id = self._search_regex(
webpage = self._download_webpage(url, display_id)
live_id = self._search_regex(
-
r'data-prid="([^"]+)"'
, webpage, 'live id')
+
[r'media-id="([^"]+)"', r'data-prid="([^"]+)"']
, webpage, 'live id')
return {
'_type': 'url_transparent',
return {
'_type': 'url_transparent',