From 4afdcdfddfc672cb07ae209b0d951b41bd3edd11 Mon Sep 17 00:00:00 2001 From: Aksel Eromeeter <54915681+axelerometer@users.noreply.github.com> Date: Thu, 5 Sep 2019 00:32:04 +0300 Subject: [PATCH] [chaturbate] Allow alternative URLs at /fullvideo/ --- youtube_dl/extractor/chaturbate.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/chaturbate.py b/youtube_dl/extractor/chaturbate.py index e2b828d8a..632a1ed10 100644 --- 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[^/?#]+)' + _VALID_URL = r'^https?://(?:[^/]+\.)?chaturbate\.com/(?:fullvideo/\?b=)?(?P[^/?&#]+)' _TESTS = [{ 'url': 'https://www.chaturbate.com/siswet19/', 'info_dict': { @@ -21,6 +21,9 @@ class ChaturbateIE(InfoExtractor): 'skip_download': True, }, 'skip': 'Room is offline', + }, { + 'url': 'https://chaturbate.com/fullvideo/?b=caylin', + 'only_matching': True, }, { 'url': 'https://en.chaturbate.com/siswet19/', 'only_matching': True, @@ -30,6 +33,7 @@ class ChaturbateIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) + url = 'https://chaturbate.com/%s/' % video_id webpage = self._download_webpage( url, video_id, headers=self.geo_verification_headers())