X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fletv.py;h=be648000ea1bfec896c7228159170e16aa8338ee;hb=5c2266df4b9aeb7881ed8c026a038e2a25e43734;hp=d7d3156346afdb4c4314ba4cac5e33e9186fead6;hpb=570311610e33eb67d5a65a86705d54daaee17361;p=youtube-dl diff --git a/youtube_dl/extractor/letv.py b/youtube_dl/extractor/letv.py index d7d315634..be648000e 100644 --- a/youtube_dl/extractor/letv.py +++ b/youtube_dl/extractor/letv.py @@ -1,42 +1,73 @@ # coding: utf-8 from __future__ import unicode_literals -import os.path +import datetime import re import time -import datetime from .common import InfoExtractor -from ..compat import (compat_urlparse, compat_urllib_parse) -from ..utils import (ExtractorError, parse_iso8601) +from ..compat import ( + compat_urllib_parse, + compat_ord, +) +from ..utils import ( + determine_ext, + ExtractorError, + parse_iso8601, + sanitized_Request, + int_or_none, + encode_data_uri, +) class LetvIE(InfoExtractor): + IE_DESC = '乐视网' _VALID_URL = r'http://www\.letv\.com/ptv/vplay/(?P\d+).html' _TESTS = [{ 'url': 'http://www.letv.com/ptv/vplay/22005890.html', - 'md5': 'cab23bd68d5a8db9be31c9a222c1e8df', + 'md5': 'edadcfe5406976f42f9f266057ee5e40', 'info_dict': { 'id': '22005890', 'ext': 'mp4', 'title': '第87届奥斯卡颁奖礼完美落幕 《鸟人》成最大赢家', - 'timestamp': 1424747397, - 'upload_date': '20150224', - } + 'description': 'md5:a9cb175fd753e2962176b7beca21a47c', + }, + 'params': { + 'hls_prefer_native': True, + }, }, { + 'url': 'http://www.letv.com/ptv/vplay/1415246.html', + 'info_dict': { + 'id': '1415246', + 'ext': 'mp4', + 'title': '美人天下01', + 'description': 'md5:f88573d9d7225ada1359eaf0dbf8bcda', + }, + 'params': { + 'hls_prefer_native': True, + }, + }, { + 'note': 'This video is available only in Mainland China, thus a proxy is needed', 'url': 'http://www.letv.com/ptv/vplay/1118082.html', + 'md5': '2424c74948a62e5f31988438979c5ad1', 'info_dict': { 'id': '1118082', 'ext': 'mp4', - } + 'title': '与龙共舞 完整版', + 'description': 'md5:7506a5eeb1722bb9d4068f85024e3986', + }, + 'params': { + 'hls_prefer_native': True, + }, + 'skip': 'Only available in China', }] @staticmethod def urshift(val, n): return val >> n if val >= 0 else (val + 0x100000000) >> n - # ror() and calcTimeKey() are reversed from a embedded swf file in KLetvPlayer.swf + # ror() and calc_time_key() are reversed from a embedded swf file in KLetvPlayer.swf def ror(self, param1, param2): _loc3_ = 0 while _loc3_ < param2: @@ -44,13 +75,34 @@ class LetvIE(InfoExtractor): _loc3_ += 1 return param1 - def calcTimeKey(self, 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_ + # see M3U8Encryption class in KLetvPlayer.swf + @staticmethod + def decrypt_m3u8(encrypted_data): + if encrypted_data[:5].decode('utf-8').lower() != 'vc_01': + return encrypted_data + encrypted_data = encrypted_data[5:] + + _loc4_ = bytearray() + while encrypted_data: + b = compat_ord(encrypted_data[0]) + _loc4_.extend([b // 16, b & 0x0f]) + encrypted_data = encrypted_data[1:] + idx = len(_loc4_) - 11 + _loc4_ = _loc4_[idx:] + _loc4_[:idx] + _loc7_ = bytearray() + while _loc4_: + _loc7_.append(_loc4_[0] * 16 + _loc4_[1]) + _loc4_ = _loc4_[2:] + + return bytes(_loc7_) + def _real_extract(self, url): media_id = self._match_id(url) page = self._download_webpage(url, media_id) @@ -59,12 +111,19 @@ class LetvIE(InfoExtractor): 'platid': 1, 'splatid': 101, 'format': 1, - 'tkey': self.calcTimeKey(int(time.time())), + 'tkey': self.calc_time_key(int(time.time())), 'domain': 'www.letv.com' } + play_json_req = sanitized_Request( + 'http://api.letv.com/mms/out/video/playJson?' + compat_urllib_parse.urlencode(params) + ) + cn_verification_proxy = self._downloader.params.get('cn_verification_proxy') + if cn_verification_proxy: + play_json_req.add_header('Ytdl-request-proxy', cn_verification_proxy) + play_json = self._download_json( - 'http://api.letv.com/mms/out/video/playJson?' + compat_urllib_parse.urlencode(params), - media_id, 'playJson data') + play_json_req, + media_id, 'Downloading playJson data') # Check for errors playstatus = play_json['playstatus'] @@ -85,38 +144,46 @@ class LetvIE(InfoExtractor): for format_id in formats: if format_id in dispatch: media_url = playurl['domain'][0] + dispatch[format_id][0] - - # Mimic what flvxz.com do - url_parts = list(compat_urlparse.urlparse(media_url)) - qs = dict(compat_urlparse.parse_qs(url_parts[4])) - qs.update({ - 'platid': '14', - 'splatid': '1401', - 'tss': 'no', - 'retry': 1 + media_url += '&' + compat_urllib_parse.urlencode({ + 'm3v': 1, + 'format': 1, + 'expect': 3, + 'rateid': format_id, }) - url_parts[4] = compat_urllib_parse.urlencode(qs) - media_url = compat_urlparse.urlunparse(url_parts) + + nodes_data = self._download_json( + media_url, media_id, + 'Download JSON metadata for format %s' % format_id) + + req = self._request_webpage( + nodes_data['nodelist'][0]['location'], media_id, + note='Downloading m3u8 information for format %s' % format_id) + + m3u8_data = self.decrypt_m3u8(req.read()) url_info_dict = { - 'url': media_url, - 'ext': os.path.splitext(dispatch[format_id][1])[1][1:] + 'url': encode_data_uri(m3u8_data, 'application/vnd.apple.mpegurl'), + 'ext': determine_ext(dispatch[format_id][1]), + 'format_id': format_id, + 'protocol': 'm3u8', } if format_id[-1:] == 'p': - url_info_dict['height'] = format_id[:-1] + url_info_dict['height'] = int_or_none(format_id[:-1]) urls.append(url_info_dict) publish_time = parse_iso8601(self._html_search_regex( - r'发布时间 ([^<>]+) ', page, 'publish time', fatal=False), + r'发布时间 ([^<>]+) ', page, 'publish time', default=None), delimiter=' ', timezone=datetime.timedelta(hours=8)) + description = self._html_search_meta('description', page, fatal=False) return { 'id': media_id, 'formats': urls, 'title': playurl['title'], 'thumbnail': playurl['pic'], + 'description': description, 'timestamp': publish_time, } @@ -142,7 +209,8 @@ class LetvTvIE(InfoExtractor): entries = [self.url_result(media_url, ie='Letv') for media_url in media_urls] - title = self._html_search_meta('keywords', page, fatal=False).split('，')[0] + title = self._html_search_meta('keywords', page, + fatal=False).split('，')[0] description = self._html_search_meta('description', page, fatal=False) return self.playlist_result(entries, playlist_id, playlist_title=title, @@ -158,13 +226,14 @@ class LetvPlaylistIE(LetvTvIE): 'title': '武媚娘传奇', 'description': 'md5:e12499475ab3d50219e5bba00b3cb248' }, - 'playlist_count': 96 + # This playlist contains some extra videos other than the drama itself + 'playlist_mincount': 96 }, { 'url': 'http://tv.letv.com/pzt/lswjzzjc/index.shtml', 'info_dict': { 'id': 'lswjzzjc', - # should be "劲舞青春", but I can't find a simple way to determine - # the playlist title + # The title should be "劲舞青春", but I can't find a simple way to + # determine the playlist title 'title': '乐视午间自制剧场', 'description': 'md5:b1eef244f45589a7b5b1af9ff25a4489' },