Initiate new release.

[youtubedl] / youtube_dl / extractor / rentv.py

diff --git a/youtube_dl/extractor/rentv.py b/youtube_dl/extractor/rentv.py
index 422c02cff37620cbc52f7056f92987682f394c30..7c8909d95377b38f5e9bbc3a204337f1f8b540a6 100644 (file)
--- a/youtube_dl/extractor/rentv.py
+++ b/youtube_dl/extractor/rentv.py
@@ -2,11 +2,15 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

-from .jwplatform import JWPlatformBaseIE

 from ..compat import compat_str
 from ..compat import compat_str

+from ..utils import (
+    determine_ext,
+    int_or_none,
+    url_or_none,
+)

 
 
 
 

-class RENTVIE(JWPlatformBaseIE):
+class RENTVIE(InfoExtractor):

     _VALID_URL = r'(?:rentv:|https?://(?:www\.)?ren\.tv/(?:player|video/epizod)/)(?P<id>\d+)'
     _TESTS = [{
         'url': 'http://ren.tv/video/epizod/118577',
     _VALID_URL = r'(?:rentv:|https?://(?:www\.)?ren\.tv/(?:player|video/epizod)/)(?P<id>\d+)'
     _TESTS = [{
         'url': 'http://ren.tv/video/epizod/118577',


@@ -14,7 +18,9 @@ class RENTVIE(JWPlatformBaseIE):
         'info_dict': {
             'id': '118577',
             'ext': 'mp4',
         'info_dict': {
             'id': '118577',
             'ext': 'mp4',

-            'title': 'Документальный спецпроект: "Промывка мозгов. Технологии XXI века"'
+            'title': 'Документальный спецпроект: "Промывка мозгов. Технологии XXI века"',
+            'timestamp': 1472230800,
+            'upload_date': '20160826',

         }
     }, {
         'url': 'http://ren.tv/player/118577',
         }
     }, {
         'url': 'http://ren.tv/player/118577',


@@ -27,9 +33,33 @@ class RENTVIE(JWPlatformBaseIE):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage('http://ren.tv/player/' + video_id, video_id)
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage('http://ren.tv/player/' + video_id, video_id)

-        jw_config = self._parse_json(self._search_regex(
-            r'config\s*=\s*({.+});', webpage, 'jw config'), video_id)
-        return self._parse_jwplayer_data(jw_config, video_id, m3u8_id='hls')
+        config = self._parse_json(self._search_regex(
+            r'config\s*=\s*({.+})\s*;', webpage, 'config'), video_id)
+        title = config['title']
+        formats = []
+        for video in config['src']:
+            src = url_or_none(video.get('src'))
+            if not src:
+                continue
+            ext = determine_ext(src)
+            if ext == 'm3u8':
+                formats.extend(self._extract_m3u8_formats(
+                    src, video_id, 'mp4', entry_protocol='m3u8_native',
+                    m3u8_id='hls', fatal=False))
+            else:
+                formats.append({
+                    'url': src,
+                })
+        self._sort_formats(formats)
+        return {
+            'id': video_id,
+            'title': title,
+            'description': config.get('description'),
+            'thumbnail': config.get('image'),
+            'duration': int_or_none(config.get('duration')),
+            'timestamp': int_or_none(config.get('date')),
+            'formats': formats,
+        }

 
 
 class RENTVArticleIE(InfoExtractor):
 
 
 class RENTVArticleIE(InfoExtractor):