diff options
author | Sergey M․ <dstftw@gmail.com> | 2015-12-24 20:09:48 +0600 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2015-12-24 20:09:48 +0600 |
commit | 8a609c32fdf8d99f7c868c74d64a05d9a936044d (patch) | |
tree | b1587453a3355a34c3497a9f4f566c7ed30164bf /youtube_dl | |
parent | 96db61ffb83de9d912003a4778e9ce7c4d46e848 (diff) |
[chaturbate] Improve error extraction (Closes #7989)
Diffstat (limited to 'youtube_dl')
-rw-r--r-- | youtube_dl/extractor/chaturbate.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/youtube_dl/extractor/chaturbate.py b/youtube_dl/extractor/chaturbate.py index 0b67ba67d..242fba311 100644 --- a/youtube_dl/extractor/chaturbate.py +++ b/youtube_dl/extractor/chaturbate.py @@ -23,6 +23,8 @@ class ChaturbateIE(InfoExtractor): 'only_matching': True, }] + _ROOM_OFFLINE = 'Room is currently offline' + def _real_extract(self, url): video_id = self._match_id(url) @@ -34,9 +36,16 @@ class ChaturbateIE(InfoExtractor): if not m3u8_url: error = self._search_regex( - r'<span[^>]+class=(["\'])desc_span\1[^>]*>(?P<error>[^<]+)</span>', - webpage, 'error', group='error') - raise ExtractorError(error, expected=True) + [r'<span[^>]+class=(["\'])desc_span\1[^>]*>(?P<error>[^<]+)</span>', + r'<div[^>]+id=(["\'])defchat\1[^>]*>\s*<p><strong>(?P<error>[^<]+)<'], + webpage, 'error', group='error', default=None) + if not error: + if any(p not in webpage for p in ( + self._ROOM_OFFLINE, 'offline_tipping', 'tip_offline')): + error = self._ROOM_OFFLINE + if error: + raise ExtractorError(error, expected=True) + raise ExtractorError('Unable to find stream URL') formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4') |