From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 27 Sep 2013 04:25:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'rzhxeo/RTL_T'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=85748629912aff950f8945b273e9809fc8991cfe;hp=-c

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

85748629912aff950f8945b273e9809fc8991cfe
diff --combined youtube_dl/extractor/rtlnow.py
index 963e0cc8f,3783aa538..e6fa0475e
--- 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, 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]+)?(?:&.*)?)'
 +    """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]+)?(?:&.*)?)'
      _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',
@@@ -61,19 -61,6 +61,19 @@@
          u'params': {
              u'skip_download': True,
          },
 +    },
 +    {
 +        u'url': u'http://www.rtlnitronow.de/recht-ordnung/fahrradpolizei-koeln-fischereiaufsicht-ruegen.php?film_id=124311&player=1&season=1',
 +        u'file': u'124311.flv',
 +        u'info_dict': {
 +            u'upload_date': u'20130830', 
 +            u'title': u'Recht & Ordnung - Fahrradpolizei Köln & Fischereiaufsicht Rügen',
 +            u'description': u'Fahrradpolizei Köln & Fischereiaufsicht Rügen',
 +            u'thumbnail': u'http://autoimg.static-fra.de/nitronow/338273/1500x1500/image2.jpg'
 +        },
 +        u'params': {
 +            u'skip_download': True,
 +        },
      }]
  
      def _real_extract(self,url):
@@@ -92,7 -79,7 +92,7 @@@
              msg = clean_html(note_m.group(1))
              raise ExtractorError(msg)
  
-         video_title = self._html_search_regex(r'<title>(?P<title>[^<]+)</title>',
+         video_title = self._html_search_regex(r'<title>(?P<title>[^<]+?)( \| [^<]*)?</title>',
              webpage, u'title')
          playerdata_url = self._html_search_regex(r'\'playerdata\': \'(?P<playerdata_url>[^\']+)\'',
              webpage, u'playerdata_url')