X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/4bfa401d40ce3419be539388fac59f4c7107ca77..61edf57f8f13f6dfd81154174e647eb5fdd26089:/yt_dlp/extractor/utreon.py diff --git a/yt_dlp/extractor/utreon.py b/yt_dlp/extractor/utreon.py index 4a25f0c55..fc44df97b 100644 --- a/yt_dlp/extractor/utreon.py +++ b/yt_dlp/extractor/utreon.py @@ -1,6 +1,3 @@ -# coding: utf-8 -from __future__ import unicode_literals - from .common import InfoExtractor from ..utils import ( dict_get, @@ -13,7 +10,8 @@ class UtreonIE(InfoExtractor): - _VALID_URL = r'(?:https?://)(?:www\.)?utreon.com/v/(?P[a-zA-Z0-9_-]+)' + IE_NAME = 'playeur' + _VALID_URL = r'https?://(?:www\.)?(?:utreon|playeur)\.com/v/(?P[\w-]+)' _TESTS = [{ 'url': 'https://utreon.com/v/z_I7ikQbuDw', 'info_dict': { @@ -22,31 +20,34 @@ class UtreonIE(InfoExtractor): 'title': 'Freedom Friday meditation - Rising in the wind', 'description': 'md5:a9bf15a42434a062fe313b938343ad1b', 'uploader': 'Heather Dawn Elemental Health', - 'thumbnail': 'https://data-1.utreon.com/v/MG/M2/NT/z_I7ikQbuDw/z_I7ikQbuDw_preview.jpg', + 'thumbnail': r're:^https?://.+\.jpg', 'release_date': '20210723', - } + 'duration': 586, + }, }, { 'url': 'https://utreon.com/v/jerJw5EOOVU', 'info_dict': { 'id': 'jerJw5EOOVU', 'ext': 'mp4', 'title': 'When I\'m alone, I love to reflect in peace, to make my dreams come true... [Quotes and Poems]', - 'description': 'md5:61ee6c2da98be51b04b969ca80273aaa', + 'description': 'md5:4026aa3a2c10169c3649926ac8ef62b6', 'uploader': 'Frases e Poemas Quotes and Poems', - 'thumbnail': 'https://data-1.utreon.com/v/Mz/Zh/ND/jerJw5EOOVU/jerJw5EOOVU_89af85470a4b16eededde7f8674c96d9_cover.jpg', + 'thumbnail': r're:^https?://.+\.jpg', 'release_date': '20210723', - } + 'duration': 60, + }, }, { 'url': 'https://utreon.com/v/C4ZxXhYBBmE', 'info_dict': { 'id': 'C4ZxXhYBBmE', 'ext': 'mp4', 'title': 'Biden’s Capital Gains Tax Rate to Test World’s Highest', - 'description': 'md5:fb5a6c2e506f013cc76f133f673bc5c8', + 'description': 'md5:995aa9ad0733c0e5863ebdeff954f40e', 'uploader': 'Nomad Capitalist', - 'thumbnail': 'https://data-1.utreon.com/v/ZD/k1/Mj/C4ZxXhYBBmE/C4ZxXhYBBmE_628342076198c9c06dd6b2c665978584_cover.jpg', + 'thumbnail': r're:^https?://.+\.jpg', 'release_date': '20210723', - } + 'duration': 884, + }, }, { 'url': 'https://utreon.com/v/Y-stEH-FBm8', 'info_dict': { @@ -55,15 +56,28 @@ class UtreonIE(InfoExtractor): 'title': 'Creeper-Chan Pranks Steve! 💚 [MINECRAFT ANIME]', 'description': 'md5:7a48450b0d761b96dec194be0c5ecb5f', 'uploader': 'Merryweather Comics', - 'thumbnail': 'https://data-1.utreon.com/v/MT/E4/Zj/Y-stEH-FBm8/Y-stEH-FBm8_5290676a41a4a1096db133b09f54f77b_cover.jpg', + 'thumbnail': r're:^https?://.+\.jpg', 'release_date': '20210718', - }}, - ] + 'duration': 151, + }, + }, { + 'url': 'https://playeur.com/v/Wzqp-UrxSeu', + 'info_dict': { + 'id': 'Wzqp-UrxSeu', + 'ext': 'mp4', + 'title': 'Update: Clockwork Basilisk Books on the Way!', + 'description': 'md5:d9756b0b1884c904655b0e170d17cea5', + 'uploader': 'Forgotten Weapons', + 'release_date': '20240208', + 'thumbnail': r're:^https?://.+\.jpg', + 'duration': 262, + }, + }] def _real_extract(self, url): video_id = self._match_id(url) json_data = self._download_json( - 'https://api.utreon.com/v1/videos/' + video_id, + 'https://api.playeur.com/v1/videos/' + video_id, video_id) videos_json = json_data['videos'] formats = [{ @@ -71,7 +85,6 @@ def _real_extract(self, url): 'format_id': format_key.split('_')[1], 'height': int(format_key.split('_')[1][:-1]), } for format_key, format_url in videos_json.items() if url_or_none(format_url)] - self._sort_formats(formats) thumbnail = url_or_none(dict_get(json_data, ('cover_image_url', 'preview_image_url'))) return { 'id': video_id,