From 5135ed3d4a87b3c03902aec68b60b40855b12863 Mon Sep 17 00:00:00 2001 From: OHaiiBuzzle <23693150+ohaiibuzzle@users.noreply.github.com> Date: Tue, 30 Aug 2022 17:44:16 +0700 Subject: [extractor/huya] Fix stream extraction (#4798) Closes #4658 Authored by: ohaiibuzzle --- yt_dlp/extractor/huya.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'yt_dlp/extractor/huya.py') diff --git a/yt_dlp/extractor/huya.py b/yt_dlp/extractor/huya.py index 9dd5e41b3..6d6f09956 100644 --- a/yt_dlp/extractor/huya.py +++ b/yt_dlp/extractor/huya.py @@ -6,7 +6,6 @@ from ..compat import compat_urlparse, compat_b64decode from ..utils import ( ExtractorError, int_or_none, - js_to_json, str_or_none, try_get, unescapeHTML, @@ -55,11 +54,7 @@ class HuyaLiveIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id=video_id) - json_stream = self._search_regex(r'"stream":\s+"([a-zA-Z0-9+=/]+)"', webpage, 'stream', default=None) - if not json_stream: - raise ExtractorError('Video is offline', expected=True) - stream_data = self._parse_json(compat_b64decode(json_stream).decode(), video_id=video_id, - transform_source=js_to_json) + stream_data = self._search_json(r'stream:\s+', webpage, 'stream', video_id=video_id, default=None) room_info = try_get(stream_data, lambda x: x['data'][0]['gameLiveInfo']) if not room_info: raise ExtractorError('Can not extract the room info', expected=True) @@ -67,6 +62,8 @@ class HuyaLiveIE(InfoExtractor): screen_type = room_info.get('screenType') live_source_type = room_info.get('liveSourceType') stream_info_list = stream_data['data'][0]['gameStreamInfoList'] + if not stream_info_list: + raise ExtractorError('Video is offline', expected=True) formats = [] for stream_info in stream_info_list: stream_url = stream_info.get('sFlvUrl') -- cgit v1.2.3 From 304ad45a9b18cba7b62e7cb435fb0ddc49003ed7 Mon Sep 17 00:00:00 2001 From: gamer191 <83270075+gamer191@users.noreply.github.com> Date: Tue, 4 Oct 2022 15:23:11 +1100 Subject: [cleanup] Misc (#5044) Authored by: gamer191, pukkandan --- yt_dlp/extractor/huya.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yt_dlp/extractor/huya.py') diff --git a/yt_dlp/extractor/huya.py b/yt_dlp/extractor/huya.py index 6d6f09956..c05e77c32 100644 --- a/yt_dlp/extractor/huya.py +++ b/yt_dlp/extractor/huya.py @@ -54,7 +54,7 @@ class HuyaLiveIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id=video_id) - stream_data = self._search_json(r'stream:\s+', webpage, 'stream', video_id=video_id, default=None) + stream_data = self._search_json(r'stream:\s', webpage, 'stream', video_id=video_id, default=None) room_info = try_get(stream_data, lambda x: x['data'][0]['gameLiveInfo']) if not room_info: raise ExtractorError('Can not extract the room info', expected=True) -- cgit v1.2.3 From 9f14daf22b4080ae1531a772ee7574959af4e2fa Mon Sep 17 00:00:00 2001 From: pukkandan Date: Thu, 17 Nov 2022 10:40:03 +0530 Subject: [extractor] Deprecate `_sort_formats` --- yt_dlp/extractor/huya.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'yt_dlp/extractor/huya.py') diff --git a/yt_dlp/extractor/huya.py b/yt_dlp/extractor/huya.py index c05e77c32..b6e9eec24 100644 --- a/yt_dlp/extractor/huya.py +++ b/yt_dlp/extractor/huya.py @@ -93,8 +93,6 @@ class HuyaLiveIE(InfoExtractor): **self._RESOLUTION.get(si.get('sDisplayName'), {}), }) - self._sort_formats(formats) - return { 'id': video_id, 'title': title, -- cgit v1.2.3