mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-10-31 14:45:14 +00:00 
			
		
		
		
	[douyu] Fix extraction and update _TESTS
They've switched from flv to hls Closes #12301
This commit is contained in:
		| @@ -1,15 +1,7 @@ | ||||
| # coding: utf-8 | ||||
| from __future__ import unicode_literals | ||||
|  | ||||
| import hashlib | ||||
| import time | ||||
| import uuid | ||||
|  | ||||
| from .common import InfoExtractor | ||||
| from ..compat import ( | ||||
|     compat_str, | ||||
|     compat_urllib_parse_urlencode, | ||||
| ) | ||||
| from ..utils import ( | ||||
|     ExtractorError, | ||||
|     unescapeHTML, | ||||
| @@ -24,8 +16,8 @@ class DouyuTVIE(InfoExtractor): | ||||
|         'info_dict': { | ||||
|             'id': '17732', | ||||
|             'display_id': 'iseven', | ||||
|             'ext': 'flv', | ||||
|             'title': 're:^清晨醒脑!T-ara根本停不下来! [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', | ||||
|             'ext': 'mp4', | ||||
|             'title': 're:^清晨醒脑!T-ARA根本停不下来! [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', | ||||
|             'description': r're:.*m7show@163\.com.*', | ||||
|             'thumbnail': r're:^https?://.*\.jpg$', | ||||
|             'uploader': '7师傅', | ||||
| @@ -39,7 +31,7 @@ class DouyuTVIE(InfoExtractor): | ||||
|         'info_dict': { | ||||
|             'id': '85982', | ||||
|             'display_id': '85982', | ||||
|             'ext': 'flv', | ||||
|             'ext': 'mp4', | ||||
|             'title': 're:^小漠从零单排记!——CSOL2躲猫猫 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', | ||||
|             'description': 'md5:746a2f7a253966a06755a912f0acc0d2', | ||||
|             'thumbnail': r're:^https?://.*\.jpg$', | ||||
| @@ -55,8 +47,8 @@ class DouyuTVIE(InfoExtractor): | ||||
|         'info_dict': { | ||||
|             'id': '17732', | ||||
|             'display_id': '17732', | ||||
|             'ext': 'flv', | ||||
|             'title': 're:^清晨醒脑!T-ara根本停不下来! [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', | ||||
|             'ext': 'mp4', | ||||
|             'title': 're:^清晨醒脑!T-ARA根本停不下来! [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', | ||||
|             'description': r're:.*m7show@163\.com.*', | ||||
|             'thumbnail': r're:^https?://.*\.jpg$', | ||||
|             'uploader': '7师傅', | ||||
| @@ -96,45 +88,18 @@ class DouyuTVIE(InfoExtractor): | ||||
|         if room.get('show_status') == '2': | ||||
|             raise ExtractorError('Live stream is offline', expected=True) | ||||
|  | ||||
|         tt = compat_str(int(time.time() / 60)) | ||||
|         did = uuid.uuid4().hex.upper() | ||||
|  | ||||
|         sign_content = ''.join((room_id, did, self._API_KEY, tt)) | ||||
|         sign = hashlib.md5((sign_content).encode('utf-8')).hexdigest() | ||||
|  | ||||
|         flv_data = compat_urllib_parse_urlencode({ | ||||
|             'cdn': 'ws', | ||||
|             'rate': '0', | ||||
|             'tt': tt, | ||||
|             'did': did, | ||||
|             'sign': sign, | ||||
|         }) | ||||
|  | ||||
|         video_info = self._download_json( | ||||
|             'http://www.douyu.com/lapi/live/getPlay/%s' % room_id, video_id, | ||||
|             data=flv_data, note='Downloading video info', | ||||
|             headers={'Content-Type': 'application/x-www-form-urlencoded'}) | ||||
|  | ||||
|         error_code = video_info.get('error', 0) | ||||
|         if error_code is not 0: | ||||
|             raise ExtractorError( | ||||
|                 '%s reported error %i' % (self.IE_NAME, error_code), | ||||
|                 expected=True) | ||||
|  | ||||
|         base_url = video_info['data']['rtmp_url'] | ||||
|         live_path = video_info['data']['rtmp_live'] | ||||
|  | ||||
|         video_url = '%s/%s' % (base_url, live_path) | ||||
|         formats = self._extract_m3u8_formats( | ||||
|             room['hls_url'], video_id, ext='mp4') | ||||
|  | ||||
|         title = self._live_title(unescapeHTML(room['room_name'])) | ||||
|         description = room.get('notice') | ||||
|         description = room.get('show_details') | ||||
|         thumbnail = room.get('room_src') | ||||
|         uploader = room.get('nickname') | ||||
|  | ||||
|         return { | ||||
|             'id': room_id, | ||||
|             'display_id': video_id, | ||||
|             'url': video_url, | ||||
|             'formats': formats, | ||||
|             'title': title, | ||||
|             'description': description, | ||||
|             'thumbnail': thumbnail, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Yen Chi Hsuan
					Yen Chi Hsuan