youtube-dl

commit: fd4db1ebc231b65bea91add4cd55ce564b05eee3
parent b64045cd2a564bb44ef917803678ca362f412eb4
Author: axelerometer <54915681+axelerometer@users.noreply.github.com>
Date:   Fri,  4 Oct 2019 15:22:01 +0300

[chaturbate] Extend _VALID_URL (#22309)


Diffstat:
M
youtube_dl/extractor/chaturbate.py
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/chaturbate.py b/youtube_dl/extractor/chaturbate.py
@@ -7,7 +7,7 @@ from ..utils import ExtractorError
 
 
 class ChaturbateIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+\.)?chaturbate\.com/(?P<id>[^/?#]+)'
+    _VALID_URL = r'https?://(?:[^/]+\.)?chaturbate\.com/(?:fullvideo/?\?.*?\bb=)?(?P<id>[^/?&#]+)'
     _TESTS = [{
         'url': 'https://www.chaturbate.com/siswet19/',
         'info_dict': {
@@ -22,6 +22,9 @@ class ChaturbateIE(InfoExtractor):
         },
         'skip': 'Room is offline',
     }, {
+        'url': 'https://chaturbate.com/fullvideo/?b=caylin',
+        'only_matching': True,
+    }, {
         'url': 'https://en.chaturbate.com/siswet19/',
         'only_matching': True,
     }]
@@ -32,7 +35,8 @@ class ChaturbateIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            url, video_id, headers=self.geo_verification_headers())
+            'https://chaturbate.com/%s/' % video_id, video_id,
+            headers=self.geo_verification_headers())
 
         m3u8_urls = []