diff options
| author | Pierre Rudloff <contact@rudloff.pro> | 2013-08-26 03:16:42 +0200 |
|---|---|---|
| committer | Pierre Rudloff <contact@rudloff.pro> | 2013-08-26 03:16:42 +0200 |
| commit | 7a20e2e1f8ff0893e239aa2d855d8a00a510d769 (patch) | |
| tree | 379a8ea12e5a8396f91e7ce06b076e248ceb8cf4 | |
| parent | 5c6658d4dd5ea4f25e8ae8b62a47b09f164cd30b (diff) | |
| parent | 90648143c315cc65b2449b72aec5025ff4e9ac17 (diff) | |
| download | youtube-dl-7a20e2e1f8ff0893e239aa2d855d8a00a510d769.tar.gz youtube-dl-7a20e2e1f8ff0893e239aa2d855d8a00a510d769.tar.xz youtube-dl-7a20e2e1f8ff0893e239aa2d855d8a00a510d769.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | youtube_dl/extractor/rtlnow.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/youtube_dl/extractor/rtlnow.py b/youtube_dl/extractor/rtlnow.py index 2f134e6a7..7bb236c2b 100644 --- a/youtube_dl/extractor/rtlnow.py +++ b/youtube_dl/extractor/rtlnow.py @@ -8,8 +8,8 @@ from ..utils import ( ) class RTLnowIE(InfoExtractor): - """Information Extractor for RTLnow, RTL2now and VOXnow""" - _VALID_URL = r'(?:http://)?(?P<url>(?P<base_url>rtl(?:(?P<is_rtl2>2)|-)now\.rtl(?(is_rtl2)2|)\.de/|(?:www\.)?voxnow\.de/)[a-zA-Z0-9-]+/[a-zA-Z0-9-]+\.php\?(?:container_id|film_id)=(?P<video_id>[0-9]+)&player=1(?:&season=[0-9]+)?(?:&.*)?)' + """Information Extractor for RTL NOW, RTL2 NOW, SUPER RTL NOW and VOX NOW""" + _VALID_URL = r'(?:http://)?(?P<url>(?P<base_url>rtl-now\.rtl\.de/|rtl2now\.rtl2\.de/|(?:www\.)?voxnow\.de/|(?:www\.)?superrtlnow\.de/)[a-zA-Z0-9-]+/[a-zA-Z0-9-]+\.php\?(?:container_id|film_id)=(?P<video_id>[0-9]+)&player=1(?:&season=[0-9]+)?(?:&.*)?)' _TESTS = [{ u'url': u'http://rtl-now.rtl.de/ahornallee/folge-1.php?film_id=90419&player=1&season=1', u'file': u'90419.flv', @@ -48,6 +48,19 @@ class RTLnowIE(InfoExtractor): u'params': { u'skip_download': True, }, + }, + { + u'url': u'http://superrtlnow.de/medicopter-117/angst.php?film_id=99205&player=1', + u'file': u'99205.flv', + u'info_dict': { + u'upload_date': u'20080928', + u'title': u'Medicopter 117 - Angst!', + u'description': u'Angst!', + u'thumbnail': u'http://autoimg.static-fra.de/superrtlnow/287529/1500x1500/image2.jpg' + }, + u'params': { + u'skip_download': True, + }, }] def _real_extract(self,url): |