[canalplus] Update test file checksum

[youtube-dl.git] / youtube_dl / extractor / prosiebensat1.py

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index ec31ee7d1e22cbf526a0d9ed19af03e8357e4663..1e84b175fbd8307202caa2b94aa8f533edac85ea 100644 (file)
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -51,14 +51,14 @@ class ProSiebenSat1IE(InfoExtractor):
             'skip': 'Seems to be broken',
         },
         {
-            'url': 'http://www.prosiebenmaxx.de/yep/one-piece/video/148-folge-48-gold-rogers-heimat-ganze-folge',
+            'url': 'http://www.prosiebenmaxx.de/tv/experience/video/144-countdown-fuer-die-autowerkstatt-ganze-folge',
             'info_dict': {
-                'id': '2437108',
+                'id': '2429369',
                 'ext': 'mp4',
-                'title': 'Folge 48: Gold Rogers Heimat',
-                'description': 'Ruffy erreicht die Insel, auf der der berühmte Gold Roger lebte und hingerichtet wurde.',
-                'upload_date': '20140226',
-                'duration': 1401.48,
+                'title': 'Countdown für die Autowerkstatt',
+                'description': 'md5:809fc051a457b5d8666013bc40698817',
+                'upload_date': '20140223',
+                'duration': 2595.04,
             },
             'params': {
                 # rtmp download
@@ -160,6 +160,7 @@ class ProSiebenSat1IE(InfoExtractor):
     _CLIPID_REGEXES = [
         r'"clip_id"\s*:\s+"(\d+)"',
         r'clipid: "(\d+)"',
+        r'clipId=(\d+)',
     ]
     _TITLE_REGEXES = [
         r'<h2 class="subtitle" itemprop="name">\s*(.+?)</h2>',
@@ -263,8 +264,9 @@ class ProSiebenSat1IE(InfoExtractor):
             return bitrate / 1000 if bitrate % 1000 == 0 else bitrate
 
         for source in urls_sources:
-            if source['protocol'] == 'rtmp':
-                mobj = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', source['url'])
+            protocol = source['protocol']
+            if protocol == 'rtmp' or protocol == 'rtmpe':
+                mobj = re.search(r'^(?P<url>rtmpe?://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', source['url'])
                 if not mobj:
                     continue
                 formats.append({
@@ -280,7 +282,7 @@ class ProSiebenSat1IE(InfoExtractor):
             else:
                 formats.append({
                     'url': source['url'],
-                    'vbr': fix_bitrate(sources['bitrate']),
+                    'vbr': fix_bitrate(source['bitrate']),
                 })
 
         self._sort_formats(formats)