Update changelog.

[youtubedl] / youtube_dl / extractor / leeco.py

diff --git a/youtube_dl/extractor/leeco.py b/youtube_dl/extractor/leeco.py
index c48a5aad17ad36324b3cf70956d0ed234ffa522b..8dd1ce0d0e935888f3a90dedf92f113f2ef74f9b 100644 (file)
--- a/youtube_dl/extractor/leeco.py
+++ b/youtube_dl/extractor/leeco.py
@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
 # coding: utf-8
 from __future__ import unicode_literals
 

-import base64

 import datetime
 import hashlib
 import re
 import datetime
 import hashlib
 import re


@@ -9,6 +8,7 @@ import time
 
 from .common import InfoExtractor
 from ..compat import (
 
 from .common import InfoExtractor
 from ..compat import (

+    compat_b64decode,

     compat_ord,
     compat_str,
     compat_urllib_parse_urlencode,
     compat_ord,
     compat_str,
     compat_urllib_parse_urlencode,


@@ -23,14 +23,13 @@ from ..utils import (
     str_or_none,
     url_basename,
     urshift,
     str_or_none,
     url_basename,
     urshift,

-    update_url_query,

 )
 
 
 class LeIE(InfoExtractor):
     IE_DESC = '乐视网'
     _VALID_URL = r'https?://(?:www\.le\.com/ptv/vplay|(?:sports\.le|(?:www\.)?lesports)\.com/(?:match|video))/(?P<id>\d+)\.html'
 )
 
 
 class LeIE(InfoExtractor):
     IE_DESC = '乐视网'
     _VALID_URL = r'https?://(?:www\.le\.com/ptv/vplay|(?:sports\.le|(?:www\.)?lesports)\.com/(?:match|video))/(?P<id>\d+)\.html'

-
+    _GEO_COUNTRIES = ['CN']

     _URL_TEMPLATE = 'http://www.le.com/ptv/vplay/%s.html'
 
     _TESTS = [{
     _URL_TEMPLATE = 'http://www.le.com/ptv/vplay/%s.html'
 
     _TESTS = [{


@@ -51,7 +50,7 @@ class LeIE(InfoExtractor):
             'id': '1415246',
             'ext': 'mp4',
             'title': '美人天下01',
             'id': '1415246',
             'ext': 'mp4',
             'title': '美人天下01',

-            'description': 'md5:f88573d9d7225ada1359eaf0dbf8bcda',
+            'description': 'md5:28942e650e82ed4fcc8e4de919ee854d',

         },
         'params': {
             'hls_prefer_native': True,
         },
         'params': {
             'hls_prefer_native': True,


@@ -69,7 +68,6 @@ class LeIE(InfoExtractor):
         'params': {
             'hls_prefer_native': True,
         },
         'params': {
             'hls_prefer_native': True,
         },

-        'skip': 'Only available in China',

     }, {
         'url': 'http://sports.le.com/video/25737697.html',
         'only_matching': True,
     }, {
         'url': 'http://sports.le.com/video/25737697.html',
         'only_matching': True,


@@ -81,7 +79,7 @@ class LeIE(InfoExtractor):
         'only_matching': True,
     }]
 
         'only_matching': True,
     }]
 

-    # ror() and calc_time_key() are reversed from a embedded swf file in KLetvPlayer.swf
+    # ror() and calc_time_key() are reversed from a embedded swf file in LetvPlayer.swf

     def ror(self, param1, param2):
         _loc3_ = 0
         while _loc3_ < param2:
     def ror(self, param1, param2):
         _loc3_ = 0
         while _loc3_ < param2:


@@ -90,15 +88,8 @@ class LeIE(InfoExtractor):
         return param1
 
     def calc_time_key(self, param1):
         return param1
 
     def calc_time_key(self, param1):

-        _loc2_ = 773625421
-        _loc3_ = self.ror(param1, _loc2_ % 13)
-        _loc3_ = _loc3_ ^ _loc2_
-        _loc3_ = self.ror(_loc3_, _loc2_ % 17)
-        return _loc3_
-
-    # reversed from http://jstatic.letvcdn.com/sdk/player.js
-    def get_mms_key(self, time):
-        return self.ror(time, 8) ^ 185025305
+        _loc2_ = 185025305
+        return self.ror(param1, _loc2_ % 17) ^ _loc2_

 
     # see M3U8Encryption class in KLetvPlayer.swf
     @staticmethod
 
     # see M3U8Encryption class in KLetvPlayer.swf
     @staticmethod


@@ -122,71 +113,43 @@ class LeIE(InfoExtractor):
 
     def _check_errors(self, play_json):
         # Check for errors
 
     def _check_errors(self, play_json):
         # Check for errors

-        playstatus = play_json['playstatus']
+        playstatus = play_json['msgs']['playstatus']

         if playstatus['status'] == 0:
             flag = playstatus['flag']
             if flag == 1:
         if playstatus['status'] == 0:
             flag = playstatus['flag']
             if flag == 1:

-                msg = 'Country %s auth error' % playstatus['country']
+                self.raise_geo_restricted()

             else:
             else:

-                msg = 'Generic error. flag = %d' % flag
-            raise ExtractorError(msg, expected=True)
+                raise ExtractorError('Generic error. flag = %d' % flag, expected=True)

 
     def _real_extract(self, url):
         media_id = self._match_id(url)
         page = self._download_webpage(url, media_id)
 
 
     def _real_extract(self, url):
         media_id = self._match_id(url)
         page = self._download_webpage(url, media_id)
 

-        play_json_h5 = self._download_json(
-            'http://api.le.com/mms/out/video/playJsonH5',
-            media_id, 'Downloading html5 playJson data', query={
-                'id': media_id,
-                'platid': 3,
-                'splatid': 304,
-                'format': 1,
-                'tkey': self.get_mms_key(int(time.time())),
-                'domain': 'www.le.com',
-                'tss': 'no',
-            },
-            headers=self.geo_verification_headers())
-        self._check_errors(play_json_h5)
-

         play_json_flash = self._download_json(
         play_json_flash = self._download_json(

-            'http://api.le.com/mms/out/video/playJson',
+            'http://player-pc.le.com/mms/out/video/playJson',

             media_id, 'Downloading flash playJson data', query={
                 'id': media_id,
                 'platid': 1,
             media_id, 'Downloading flash playJson data', query={
                 'id': media_id,
                 'platid': 1,

-                'splatid': 101,
+                'splatid': 105,

                 'format': 1,
                 'format': 1,

+                'source': 1000,

                 'tkey': self.calc_time_key(int(time.time())),
                 'domain': 'www.le.com',
                 'tkey': self.calc_time_key(int(time.time())),
                 'domain': 'www.le.com',

+                'region': 'cn',

             },
             headers=self.geo_verification_headers())
         self._check_errors(play_json_flash)
 
             },
             headers=self.geo_verification_headers())
         self._check_errors(play_json_flash)
 

-        def get_h5_urls(media_url, format_id):
-            location = self._download_json(
-                media_url, media_id,
-                'Download JSON metadata for format %s' % format_id, query={
-                    'format': 1,
-                    'expect': 3,
-                    'tss': 'no',
-                })['location']
-
-            return {
-                'http': update_url_query(location, {'tss': 'no'}),
-                'hls': update_url_query(location, {'tss': 'ios'}),
-            }
-

         def get_flash_urls(media_url, format_id):
         def get_flash_urls(media_url, format_id):

-            media_url += '&' + compat_urllib_parse_urlencode({
-                'm3v': 1,
-                'format': 1,
-                'expect': 3,
-                'rateid': format_id,
-            })
-

             nodes_data = self._download_json(
                 media_url, media_id,
             nodes_data = self._download_json(
                 media_url, media_id,

-                'Download JSON metadata for format %s' % format_id)
+                'Download JSON metadata for format %s' % format_id,
+                query={
+                    'm3v': 1,
+                    'format': 1,
+                    'expect': 3,
+                    'tss': 'ios',
+                })

 
             req = self._request_webpage(
                 nodes_data['nodelist'][0]['location'], media_id,
 
             req = self._request_webpage(
                 nodes_data['nodelist'][0]['location'], media_id,


@@ -200,29 +163,28 @@ class LeIE(InfoExtractor):
 
         extracted_formats = []
         formats = []
 
         extracted_formats = []
         formats = []

-        for play_json, get_urls in ((play_json_h5, get_h5_urls), (play_json_flash, get_flash_urls)):
-            playurl = play_json['playurl']
-            play_domain = playurl['domain'][0]
-
-            for format_id, format_data in playurl.get('dispatch', []).items():
-                if format_id in extracted_formats:
-                    continue
-                extracted_formats.append(format_id)
-
-                media_url = play_domain + format_data[0]
-                for protocol, format_url in get_urls(media_url, format_id).items():
-                    f = {
-                        'url': format_url,
-                        'ext': determine_ext(format_data[1]),
-                        'format_id': '%s-%s' % (protocol, format_id),
-                        'protocol': 'm3u8_native' if protocol == 'hls' else 'http',
-                        'quality': int_or_none(format_id),
-                    }
-
-                    if format_id[-1:] == 'p':
-                        f['height'] = int_or_none(format_id[:-1])
-
-                    formats.append(f)
+        playurl = play_json_flash['msgs']['playurl']
+        play_domain = playurl['domain'][0]
+
+        for format_id, format_data in playurl.get('dispatch', []).items():
+            if format_id in extracted_formats:
+                continue
+            extracted_formats.append(format_id)
+
+            media_url = play_domain + format_data[0]
+            for protocol, format_url in get_flash_urls(media_url, format_id).items():
+                f = {
+                    'url': format_url,
+                    'ext': determine_ext(format_data[1]),
+                    'format_id': '%s-%s' % (protocol, format_id),
+                    'protocol': 'm3u8_native' if protocol == 'hls' else 'http',
+                    'quality': int_or_none(format_id),
+                }
+
+                if format_id[-1:] == 'p':
+                    f['height'] = int_or_none(format_id[:-1])
+
+                formats.append(f)

         self._sort_formats(formats, ('height', 'quality', 'format_id'))
 
         publish_time = parse_iso8601(self._html_search_regex(
         self._sort_formats(formats, ('height', 'quality', 'format_id'))
 
         publish_time = parse_iso8601(self._html_search_regex(


@@ -367,7 +329,7 @@ class LetvCloudIE(InfoExtractor):
                 raise ExtractorError('Letv cloud returned an unknwon error')
 
         def b64decode(s):
                 raise ExtractorError('Letv cloud returned an unknwon error')
 
         def b64decode(s):

-            return base64.b64decode(s.encode('utf-8')).decode('utf-8')
+            return compat_b64decode(s).decode('utf-8')

 
         formats = []
         for media in play_json['data']['video_info']['media'].values():
 
         formats = []
         for media in play_json['data']['video_info']['media'].values():


@@ -386,8 +348,8 @@ class LetvCloudIE(InfoExtractor):
         return formats
 
     def _real_extract(self, url):
         return formats
 
     def _real_extract(self, url):

-        uu_mobj = re.search('uu=([\w]+)', url)
-        vu_mobj = re.search('vu=([\w]+)', url)
+        uu_mobj = re.search(r'uu=([\w]+)', url)
+        vu_mobj = re.search(r'vu=([\w]+)', url)

 
         if not uu_mobj or not vu_mobj:
             raise ExtractorError('Invalid URL: %s' % url, expected=True)
 
         if not uu_mobj or not vu_mobj:
             raise ExtractorError('Invalid URL: %s' % url, expected=True)