diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py index add64612ec..687842f037 100644 --- a/yt_dlp/extractor/_extractors.py +++ b/yt_dlp/extractor/_extractors.py @@ -152,7 +152,6 @@ ARDBetaMediathekIE, ARDMediathekCollectionIE, ) -from .arkena import ArkenaIE from .arnes import ArnesIE from .art19 import ( Art19IE, diff --git a/yt_dlp/extractor/arkena.py b/yt_dlp/extractor/arkena.py deleted file mode 100644 index aa6c5ca4d6..0000000000 --- a/yt_dlp/extractor/arkena.py +++ /dev/null @@ -1,150 +0,0 @@ -from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - int_or_none, - parse_iso8601, - parse_qs, - try_get, -) - - -class ArkenaIE(InfoExtractor): - _VALID_URL = r'''(?x) - https?:// - (?: - video\.(?:arkena|qbrick)\.com/play2/embed/player\?| - play\.arkena\.com/(?:config|embed)/avp/v\d/player/media/(?P[^/]+)/[^/]+/(?P\d+) - ) - ''' - # See https://support.arkena.com/display/PLAY/Ways+to+embed+your+video - _EMBED_REGEX = [r']+src=(["\'])(?P(?:https?:)?//play\.arkena\.com/embed/avp/.+?)\1'] - _TESTS = [{ - 'url': 'https://video.qbrick.com/play2/embed/player?accountId=1034090&mediaId=d8ab4607-00090107-aab86310', - 'md5': '97f117754e5f3c020f5f26da4a44ebaf', - 'info_dict': { - 'id': 'd8ab4607-00090107-aab86310', - 'ext': 'mp4', - 'title': 'EM_HT20_117_roslund_v2.mp4', - 'timestamp': 1608285912, - 'upload_date': '20201218', - 'duration': 1429.162667, - 'subtitles': { - 'sv': 'count:3', - }, - }, - }, { - 'url': 'https://play.arkena.com/embed/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411', - 'only_matching': True, - }, { - 'url': 'https://play.arkena.com/config/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411/?callbackMethod=jQuery1111023664739129262213_1469227693893', - 'only_matching': True, - }, { - 'url': 'http://play.arkena.com/config/avp/v1/player/media/327336/darkmatter/131064/?callbackMethod=jQuery1111002221189684892677_1469227595972', - 'only_matching': True, - }, { - 'url': 'http://play.arkena.com/embed/avp/v1/player/media/327336/darkmatter/131064/', - 'only_matching': True, - }, { - 'url': 'http://video.arkena.com/play2/embed/player?accountId=472718&mediaId=35763b3b-00090078-bf604299&pageStyling=styled', - 'only_matching': True, - }] - - def _real_extract(self, url): - mobj = self._match_valid_url(url) - video_id = mobj.group('id') - account_id = mobj.group('account_id') - - # Handle http://video.arkena.com/play2/embed/player URL - if not video_id: - qs = parse_qs(url) - video_id = qs.get('mediaId', [None])[0] - account_id = qs.get('accountId', [None])[0] - if not video_id or not account_id: - raise ExtractorError('Invalid URL', expected=True) - - media = self._download_json( - f'https://video.qbrick.com/api/v1/public/accounts/{account_id}/medias/{video_id}', - video_id, query={ - # https://video.qbrick.com/docs/api/examples/library-api.html - 'fields': 'asset/resources/*/renditions/*(height,id,language,links/*(href,mimeType),type,size,videos/*(audios/*(codec,sampleRate),bitrate,codec,duration,height,width),width),created,metadata/*(title,description),tags', - }) - metadata = media.get('metadata') or {} - title = metadata['title'] - - duration = None - formats = [] - thumbnails = [] - subtitles = {} - for resource in media['asset']['resources']: - for rendition in (resource.get('renditions') or []): - rendition_type = rendition.get('type') - for i, link in enumerate(rendition.get('links') or []): - href = link.get('href') - if not href: - continue - if rendition_type == 'image': - thumbnails.append({ - 'filesize': int_or_none(rendition.get('size')), - 'height': int_or_none(rendition.get('height')), - 'id': rendition.get('id'), - 'url': href, - 'width': int_or_none(rendition.get('width')), - }) - elif rendition_type == 'subtitle': - subtitles.setdefault(rendition.get('language') or 'en', []).append({ - 'url': href, - }) - elif rendition_type == 'video': - f = { - 'filesize': int_or_none(rendition.get('size')), - 'format_id': rendition.get('id'), - 'url': href, - } - video = try_get(rendition, lambda x: x['videos'][i], dict) - if video: - if not duration: - duration = float_or_none(video.get('duration')) - f.update({ - 'height': int_or_none(video.get('height')), - 'tbr': int_or_none(video.get('bitrate'), 1000), - 'vcodec': video.get('codec'), - 'width': int_or_none(video.get('width')), - }) - audio = try_get(video, lambda x: x['audios'][0], dict) - if audio: - f.update({ - 'acodec': audio.get('codec'), - 'asr': int_or_none(audio.get('sampleRate')), - }) - formats.append(f) - elif rendition_type == 'index': - mime_type = link.get('mimeType') - if mime_type == 'application/smil+xml': - formats.extend(self._extract_smil_formats( - href, video_id, fatal=False)) - elif mime_type == 'application/x-mpegURL': - formats.extend(self._extract_m3u8_formats( - href, video_id, 'mp4', 'm3u8_native', - m3u8_id='hls', fatal=False)) - elif mime_type == 'application/hds+xml': - formats.extend(self._extract_f4m_formats( - href, video_id, f4m_id='hds', fatal=False)) - elif mime_type == 'application/dash+xml': - formats.extend(self._extract_mpd_formats( - href, video_id, mpd_id='dash', fatal=False)) - elif mime_type == 'application/vnd.ms-sstr+xml': - formats.extend(self._extract_ism_formats( - href, video_id, ism_id='mss', fatal=False)) - - return { - 'id': video_id, - 'title': title, - 'description': metadata.get('description'), - 'timestamp': parse_iso8601(media.get('created')), - 'thumbnails': thumbnails, - 'subtitles': subtitles, - 'duration': duration, - 'tags': media.get('tags'), - 'formats': formats, - } diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py index a2970d0774..fce39aa257 100644 --- a/yt_dlp/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -3107,7 +3107,6 @@ def location_key(location): else: # $Number*$ or $Time$ in media template with S list available # Example $Number*$: http://www.svtplay.se/klipp/9023742/stopptid-om-bjorn-borg - # Example $Time$: https://play.arkena.com/embed/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411 representation_ms_info['fragments'] = [] segment_time = 0 segment_d = None diff --git a/yt_dlp/extractor/lcp.py b/yt_dlp/extractor/lcp.py index 69148be222..936169fd90 100644 --- a/yt_dlp/extractor/lcp.py +++ b/yt_dlp/extractor/lcp.py @@ -1,8 +1,8 @@ -from .arkena import ArkenaIE from .common import InfoExtractor -class LcpPlayIE(ArkenaIE): # XXX: Do not subclass from concrete IE +class LcpPlayIE(InfoExtractor): + _WORKING = False _VALID_URL = r'https?://play\.lcp\.fr/embed/(?P[^/]+)/(?P[^/]+)/[^/]+/[^/]+' _TESTS = [{ 'url': 'http://play.lcp.fr/embed/327336/131064/darkmatter/0', @@ -24,21 +24,6 @@ class LcpIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?lcp\.fr/(?:[^/]+/)*(?P[^/]+)' _TESTS = [{ - # arkena embed - 'url': 'http://www.lcp.fr/la-politique-en-video/schwartzenberg-prg-preconise-francois-hollande-de-participer-une-primaire', - 'md5': 'b8bd9298542929c06c1c15788b1f277a', - 'info_dict': { - 'id': 'd56d03e9', - 'ext': 'mp4', - 'title': 'Schwartzenberg (PRG) préconise à François Hollande de participer à une primaire à gauche', - 'description': 'md5:96ad55009548da9dea19f4120c6c16a8', - 'timestamp': 1456488895, - 'upload_date': '20160226', - }, - 'params': { - 'skip_download': True, - }, - }, { # dailymotion live stream 'url': 'http://www.lcp.fr/le-direct', 'info_dict': {