From 3f70203467bd15459923be91870ec5cc958bd05f Mon Sep 17 00:00:00 2001 From: JChris246 Date: Wed, 7 Aug 2019 20:47:39 -0400 Subject: [PATCH 1/5] [Camsoda] Add new extractor --- youtube_dl/extractor/camsoda.py | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 youtube_dl/extractor/camsoda.py diff --git a/youtube_dl/extractor/camsoda.py b/youtube_dl/extractor/camsoda.py new file mode 100644 index 000000000..036d0428f --- /dev/null +++ b/youtube_dl/extractor/camsoda.py @@ -0,0 +1,53 @@ +# coding: utf-8 +from __future__ import unicode_literals + +from .common import InfoExtractor +import random +from ..utils import ExtractorError + + +class CamsodaIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)?camsoda\.com/(?P\S+)' + _TEST = { + 'url': 'https://camsoda.com/bustynasha', + 'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)', + 'info_dict': { + 'id': '42', + 'ext': 'mp4', + 'title': 're:^bustynasha [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', + 'age_limit': 18, + 'is_live': True, + } + } + + def _real_extract(self, url): + video_id = self._match_id(url) + user_data = self._download_json('https://www.camsoda.com/api/v1/user/%s' % video_id, 'Downloading user data', video_id) + + if not user_data.get('status'): + raise ExtractorError('Stream is not available', expected=True) + + # TODO more code goes here, for example ... + video_data = self._download_json('https://www.camsoda.com/api/v1/video/vtoken/%s?username=guest_%s' % + (video_id, str(random.randint(1000, 99999))), 'Downloading second json', video_id) + + HLS_URL_VIDEO = 'https://{server}/{app}/mp4:{stream_name}_aac/playlist.m3u8?token={token}' + hls_url = HLS_URL_VIDEO.format( + server=video_data['edge_servers'][0], + app=video_data['app'], + stream_name=video_data['stream_name'], + token=video_data['token'] + ) + + formats = [] + formats.extend(self._extract_m3u8_formats( + hls_url, video_id, ext='mp4', + fatal=False, live=True) + ) + + return { + 'id': video_id, + 'title': self._live_title(video_id), + 'is_live': True, + 'formats': formats, + } From 9fbf1376cf191f645c0762c071c18ad821456648 Mon Sep 17 00:00:00 2001 From: JChris246 Date: Wed, 7 Aug 2019 20:52:23 -0400 Subject: [PATCH 2/5] Made some slight changes --- youtube_dl/extractor/camsoda.py | 36 +++++++++++++++++++++--------- youtube_dl/extractor/extractors.py | 1 + 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/youtube_dl/extractor/camsoda.py b/youtube_dl/extractor/camsoda.py index 036d0428f..9add4383a 100644 --- a/youtube_dl/extractor/camsoda.py +++ b/youtube_dl/extractor/camsoda.py @@ -9,30 +9,43 @@ from ..utils import ExtractorError class CamsodaIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?camsoda\.com/(?P\S+)' _TEST = { - 'url': 'https://camsoda.com/bustynasha', - 'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)', + 'url': 'https://camsoda.com/valeryromero', 'info_dict': { 'id': '42', 'ext': 'mp4', - 'title': 're:^bustynasha [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', + 'title': 're:^valeryromero [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', 'age_limit': 18, 'is_live': True, - } + }, + 'params': { + 'skip_download': True, + }, + 'skip': 'User is offline', } def _real_extract(self, url): video_id = self._match_id(url) - user_data = self._download_json('https://www.camsoda.com/api/v1/user/%s' % video_id, 'Downloading user data', video_id) + user_data = self._download_json('https://www.camsoda.com/api/v1/user/%s' % + video_id, 'Downloading user data', video_id) if not user_data.get('status'): + raise ExtractorError('Not a valid user', expected=True) + + video_data = self._download_json( + 'https://www.camsoda.com/api/v1/video/vtoken/%s?username=guest_%s' % + (video_id, str(random.randint(1000, 99999))), + 'Downloading second json', video_id + ) + + if not video_data.get('edge_servers'): raise ExtractorError('Stream is not available', expected=True) - # TODO more code goes here, for example ... - video_data = self._download_json('https://www.camsoda.com/api/v1/video/vtoken/%s?username=guest_%s' % - (video_id, str(random.randint(1000, 99999))), 'Downloading second json', video_id) + user = user_data.get('user') + if user: + thumb = user.get('thumb') or user.get('profile_picture') - HLS_URL_VIDEO = 'https://{server}/{app}/mp4:{stream_name}_aac/playlist.m3u8?token={token}' - hls_url = HLS_URL_VIDEO.format( + VIDEO_URL = 'https://{server}/{app}/mp4:{stream_name}_aac/playlist.m3u8?token={token}' + m3u8_url = VIDEO_URL.format( server=video_data['edge_servers'][0], app=video_data['app'], stream_name=video_data['stream_name'], @@ -41,7 +54,7 @@ class CamsodaIE(InfoExtractor): formats = [] formats.extend(self._extract_m3u8_formats( - hls_url, video_id, ext='mp4', + m3u8_url, video_id, ext='mp4', fatal=False, live=True) ) @@ -49,5 +62,6 @@ class CamsodaIE(InfoExtractor): 'id': video_id, 'title': self._live_title(video_id), 'is_live': True, + 'thumbnail': thumb, 'formats': formats, } diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 06de556b7..e1d9696c3 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -139,6 +139,7 @@ from .camdemy import ( CamdemyFolderIE ) from .cammodels import CamModelsIE +from .camsoda import CamsodaIE from .camtube import CamTubeIE from .camwithher import CamWithHerIE from .canalplus import CanalplusIE From deb1525c05cfbbc695a9c421dc850ef10f98b415 Mon Sep 17 00:00:00 2001 From: JChris246 Date: Sun, 11 Aug 2019 15:58:16 -0400 Subject: [PATCH 3/5] Attempt to conform to coding conventions --- youtube_dl/extractor/camsoda.py | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/youtube_dl/extractor/camsoda.py b/youtube_dl/extractor/camsoda.py index 9add4383a..b732e35ab 100644 --- a/youtube_dl/extractor/camsoda.py +++ b/youtube_dl/extractor/camsoda.py @@ -11,7 +11,7 @@ class CamsodaIE(InfoExtractor): _TEST = { 'url': 'https://camsoda.com/valeryromero', 'info_dict': { - 'id': '42', + 'id': 'valeryromero', 'ext': 'mp4', 'title': 're:^valeryromero [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$', 'age_limit': 18, @@ -25,38 +25,37 @@ class CamsodaIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - user_data = self._download_json('https://www.camsoda.com/api/v1/user/%s' % - video_id, 'Downloading user data', video_id) + user_data = self._download_json( + 'https://www.camsoda.com/api/v1/user/%s' % video_id, + 'Downloading user data', video_id) - if not user_data.get('status'): - raise ExtractorError('Not a valid user', expected=True) - - video_data = self._download_json( - 'https://www.camsoda.com/api/v1/video/vtoken/%s?username=guest_%s' % - (video_id, str(random.randint(1000, 99999))), - 'Downloading second json', video_id - ) - - if not video_data.get('edge_servers'): - raise ExtractorError('Stream is not available', expected=True) + if (not user_data.get('status')) or user_data.get('status') == 0: + raise ExtractorError('No broadcaster found', expected=True) user = user_data.get('user') if user: thumb = user.get('thumb') or user.get('profile_picture') + else: + thumb = None + + video_data = self._download_json( + 'https://www.camsoda.com/api/v1/video/vtoken/%s?username=guest_%s' % + (video_id, str(random.randint(1000, 99999))), + 'Downloading stream token', video_id) + + if not video_data.get('edge_servers'): + raise ExtractorError('Stream is not available', expected=True) VIDEO_URL = 'https://{server}/{app}/mp4:{stream_name}_aac/playlist.m3u8?token={token}' m3u8_url = VIDEO_URL.format( server=video_data['edge_servers'][0], app=video_data['app'], stream_name=video_data['stream_name'], - token=video_data['token'] - ) + token=video_data['token']) formats = [] formats.extend(self._extract_m3u8_formats( - m3u8_url, video_id, ext='mp4', - fatal=False, live=True) - ) + m3u8_url, video_id, ext='mp4', live=True)) return { 'id': video_id, @@ -64,4 +63,5 @@ class CamsodaIE(InfoExtractor): 'is_live': True, 'thumbnail': thumb, 'formats': formats, + 'age_limit': 18, } From ad3a52a2782178bc8291b16c6c2a2387c2ec30c8 Mon Sep 17 00:00:00 2001 From: JChris246 Date: Sun, 11 Aug 2019 16:08:07 -0400 Subject: [PATCH 4/5] Removed repetition --- youtube_dl/extractor/camsoda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/camsoda.py b/youtube_dl/extractor/camsoda.py index b732e35ab..ce4b1ac64 100644 --- a/youtube_dl/extractor/camsoda.py +++ b/youtube_dl/extractor/camsoda.py @@ -29,7 +29,7 @@ class CamsodaIE(InfoExtractor): 'https://www.camsoda.com/api/v1/user/%s' % video_id, 'Downloading user data', video_id) - if (not user_data.get('status')) or user_data.get('status') == 0: + if not user_data.get('status'): raise ExtractorError('No broadcaster found', expected=True) user = user_data.get('user') From b560f884774fab5208f82a9bcdbf644cc88e181d Mon Sep 17 00:00:00 2001 From: JChris246 Date: Sun, 1 Sep 2019 15:45:06 -0400 Subject: [PATCH 5/5] making requested changes corrected order of video id and note changed str to compat_str removed query from string and passed as var changed str.format to old style %operator check to make sure user is a dict --- youtube_dl/extractor/camsoda.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/youtube_dl/extractor/camsoda.py b/youtube_dl/extractor/camsoda.py index ce4b1ac64..36e43430b 100644 --- a/youtube_dl/extractor/camsoda.py +++ b/youtube_dl/extractor/camsoda.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor +from ..compat import compat_str import random from ..utils import ExtractorError @@ -27,31 +28,29 @@ class CamsodaIE(InfoExtractor): video_id = self._match_id(url) user_data = self._download_json( 'https://www.camsoda.com/api/v1/user/%s' % video_id, - 'Downloading user data', video_id) + video_id, 'Downloading user data') if not user_data.get('status'): raise ExtractorError('No broadcaster found', expected=True) - user = user_data.get('user') + user = user_data.get('user') if isinstance(user_data.get('user'), dict) else None if user: thumb = user.get('thumb') or user.get('profile_picture') else: thumb = None video_data = self._download_json( - 'https://www.camsoda.com/api/v1/video/vtoken/%s?username=guest_%s' % - (video_id, str(random.randint(1000, 99999))), - 'Downloading stream token', video_id) + 'https://www.camsoda.com/api/v1/video/vtoken/%s' % video_id, video_id, + 'Downloading stream token', query={ + 'username': 'guest_%s' % compat_str(random.randint(1000, 99999)), + }) if not video_data.get('edge_servers'): raise ExtractorError('Stream is not available', expected=True) - VIDEO_URL = 'https://{server}/{app}/mp4:{stream_name}_aac/playlist.m3u8?token={token}' - m3u8_url = VIDEO_URL.format( - server=video_data['edge_servers'][0], - app=video_data['app'], - stream_name=video_data['stream_name'], - token=video_data['token']) + m3u8_url = 'https://%s/%s/mp4:%s_aac/playlist.m3u8?token=%s' % ( + video_data['edge_servers'][0], video_data['app'], + video_data['stream_name'], video_data['token']) formats = [] formats.extend(self._extract_m3u8_formats(