diff options
| author | JChris246 <43832407+JChris246@users.noreply.github.com> | 2023-02-12 00:17:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-12 09:47:37 +0530 |
| commit | 7d5f919bad07017f4b39b55725491b1e9717d47a (patch) | |
| tree | 58109fcf047946fc54458b458c816612f8e4030a | |
| parent | c62e64cf0122e52fa2175dd1b004ca6b8e1d82af (diff) | |
| download | hypervideo-pre-7d5f919bad07017f4b39b55725491b1e9717d47a.tar.lz hypervideo-pre-7d5f919bad07017f4b39b55725491b1e9717d47a.tar.xz hypervideo-pre-7d5f919bad07017f4b39b55725491b1e9717d47a.zip | |
[extractor/Stripchat] Fix extractor (#5985)
Authored by bashonly, JChris246
Closes #5963, closes #5866
| -rw-r--r-- | yt_dlp/extractor/stripchat.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/yt_dlp/extractor/stripchat.py b/yt_dlp/extractor/stripchat.py index 4229a0bf1..4d2fb0608 100644 --- a/yt_dlp/extractor/stripchat.py +++ b/yt_dlp/extractor/stripchat.py @@ -1,5 +1,10 @@ from .common import InfoExtractor -from ..utils import ExtractorError, lowercase_escape, traverse_obj +from ..utils import ( + ExtractorError, + UserNotLive, + lowercase_escape, + traverse_obj +) class StripchatIE(InfoExtractor): @@ -35,16 +40,16 @@ class StripchatIE(InfoExtractor): if traverse_obj(data, ('viewCam', 'show'), expected_type=dict): raise ExtractorError('Model is in private show', expected=True) elif not traverse_obj(data, ('viewCam', 'model', 'isLive'), expected_type=bool): - raise ExtractorError('Model is offline', expected=True) + raise UserNotLive(video_id=video_id) server = traverse_obj(data, ('viewCam', 'viewServers', 'flashphoner-hls'), expected_type=str) model_id = traverse_obj(data, ('viewCam', 'model', 'id'), expected_type=int) formats = [] - for host in traverse_obj(data, ( - 'config', 'data', (('featuresV2', 'hlsFallback', 'fallbackDomains', ...), 'hlsStreamHost'))): + for host in traverse_obj(data, ('config', 'data', ( + (('features', 'featuresV2'), 'hlsFallback', 'fallbackDomains', ...), 'hlsStreamHost'))): formats = self._extract_m3u8_formats( - f'https://b-{server}.{host}/hls/{model_id}/{model_id}.m3u8', + f'https://b-{server}.{host}/hls/{model_id}/master/{model_id}_auto.m3u8', video_id, ext='mp4', m3u8_id='hls', fatal=False, live=True) if formats: break |