]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[chaturbate] Fix extraction
authoreinstein95 <einstein95@users.noreply.github.com>
Sat, 21 Jan 2017 13:00:38 +0000 (02:00 +1300)
committerSergey M․ <dstftw@gmail.com>
Sat, 21 Jan 2017 19:58:40 +0000 (02:58 +0700)
youtube_dl/extractor/chaturbate.py

index 29a8820d5835b1b3cf7aca3840705a2fb2f2e1e3..1c2f065dfb134f3050680ae9b3a6a4ba419933b5 100644 (file)
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import re
+
 from .common import InfoExtractor
 from ..utils import ExtractorError
 
@@ -31,30 +33,32 @@ class ChaturbateIE(InfoExtractor):
 
         webpage = self._download_webpage(url, video_id)
 
-        m3u8_url = self._search_regex(
-            r'src=(["\'])(?P<url>http.+?\.m3u8.*?)\1', webpage,
-            'playlist', default=None, group='url')
+        m3u8_urls = re.findall(
+            r'var hlsSource.+? = (["\'])(?P<url>http.+?\.m3u8)', webpage)
 
-        if not 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>[^<]+)<'],
                 webpage, 'error', group='error', default=None)
             if not error:
-                if any(p not in webpage for p in (
+                if any(p 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')
+        formats = []
+        for m3u8_url in m3u8_urls:
+            formats.append(self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4')[0])
+
         self._sort_formats(formats)
 
         return {
             'id': video_id,
             'title': self._live_title(video_id),
-            'thumbnail': 'https://cdn-s.highwebmedia.com/uHK3McUtGCG3SMFcd4ZJsRv8/roomimage/%s.jpg' % video_id,
+            'thumbnail': 'https://roomimg.stream.highwebmedia.com/ri/%s.jpg' % video_id,
             'age_limit': self._rta_search(webpage),
             'is_live': True,
             'formats': formats,