X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fstreamcz.py;h=73efe95420ff7b83412864de02d8d5601690b537;hb=e423e0baaabe16e80af693d1f05ffc560747b3b8;hp=cb50aee3f54cda1fc395286fe50d9a93edb4a41d;hpb=18395217c489f1b324ea7b85305f8b2edaf237c9;p=youtube-dl

diff --git a/youtube_dl/extractor/streamcz.py b/youtube_dl/extractor/streamcz.py
index cb50aee3f..73efe9542 100644
--- a/youtube_dl/extractor/streamcz.py
+++ b/youtube_dl/extractor/streamcz.py
@@ -5,10 +5,14 @@ import re
 import json
 
 from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    compat_str,
+)
 
 
 class StreamCZIE(InfoExtractor):
-    _VALID_URL = r'https?://www\.stream\.cz/((?P<category>.+)/)?(?P<videogroup>.+)/(?P<videoid>.+)'
+    _VALID_URL = r'https?://(?:www\.)?stream\.cz/.+/(?P<videoid>.+)'
 
     _TESTS = [{
         'url': 'http://www.stream.cz/peklonataliri/765767-ecka-pro-deti',
@@ -19,9 +23,20 @@ class StreamCZIE(InfoExtractor):
             'title': 'Peklo na talíři: Éčka pro děti',
             'description': 'md5:49ace0df986e95e331d0fe239d421519',
             'thumbnail': 'http://im.stream.cz/episode/52961d7e19d423f8f06f0100',
+            'duration': 256,
         },
-    },
-    ]
+    }, {
+        'url': 'http://www.stream.cz/blanik/10002447-tri-roky-pro-mazanka',
+        'md5': '246272e753e26bbace7fcd9deca0650c',
+        'info_dict': {
+            'id': '10002447',
+            'ext': 'mp4',
+            'title': 'Kancelář Blaník: Tři roky pro Mazánka',
+            'description': 'md5:9177695a8b756a0a8ab160de4043b392',
+            'thumbnail': 'http://im.stream.cz/episode/537f838c50c11f8d21320000',
+            'duration': 368,
+        },
+    }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
@@ -35,30 +50,32 @@ class StreamCZIE(InfoExtractor):
 
         formats = []
         for video in jsonData['instances']:
-            format_id = video['instances'][0]['quality']
+            for video_format in video['instances']:
+                format_id = video_format['quality']
 
-            if format_id == '240p':
-                quality = 0
-            elif format_id == '360p':
-                quality = 1
-            elif format_id == '480p':
-                quality = 2
-            elif format_id == '720p':
-                quality = 3
+                if format_id == '240p':
+                    quality = 0
+                elif format_id == '360p':
+                    quality = 1
+                elif format_id == '480p':
+                    quality = 2
+                elif format_id == '720p':
+                    quality = 3
 
-            formats.append({
-                'format_id': format_id,
-                'url': video['instances'][0]['source'],
-                'quality': quality,
-                'ext': 'mp4',
-            })
+                formats.append({
+                    'format_id': '%s-%s' % (video_format['type'].split('/')[1], format_id),
+                    'url': video_format['source'],
+                    'quality': quality,
+                })
 
         self._sort_formats(formats)
 
         return {
-            'id': str(jsonData['id']),
+            'id': compat_str(jsonData['episode_id']),
             'title': self._og_search_title(webpage),
             'thumbnail': jsonData['episode_image_original_url'].replace('//', 'http://'),
             'formats': formats,
             'description': self._og_search_description(webpage),
+            'duration': int_or_none(jsonData['duration']),
+            'view_count': int_or_none(jsonData['stats_total']),
         }