From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 3 Oct 2013 22:59:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'rzhxeo/rtl_ntv'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=3cd022f6e6696e6bc632f5bb2898191521acbb8b;hp=-c;p=youtube-dl.git

Merge remote-tracking branch 'rzhxeo/rtl_ntv'
---

3cd022f6e6696e6bc632f5bb2898191521acbb8b
diff --combined youtube_dl/extractor/rtlnow.py
index a156666f9,fe66cc6e5..580f9e6d5
--- a/youtube_dl/extractor/rtlnow.py
+++ b/youtube_dl/extractor/rtlnow.py
@@@ -8,8 -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 +74,18 @@@
          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):
@@@ -98,17 -110,14 +110,17 @@@
              webpage, u'playerdata_url')
  
          playerdata = self._download_webpage(playerdata_url, video_id)
 -        mobj = re.search(r'<title><!\[CDATA\[(?P<description>.+?)\s+- (?:Sendung )?vom (?P<upload_date_d>[0-9]{2})\.(?P<upload_date_m>[0-9]{2})\.(?:(?P<upload_date_Y>[0-9]{4})|(?P<upload_date_y>[0-9]{2})) [0-9]{2}:[0-9]{2} Uhr\]\]></title>', playerdata)
 +        mobj = re.search(r'<title><!\[CDATA\[(?P<description>.+?)(?:\s+- (?:Sendung )?vom (?P<upload_date_d>[0-9]{2})\.(?P<upload_date_m>[0-9]{2})\.(?:(?P<upload_date_Y>[0-9]{4})|(?P<upload_date_y>[0-9]{2})) [0-9]{2}:[0-9]{2} Uhr)?\]\]></title>', playerdata)
          if mobj:
              video_description = mobj.group(u'description')
              if mobj.group('upload_date_Y'):
                  video_upload_date = mobj.group('upload_date_Y')
 -            else:
 +            elif mobj.group('upload_date_y'):
                  video_upload_date = u'20' + mobj.group('upload_date_y')
 -            video_upload_date += mobj.group('upload_date_m')+mobj.group('upload_date_d')
 +            else:
 +                video_upload_date = None
 +            if video_upload_date:
 +                video_upload_date += mobj.group('upload_date_m')+mobj.group('upload_date_d')
          else:
              video_description = None
              video_upload_date = None