From 5db78d3fde3cf01648f671ba0615e9417fb01621 Mon Sep 17 00:00:00 2001 From: TheGilias Date: Tue, 12 Nov 2019 09:55:38 -0500 Subject: [PATCH 1/2] [beampro_clip] Added support for Mixer clips --- youtube_dl/extractor/beampro.py | 75 +++++++++++++++++++++++++++++- youtube_dl/extractor/extractors.py | 1 + 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/beampro.py b/youtube_dl/extractor/beampro.py index 86abdae00..337c9fb51 100644 --- a/youtube_dl/extractor/beampro.py +++ b/youtube_dl/extractor/beampro.py @@ -57,7 +57,12 @@ class BeamProLiveIE(BeamProBaseIE): @classmethod def suitable(cls, url): - return False if BeamProVodIE.suitable(url) else super(BeamProLiveIE, cls).suitable(url) + if BeamProVodIE.suitable(url): + return False + elif BeamProClipIE.suitable(url): + return False + else: + super(BeamProLiveIE, cls).suitable(url) def _real_extract(self, url): channel_name = self._match_id(url) @@ -192,3 +197,71 @@ class BeamProVodIE(BeamProBaseIE): info.update(self._extract_channel_info(vod_info.get('channel') or {})) return info + + +class BeamProClipIE(BeamProBaseIE): + IE_NAME = 'Mixer:clip' + _VALID_URL = r'https?://(?:\w+\.)?(?:beam\.pro|mixer\.com)/[^/?#&]+\?.*?\bclip=(?P[^?#&]+)' + _TEST = { + 'url': 'https://mixer.com/PermaNoob?clip=DB1mDsthm0eTtpsXv35vJw', + 'md5': '581390e34c073251514bc825fded9d6f', + 'info_dict': { + 'id': 'DB1mDsthm0eTtpsXv35vJw', + 'ext': 'mp4', + 'title': 'Morning Shenanigans: Come Hang Out with Us!', + 'duration': 32.0, + 'thumbnail': r're:https://.*big\.jpg$', + 'timestamp': 1573233791, + 'upload_date': '20191108', + 'view_count': int, + } + } + + @staticmethod + def _extract_format(clip, clip_type): + if not clip.get('uri'): + return [] + + if clip_type == 'HlsStreaming': + protocol = 'm3u8_native' + else: + assert False + + format_id = [clip_type] + + return [{ + 'url': clip.get('uri'), + 'format_id': '-'.join(format_id), + 'ext': 'mp4', + 'protocol': protocol + }] + + def _real_extract(self, url): + clip_id = self._match_id(url) + + clip_info = self._download_json( + '%s/clips/%s' % (self._API_BASE, clip_id), clip_id) + + formats = [] + thumbnail_url = None + + for locator in clip_info['contentLocators']: + locator_type = locator.get('locatorType') + if locator_type == 'HlsStreaming': + formats.extend(self._extract_format(locator, locator_type)) + elif locator_type == 'Thumbnail_Large': + thumbnail_url = locator.get('uri') + + self._sort_formats(formats) + + info = { + 'id': clip_id, + 'title': clip_info.get('title') or clip_id, + 'duration': float_or_none(clip_info.get('durationInSeconds')), + 'thumbnail': thumbnail_url, + 'timestamp': parse_iso8601(clip_info.get('uploadDate')), + 'view_count': int_or_none(clip_info.get('viewCount')), + 'formats': formats, + } + + return info diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index d96f0d284..c7d316e94 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -90,6 +90,7 @@ from .bbc import ( from .beampro import ( BeamProLiveIE, BeamProVodIE, + BeamProClipIE, ) from .beeg import BeegIE from .behindkink import BehindKinkIE From a4797ff1a57d38118384b6a3eb538074b2654490 Mon Sep 17 00:00:00 2001 From: TheGilias Date: Tue, 12 Nov 2019 13:38:37 -0500 Subject: [PATCH 2/2] [beampro] Mixer Clip support added --- youtube_dl/extractor/beampro.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/youtube_dl/extractor/beampro.py b/youtube_dl/extractor/beampro.py index 337c9fb51..0236e39c0 100644 --- a/youtube_dl/extractor/beampro.py +++ b/youtube_dl/extractor/beampro.py @@ -57,12 +57,7 @@ class BeamProLiveIE(BeamProBaseIE): @classmethod def suitable(cls, url): - if BeamProVodIE.suitable(url): - return False - elif BeamProClipIE.suitable(url): - return False - else: - super(BeamProLiveIE, cls).suitable(url) + return False if BeamProVodIE.suitable(url) or BeamProClipIE.suitable(url) else super(BeamProLiveIE, cls).suitable(url) def _real_extract(self, url): channel_name = self._match_id(url)