diff --git a/youtube_dl/extractor/douyutv.py b/youtube_dl/extractor/douyutv.py index ce6962755..417aad725 100644 --- a/youtube_dl/extractor/douyutv.py +++ b/youtube_dl/extractor/douyutv.py @@ -3,9 +3,10 @@ from __future__ import unicode_literals import hashlib import time +import uuid from .common import InfoExtractor -from ..utils import (ExtractorError, unescapeHTML) -from ..compat import (compat_str, compat_basestring) +from ..utils import (ExtractorError, unescapeHTML, sanitized_Request) +from ..compat import (compat_str, compat_basestring, compat_urllib_parse_urlencode) class DouyuTVIE(InfoExtractor): @@ -75,19 +76,26 @@ class DouyuTVIE(InfoExtractor): room_id = self._html_search_regex( r'"room_id"\s*:\s*(\d+),', page, 'room id') - config = None + flv_info_json = None # Douyu API sometimes returns error "Unable to load the requested class: eticket_redis_cache" # Retry with different parameters - same parameters cause same errors for i in range(5): - prefix = 'room/%s?aid=android&client_sys=android&time=%d' % ( - room_id, int(time.time())) - auth = hashlib.md5((prefix + '1231').encode('ascii')).hexdigest() + tt = int(time.time() / 60) + did = uuid.uuid4().hex.upper() - config_page = self._download_webpage( - 'http://www.douyutv.com/api/v1/%s&auth=%s' % (prefix, auth), - video_id) + sign_content = '{room_id}{did}A12Svb&%1UUmf@hC{tt}'.format(room_id = room_id, did = did, tt = tt) + sign = hashlib.md5((sign_content).encode('utf-8')).hexdigest() + + payload = {'cdn': 'ws', 'rate': '0', 'tt': tt, 'did': did, 'sign': sign} + flv_info_data = compat_urllib_parse_urlencode(payload) + + flv_info_request_url = 'http://www.douyu.com/lapi/live/getPlay/%s' % room_id + flv_info_request = sanitized_Request(flv_info_request_url, flv_info_data, + {'Content-Type': 'application/x-www-form-urlencoded'}) + + flv_info_content = self._download_webpage(flv_info_request, video_id) try: - config = self._parse_json(config_page, video_id, fatal=False) + flv_info_json = self._parse_json(flv_info_content, video_id, fatal=False) except ExtractorError: # Wait some time before retrying to get a different time() value self._sleep(1, video_id, msg_template='%(video_id)s: Error occurs. ' @@ -95,54 +103,46 @@ class DouyuTVIE(InfoExtractor): continue else: break - if config is None: + if flv_info_json is None: raise ExtractorError('Unable to fetch API result') - data = config['data'] + room_url = 'http://m.douyu.com/html5/live?roomId=%s' % room_id + room_content = self._download_webpage(room_url, video_id) + room_json = self._parse_json(room_content, video_id, fatal=False) - error_code = config.get('error', 0) - if error_code is not 0: - error_desc = 'Server reported error %i' % error_code - if isinstance(data, (compat_str, compat_basestring)): - error_desc += ': ' + data - raise ExtractorError(error_desc, expected=True) + room = room_json['data'] + flv_info = flv_info_json['data'] - show_status = data.get('show_status') + show_status = room.get('show_status') # 1 = live, 2 = offline if show_status == '2': raise ExtractorError( 'Live stream is offline', expected=True) - base_url = data['rtmp_url'] - live_path = data['rtmp_live'] + error_code = flv_info_json.get('error', 0) + if error_code is not 0: + error_desc = 'Server reported error %i' % error_code + if isinstance(flv_info, (compat_str, compat_basestring)): + error_desc += ': ' + flv_info + raise ExtractorError(error_desc, expected=True) - title = self._live_title(unescapeHTML(data['room_name'])) - description = data.get('show_details') - thumbnail = data.get('room_src') + base_url = flv_info['rtmp_url'] + live_path = flv_info['rtmp_live'] - uploader = data.get('nickname') - uploader_id = data.get('owner_uid') + video_url = '%s/%s' % (base_url, live_path) - multi_formats = data.get('rtmp_multi_bitrate') - if not isinstance(multi_formats, dict): - multi_formats = {} - multi_formats['live'] = live_path - - formats = [{ - 'url': '%s/%s' % (base_url, format_path), - 'format_id': format_id, - 'preference': 1 if format_id == 'live' else 0, - } for format_id, format_path in multi_formats.items()] - self._sort_formats(formats) + title = self._live_title(unescapeHTML(room['room_name'])) + description = room.get('notice') + thumbnail = room.get('room_src') + uploader = room.get('nickname') return { 'id': room_id, 'display_id': video_id, + 'url': video_url, 'title': title, 'description': description, 'thumbnail': thumbnail, 'uploader': uploader, - 'uploader_id': uploader_id, - 'formats': formats, 'is_live': True, }