aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzulaport <70630440+zulaport@users.noreply.github.com>2022-11-06 12:39:09 -0800
committerGitHub <noreply@github.com>2022-11-07 02:09:09 +0530
commita349d4d6415e9aa0fb11c674e405d57fa13cc7fd (patch)
tree95e525ffc2161bfa86bbe579666f1dc8354a84f3
parentac8e69dd3238c03eb40c267a090173abaac99a3a (diff)
downloadhypervideo-pre-a349d4d6415e9aa0fb11c674e405d57fa13cc7fd.tar.lz
hypervideo-pre-a349d4d6415e9aa0fb11c674e405d57fa13cc7fd.tar.xz
hypervideo-pre-a349d4d6415e9aa0fb11c674e405d57fa13cc7fd.zip
[extractor/stripchat] Fix hostname for HLS stream (#5445)
Closes #5227 Authored by: zulaport
-rw-r--r--yt_dlp/extractor/stripchat.py35
1 files changed, 16 insertions, 19 deletions
diff --git a/yt_dlp/extractor/stripchat.py b/yt_dlp/extractor/stripchat.py
index 2e84729bd..8cd8388aa 100644
--- a/yt_dlp/extractor/stripchat.py
+++ b/yt_dlp/extractor/stripchat.py
@@ -1,22 +1,15 @@
from .common import InfoExtractor
-from ..compat import (
- compat_str,
-)
-from ..utils import (
- ExtractorError,
- lowercase_escape,
- try_get,
-)
+from ..utils import ExtractorError, lowercase_escape, traverse_obj
class StripchatIE(InfoExtractor):
_VALID_URL = r'https?://stripchat\.com/(?P<id>[^/?#]+)'
_TESTS = [{
- 'url': 'https://stripchat.com/feel_me',
+ 'url': 'https://stripchat.com/Joselin_Flower',
'info_dict': {
- 'id': 'feel_me',
+ 'id': 'Joselin_Flower',
'ext': 'mp4',
- 'title': 're:^feel_me [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+ 'title': 're:^Joselin_Flower [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
'description': str,
'is_live': True,
'age_limit': 18,
@@ -39,18 +32,22 @@ class StripchatIE(InfoExtractor):
if not data:
raise ExtractorError('Unable to find configuration for stream.')
- if try_get(data, lambda x: x['viewCam']['show'], dict):
+ if traverse_obj(data, ('viewCam', 'show'), expected_type=dict):
raise ExtractorError('Model is in private show', expected=True)
- elif not try_get(data, lambda x: x['viewCam']['model']['isLive'], bool):
+ elif not traverse_obj(data, ('viewCam', 'model', 'isLive'), expected_type=bool):
raise ExtractorError('Model is offline', expected=True)
- server = try_get(data, lambda x: x['viewCam']['viewServers']['flashphoner-hls'], compat_str)
- host = try_get(data, lambda x: x['config']['data']['hlsStreamHost'], compat_str)
- model_id = try_get(data, lambda x: x['viewCam']['model']['id'], int)
+ server = traverse_obj(data, ('viewCam', 'viewServers', 'flashphoner-hls'), expected_type=str)
+ model_id = traverse_obj(data, ('viewCam', 'model', 'id'), expected_type=int)
+
+ for host in traverse_obj(data, (
+ 'config', 'data', (('featuresV2', 'hlsFallback', 'fallbackDomains', ...), 'hlsStreamHost'))):
+ formats = self._extract_m3u8_formats(
+ f'https://b-{server}.{host}/hls/{model_id}/{model_id}.m3u8',
+ video_id, ext='mp4', m3u8_id='hls', fatal=False, live=True)
+ if formats:
+ break
- formats = self._extract_m3u8_formats(
- 'https://b-%s.%s/hls/%d/%d.m3u8' % (server, host, model_id, model_id),
- video_id, ext='mp4', m3u8_id='hls', fatal=False, live=True)
self._sort_formats(formats)
return {