|
|
@ -33,10 +33,17 @@ class ChaturbateIE(InfoExtractor): |
|
|
|
|
|
|
|
webpage = self._download_webpage(url, video_id) |
|
|
|
|
|
|
|
m3u8_formats = [(m.group('id').lower(), m.group('url')) for m in re.finditer( |
|
|
|
r'hlsSource(?P<id>.+?)\s*=\s*(?P<q>["\'])(?P<url>http.+?)(?P=q)', webpage)] |
|
|
|
m3u8_urls = [] |
|
|
|
|
|
|
|
if not m3u8_formats: |
|
|
|
for m in re.finditer( |
|
|
|
r'(["\'])(?P<url>http.+?\.m3u8.*?)\1', webpage): |
|
|
|
m3u8_fast_url, m3u8_no_fast_url = m.group('url'), m.group( |
|
|
|
'url').replace('_fast', '') |
|
|
|
for m3u8_url in (m3u8_fast_url, m3u8_no_fast_url): |
|
|
|
if m3u8_url not in m3u8_urls: |
|
|
|
m3u8_urls.append(m3u8_url) |
|
|
|
|
|
|
|
if not m3u8_urls: |
|
|
|
error = self._search_regex( |
|
|
|
[r'<span[^>]+class=(["\'])desc_span\1[^>]*>(?P<error>[^<]+)</span>', |
|
|
|
r'<div[^>]+id=(["\'])defchat\1[^>]*>\s*<p><strong>(?P<error>[^<]+)<'], |
|
|
@ -50,7 +57,8 @@ class ChaturbateIE(InfoExtractor): |
|
|
|
raise ExtractorError('Unable to find stream URL') |
|
|
|
|
|
|
|
formats = [] |
|
|
|
for m3u8_id, m3u8_url in m3u8_formats: |
|
|
|
for m3u8_url in m3u8_urls: |
|
|
|
m3u8_id = 'fast' if '_fast' in m3u8_url else 'slow' |
|
|
|
formats.extend(self._extract_m3u8_formats( |
|
|
|
m3u8_url, video_id, ext='mp4', |
|
|
|
# ffmpeg skips segments for fast m3u8 |
|
|
|