mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-25 16:42:53 +01:00
[npo] Extend _VALID_URL (closes #16682)
This commit is contained in:
parent
ff2e486221
commit
9d581efe05
@ -36,8 +36,8 @@ class NPOIE(NPOBaseIE):
|
|||||||
https?://
|
https?://
|
||||||
(?:www\.)?
|
(?:www\.)?
|
||||||
(?:
|
(?:
|
||||||
npo\.nl/(?!(?:live|radio)/)(?:[^/]+/){2}|
|
npo\.nl/(?:[^/]+/)*|
|
||||||
ntr\.nl/(?:[^/]+/){2,}|
|
(?:ntr|npostart)\.nl/(?:[^/]+/){2,}|
|
||||||
omroepwnl\.nl/video/fragment/[^/]+__|
|
omroepwnl\.nl/video/fragment/[^/]+__|
|
||||||
(?:zapp|npo3)\.nl/(?:[^/]+/){2,}
|
(?:zapp|npo3)\.nl/(?:[^/]+/){2,}
|
||||||
)
|
)
|
||||||
@ -160,8 +160,20 @@ class NPOIE(NPOBaseIE):
|
|||||||
}, {
|
}, {
|
||||||
'url': 'https://www.zapp.nl/1803-skelterlab/instructie-video-s/740-instructievideo-s/POMS_AT_11736927',
|
'url': 'https://www.zapp.nl/1803-skelterlab/instructie-video-s/740-instructievideo-s/POMS_AT_11736927',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.npostart.nl/broodje-gezond-ei/28-05-2018/KN_1698996',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://npo.nl/KN_1698996',
|
||||||
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def suitable(cls, url):
|
||||||
|
return (False if any(ie.suitable(url)
|
||||||
|
for ie in (NPOLiveIE, NPORadioIE, NPORadioFragmentIE))
|
||||||
|
else super(NPOIE, cls).suitable(url))
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
return self._get_info(video_id)
|
return self._get_info(video_id)
|
||||||
@ -389,7 +401,7 @@ class NPOLiveIE(NPOBaseIE):
|
|||||||
|
|
||||||
class NPORadioIE(InfoExtractor):
|
class NPORadioIE(InfoExtractor):
|
||||||
IE_NAME = 'npo.nl:radio'
|
IE_NAME = 'npo.nl:radio'
|
||||||
_VALID_URL = r'https?://(?:www\.)?npo\.nl/radio/(?P<id>[^/]+)/?$'
|
_VALID_URL = r'https?://(?:www\.)?npo\.nl/radio/(?P<id>[^/]+)'
|
||||||
|
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://www.npo.nl/radio/radio-1',
|
'url': 'http://www.npo.nl/radio/radio-1',
|
||||||
@ -404,6 +416,10 @@ class NPORadioIE(InfoExtractor):
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def suitable(cls, url):
|
||||||
|
return False if NPORadioFragmentIE.suitable(url) else super(NPORadioIE, cls).suitable(url)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _html_get_attribute_regex(attribute):
|
def _html_get_attribute_regex(attribute):
|
||||||
return r'{0}\s*=\s*\'([^\']+)\''.format(attribute)
|
return r'{0}\s*=\s*\'([^\']+)\''.format(attribute)
|
||||||
|
Loading…
Reference in New Issue
Block a user