projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some regexes
[youtube-dl]
/
youtube_dl
/
extractor
/
npo.py
diff --git
a/youtube_dl/extractor/npo.py
b/youtube_dl/extractor/npo.py
index 5f8b6def1251b711a3d373c53cd3e1bd8e7645f2..b8fe244071d05e1daac7514b932be148802c21a7 100644
(file)
--- a/
youtube_dl/extractor/npo.py
+++ b/
youtube_dl/extractor/npo.py
@@
-28,7
+28,7
@@
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:|
_VALID_URL = r'''(?x)
(?:
npo:|
@@
-38,7
+38,7
@@
class NPOIE(NPOBaseIE):
npo\.nl/(?!(?:live|radio)/)(?:[^/]+/){2}|
ntr\.nl/(?:[^/]+/){2,}|
omroepwnl\.nl/video/fragment/[^/]+__|
npo\.nl/(?!(?:live|radio)/)(?:[^/]+/){2}|
ntr\.nl/(?:[^/]+/){2,}|
omroepwnl\.nl/video/fragment/[^/]+__|
- zapp\.nl/[^/]+/[^/]+/
+ (?:zapp|npo3)\.nl/(?:[^/]+/){2}
)
)
(?P<id>[^/?#]+)
)
)
(?P<id>[^/?#]+)
@@
-146,6
+146,9
@@
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',
}, {
# live stream
'url': 'npo:LI_NL1_4188102',
@@
-341,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',
@@
-466,7
+469,7
@@
class SchoolTVIE(NPODataMidEmbedIE):
class HetKlokhuisIE(NPODataMidEmbedIE):
IE_NAME = 'hetklokhuis'
class HetKlokhuisIE(NPODataMidEmbedIE):
IE_NAME = 'hetklokhuis'
- _VALID_URL = r'https?://(?:www\.)?hetklokhuis.nl/[^/]+/\d+/(?P<id>[^/?#&]+)'
+ _VALID_URL = r'https?://(?:www\.)?hetklokhuis
\
.nl/[^/]+/\d+/(?P<id>[^/?#&]+)'
_TEST = {
'url': 'http://hetklokhuis.nl/tv-uitzending/3471/Zwaartekrachtsgolven',
_TEST = {
'url': 'http://hetklokhuis.nl/tv-uitzending/3471/Zwaartekrachtsgolven',