aboutsummaryrefslogtreecommitdiffstats
path: root/yt_dlp
diff options
context:
space:
mode:
authorOHaiiBuzzle <23693150+ohaiibuzzle@users.noreply.github.com>2022-08-30 17:44:16 +0700
committerGitHub <noreply@github.com>2022-08-30 16:14:16 +0530
commit5135ed3d4a87b3c03902aec68b60b40855b12863 (patch)
tree8523c73437494b5189259a264c229315b4cf9b02 /yt_dlp
parentc4b2df872d0ab49da939bf8bda001fa4e2d2ea06 (diff)
downloadhypervideo-pre-5135ed3d4a87b3c03902aec68b60b40855b12863.tar.lz
hypervideo-pre-5135ed3d4a87b3c03902aec68b60b40855b12863.tar.xz
hypervideo-pre-5135ed3d4a87b3c03902aec68b60b40855b12863.zip
[extractor/huya] Fix stream extraction (#4798)
Closes #4658 Authored by: ohaiibuzzle
Diffstat (limited to 'yt_dlp')
-rw-r--r--yt_dlp/extractor/huya.py9
1 files changed, 3 insertions, 6 deletions
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')