projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7045 from remitamine/ign
[youtube-dl]
/
youtube_dl
/
extractor
/
nowtv.py
diff --git
a/youtube_dl/extractor/nowtv.py
b/youtube_dl/extractor/nowtv.py
index 67e34b294520faa6d8320c719471dcfe89c71fa9..fd107aca26739d7f76eb75ef14633068243a8755 100644
(file)
--- a/
youtube_dl/extractor/nowtv.py
+++ b/
youtube_dl/extractor/nowtv.py
@@
-71,7
+71,7
@@
class NowTVBaseIE(InfoExtractor):
class NowTVIE(NowTVBaseIE):
class NowTVIE(NowTVBaseIE):
- _VALID_URL = r'https?://(?:www\.)?nowtv\.(?:de|at|ch)/(?:rtl|rtl2|rtlnitro|superrtl|ntv|vox)/(?P<show_id>[^/]+)/(?:
list/[^/]+
/)?(?P<id>[^/]+)/(?:player|preview)'
+ _VALID_URL = r'https?://(?:www\.)?nowtv\.(?:de|at|ch)/(?:rtl|rtl2|rtlnitro|superrtl|ntv|vox)/(?P<show_id>[^/]+)/(?:
(?:list/[^/]+|jahr/\d{4}/\d{1,2})
/)?(?P<id>[^/]+)/(?:player|preview)'
_TESTS = [{
# rtl
_TESTS = [{
# rtl
@@
-190,6
+190,9
@@
class NowTVIE(NowTVBaseIE):
}, {
'url': 'http://www.nowtv.de/rtl2/echtzeit/list/aktuell/schnelles-geld-am-ende-der-welt/player',
'only_matching': True,
}, {
'url': 'http://www.nowtv.de/rtl2/echtzeit/list/aktuell/schnelles-geld-am-ende-der-welt/player',
'only_matching': True,
+ }, {
+ 'url': 'http://www.nowtv.de/rtl2/zuhause-im-glueck/jahr/2015/11/eine-erschuetternde-diagnose/player',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):