Update upstream source from tag 'upstream/2019.06.08'

[youtubedl] / youtube_dl / extractor / streamcz.py

diff --git a/youtube_dl/extractor/streamcz.py b/youtube_dl/extractor/streamcz.py
index e92b93285c92ad9d049f2092fba9b70884057e8f..58e0b4c802781728cf9d4ba17a19236bc3b54565 100644 (file)
--- a/youtube_dl/extractor/streamcz.py
+++ b/youtube_dl/extractor/streamcz.py
@@ -1,15 +1,13 @@
-# -*- coding: utf-8 -*-
+# coding: utf-8

 from __future__ import unicode_literals
 
 import hashlib
 import time
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 import hashlib
 import time
 
 from .common import InfoExtractor

-from ..compat import (
-    compat_urllib_request,
-)

 from ..utils import (
     int_or_none,
 from ..utils import (
     int_or_none,

+    sanitized_Request,

 )
 
 
 )
 
 


@@ -28,7 +26,7 @@ class StreamCZIE(InfoExtractor):
 
     _TESTS = [{
         'url': 'http://www.stream.cz/peklonataliri/765767-ecka-pro-deti',
 
     _TESTS = [{
         'url': 'http://www.stream.cz/peklonataliri/765767-ecka-pro-deti',

-        'md5': '6d3ca61a8d0633c9c542b92fcb936b0c',
+        'md5': '934bb6a6d220d99c010783c9719960d5',

         'info_dict': {
             'id': '765767',
             'ext': 'mp4',
         'info_dict': {
             'id': '765767',
             'ext': 'mp4',


@@ -39,7 +37,7 @@ class StreamCZIE(InfoExtractor):
         },
     }, {
         'url': 'http://www.stream.cz/blanik/10002447-tri-roky-pro-mazanka',
         },
     }, {
         'url': 'http://www.stream.cz/blanik/10002447-tri-roky-pro-mazanka',

-        'md5': 'e54a254fb8b871968fd8403255f28589',
+        'md5': '849a88c1e1ca47d41403c2ba5e59e261',

         'info_dict': {
             'id': '10002447',
             'ext': 'mp4',
         'info_dict': {
             'id': '10002447',
             'ext': 'mp4',


@@ -54,7 +52,7 @@ class StreamCZIE(InfoExtractor):
         video_id = self._match_id(url)
         api_path = '/episode/%s' % video_id
 
         video_id = self._match_id(url)
         api_path = '/episode/%s' % video_id
 

-        req = compat_urllib_request.Request(self._API_URL + api_path)
+        req = sanitized_Request(self._API_URL + api_path)

         req.add_header('Api-Password', _get_api_key(api_path))
         data = self._download_json(req, video_id)
 
         req.add_header('Api-Password', _get_api_key(api_path))
         data = self._download_json(req, video_id)
 


@@ -87,6 +85,14 @@ class StreamCZIE(InfoExtractor):
         else:
             title = data['name']
 
         else:
             title = data['name']
 

+        subtitles = {}
+        srt_url = data.get('subtitles_srt')
+        if srt_url:
+            subtitles['cs'] = [{
+                'ext': 'srt',
+                'url': srt_url,
+            }]
+

         return {
             'id': video_id,
             'title': title,
         return {
             'id': video_id,
             'title': title,


@@ -95,4 +101,5 @@ class StreamCZIE(InfoExtractor):
             'description': data.get('web_site_text'),
             'duration': int_or_none(data.get('duration')),
             'view_count': int_or_none(data.get('views')),
             'description': data.get('web_site_text'),
             'duration': int_or_none(data.get('duration')),
             'view_count': int_or_none(data.get('views')),

+            'subtitles': subtitles,

         }
         }