diff options
Diffstat (limited to 'hypervideo_dl/extractor/stripchat.py')
| -rw-r--r-- | hypervideo_dl/extractor/stripchat.py | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/hypervideo_dl/extractor/stripchat.py b/hypervideo_dl/extractor/stripchat.py index 0d4a0ce..4229a0b 100644 --- a/hypervideo_dl/extractor/stripchat.py +++ b/hypervideo_dl/extractor/stripchat.py @@ -1,37 +1,28 @@ -# coding: utf-8 -from __future__ import unicode_literals - 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>[0-9A-Za-z-_]+)' + _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, }, 'skip': 'Room is offline', + }, { + 'url': 'https://stripchat.com/Rakhijaan@xh', + 'only_matching': True }] def _real_extract(self, url): video_id = self._match_id(url) - webpage = self._download_webpage( - 'https://stripchat.com/%s/' % video_id, video_id, - headers=self.geo_verification_headers()) + webpage = self._download_webpage(url, video_id, headers=self.geo_verification_headers()) data = self._parse_json( self._search_regex( @@ -41,19 +32,24 @@ 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) - - 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) + 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'))): + 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 + if not formats: + self.raise_no_formats('No active streams found', expected=True) return { 'id': video_id, |