|
|
@ -313,9 +313,9 @@ class NPOIE(NPOBaseIE):
|
|
|
|
|
|
|
|
|
|
|
|
class NPOLiveIE(NPOBaseIE):
|
|
|
|
class NPOLiveIE(NPOBaseIE):
|
|
|
|
IE_NAME = 'npo.nl:live'
|
|
|
|
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>[^/?#&]+))?'
|
|
|
|
|
|
|
|
|
|
|
|
_TEST = {
|
|
|
|
_TESTS = [{
|
|
|
|
'url': 'http://www.npo.nl/live/npo-1',
|
|
|
|
'url': 'http://www.npo.nl/live/npo-1',
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': 'LI_NL1_4188102',
|
|
|
|
'id': 'LI_NL1_4188102',
|
|
|
@ -327,10 +327,22 @@ class NPOLiveIE(NPOBaseIE):
|
|
|
|
'params': {
|
|
|
|
'params': {
|
|
|
|
'skip_download': True,
|
|
|
|
'skip_download': True,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}, {
|
|
|
|
|
|
|
|
'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,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}]
|
|
|
|
|
|
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
|
def _real_extract(self, url):
|
|
|
|
display_id = self._match_id(url)
|
|
|
|
display_id = self._match_id(url) or 'npo-1'
|
|
|
|
|
|
|
|
|
|
|
|
webpage = self._download_webpage(url, display_id)
|
|
|
|
webpage = self._download_webpage(url, display_id)
|
|
|
|
|
|
|
|
|
|
|
|