]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Merge pull request #1310 from rzhxeo/rtlnow
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Aug 2013 22:45:22 +0000 (15:45 -0700)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Aug 2013 22:45:22 +0000 (15:45 -0700)
Add support for http://superrtlnow.de

1  2 
youtube_dl/extractor/rtlnow.py

index 2f134e6a7bbb6695197234b7833d0b55d5575be8,67f341bcc63171e2f6362fff7cd79aadeffceb60..7bb236c2b9fe02e998a9cdee38c640110f22b19c
@@@ -2,14 -2,11 +2,14 @@@
  import re
  
  from .common import InfoExtractor
 -from ..utils import ExtractorError
 +from ..utils import (
 +    clean_html,
 +    ExtractorError,
 +)
  
  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',