]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[lrt] fix the rest of extractor
authorGiedrius Statkevičius <giedrius.statkevicius@gmail.com>
Sun, 29 Nov 2015 00:58:52 +0000 (02:58 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 26 Dec 2015 19:02:54 +0000 (20:02 +0100)
Closes #7690.

youtube_dl/extractor/lrt.py

index 24a9a4c9141c48a283fd7ddd1cae569b005a77f2..42e768ce71fa13bd9fbad77e82da3b18d9d2c751 100644 (file)
@@ -1,12 +1,8 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import re
-
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
-    js_to_json,
     parse_duration,
     remove_end,
 )
@@ -25,7 +21,7 @@ class LRTIE(InfoExtractor):
             'duration': 1783,
         },
         'params': {
-            'skip_download': True,  # HLS download
+            'skip_download': True,  # m3u8 download
         },
     }
 
@@ -39,23 +35,8 @@ class LRTIE(InfoExtractor):
         duration = parse_duration(self._search_regex(
             r"var record_len = '([0-9]+:[0-9]+:[0-9]+)';", webpage, 'record_len', fatal=False, default=None))
 
-        formats = []
-        for js in re.findall(r'(?s)config:\s*(\{.*?\})', webpage):
-            data = self._parse_json(js, video_id, transform_source=js_to_json)
-            if 'provider' not in data:
-                continue
-            if data['provider'] == 'rtmp':
-                formats.append({
-                    'format_id': 'rtmp',
-                    'ext': determine_ext(data['file']),
-                    'url': data['streamer'],
-                    'play_path': 'mp4:%s' % data['file'],
-                    'preference': -1,
-                    'rtmp_real_time': True,
-                })
-            else:
-                formats.extend(
-                    self._extract_m3u8_formats(data['file'], video_id, 'mp4'))
+        link = self._search_regex(r'file: "(.*)" \+ location\.hash\.substring\(1\)', webpage, 'link to m3u8')
+        formats = self._extract_m3u8_formats(link, video_id, "mp4")
 
         return {
             'id': video_id,