aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-04 00:59:11 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-04 00:59:11 +0200
commit3cd022f6e6696e6bc632f5bb2898191521acbb8b (patch)
tree57fa1803630608de79375bd7c4cc45d025a7aff6 /youtube_dl
parentabefd1f7c4c309aa7d9fec478fc437a7a1d2eb99 (diff)
parent4c62a16f4f4994c63e80eafcaeb5e6ff90305c38 (diff)
Merge remote-tracking branch 'rzhxeo/rtl_ntv'
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/rtlnow.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/youtube_dl/extractor/rtlnow.py b/youtube_dl/extractor/rtlnow.py
index a156666f9..580f9e6d5 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 RTL NOW, RTL2 NOW, RTL NITRO, 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\.)?rtlnitronow\.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]+)?(?:&.*)?)'
+ """Information Extractor for RTL NOW, RTL2 NOW, RTL NITRO, SUPER RTL NOW, VOX NOW and n-tv NOW"""
+ _VALID_URL = r'(?:http://)?(?P<url>(?P<base_url>rtl-now\.rtl\.de/|rtl2now\.rtl2\.de/|(?:www\.)?voxnow\.de/|(?:www\.)?rtlnitronow\.de/|(?:www\.)?superrtlnow\.de/|(?:www\.)?n-tvnow\.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',
@@ -74,6 +74,18 @@ class RTLnowIE(InfoExtractor):
u'params': {
u'skip_download': True,
},
+ },
+ {
+ u'url': u'http://www.n-tvnow.de/top-gear/episode-1-2013-01-01-00-00-00.php?film_id=124903&player=1&season=10',
+ u'file': u'124903.flv',
+ u'info_dict': {
+ u'upload_date': u'20130101',
+ u'title': u'Top Gear vom 01.01.2013',
+ u'description': u'Episode 1',
+ },
+ u'params': {
+ u'skip_download': True,
+ },
}]
def _real_extract(self,url):