diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py index d42bce21b2..c03d4b3f5e 100644 --- a/yt_dlp/extractor/_extractors.py +++ b/yt_dlp/extractor/_extractors.py @@ -256,6 +256,7 @@ BilibiliCheeseIE, BilibiliCheeseSeasonIE, BilibiliCollectionListIE, + BiliBiliDynamicIE, BilibiliFavoritesListIE, BiliBiliIE, BiliBiliPlayerIE, @@ -585,6 +586,10 @@ EggheadCourseIE, EggheadLessonIE, ) +from .eggs import ( + EggsArtistIE, + EggsIE, +) from .eighttracks import EightTracksIE from .eitb import EitbIE from .elementorembed import ElementorEmbedIE @@ -1279,6 +1284,10 @@ ) from .nekohacker import NekoHackerIE from .nerdcubed import NerdCubedFeedIE +from .nest import ( + NestClipIE, + NestIE, +) from .neteasemusic import ( NetEaseMusicAlbumIE, NetEaseMusicDjRadioIE, @@ -1533,6 +1542,10 @@ PinterestCollectionIE, PinterestIE, ) +from .piramidetv import ( + PiramideTVChannelIE, + PiramideTVIE, +) from .pixivsketch import ( PixivSketchIE, PixivSketchUserIE, diff --git a/yt_dlp/extractor/bilibili.py b/yt_dlp/extractor/bilibili.py index 2db951a608..33d9d92a0a 100644 --- a/yt_dlp/extractor/bilibili.py +++ b/yt_dlp/extractor/bilibili.py @@ -32,6 +32,7 @@ parse_qs, parse_resolution, qualities, + sanitize_url, smuggle_url, srt_subtitles_timecode, str_or_none, @@ -1861,6 +1862,47 @@ def _real_extract(self, url): ie=BiliBiliIE.ie_key(), video_id=video_id) +class BiliBiliDynamicIE(InfoExtractor): + _VALID_URL = r'https?://(?:t\.bilibili\.com|(?:www\.)?bilibili\.com/opus)/(?P\d+)' + _TESTS = [{ + 'url': 'https://t.bilibili.com/998134289197432852', + 'info_dict': { + 'id': 'BV1TAmBYVEJr', + 'ext': 'mp4', + 'uploader_id': '1192648858', + 'comment_count': int, + '_old_archive_ids': ['bilibili 113457567568273_part1'], + 'thumbnail': 'http://i2.hdslb.com/bfs/archive/50091efd965d9f13ff6814f7ad374f90ab21e77d.jpg', + 'duration': 929.238, + 'upload_date': '20241110', + 'uploader': '何同学工作室', + 'like_count': int, + 'view_count': int, + 'title': '美国小朋友就玩这个?!何同学工作室11月开箱', + 'description': '本期产品信息:\n机器狗\n气味模拟器\nCloudboom Strike LS\n无弦吉他\n蓝牙磁带音箱\n神奇画板', + 'timestamp': 1731232800, + 'tags': list, + 'chapters': list, + }, + }] + + def _real_extract(self, url): + post_id = self._match_id(url) + # Without the newer chrome UA, the API will return an error (-352) + post_data = self._download_json( + 'https://api.bilibili.com/x/polymer/web-dynamic/v1/detail', post_id, + query={'id': post_id}, headers={ + 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36', + }) + video_url = traverse_obj(post_data, ( + 'data', 'item', (None, 'orig'), 'modules', 'module_dynamic', + (('major', ('archive', 'pgc')), ('additional', ('reserve', 'common'))), + 'jump_url', {url_or_none}, any, {sanitize_url})) + if not video_url or (self.suitable(video_url) and post_id == self._match_id(video_url)): + raise ExtractorError('No valid video URL found', expected=True) + return self.url_result(video_url) + + class BiliIntlBaseIE(InfoExtractor): _API_URL = 'https://api.bilibili.tv/intl/gateway' _NETRC_MACHINE = 'biliintl' diff --git a/yt_dlp/extractor/bluesky.py b/yt_dlp/extractor/bluesky.py index 0e58a0932d..42dadf7b90 100644 --- a/yt_dlp/extractor/bluesky.py +++ b/yt_dlp/extractor/bluesky.py @@ -88,7 +88,7 @@ class BlueskyIE(InfoExtractor): }, }, { 'url': 'https://bsky.app/profile/de1.pds.tentacle.expert/post/3l3w4tnezek2e', - 'md5': '1af9c7fda061cf7593bbffca89e43d1c', + 'md5': 'cc0110ed1f6b0247caac8234cc1e861d', 'info_dict': { 'id': '3l3w4tnezek2e', 'ext': 'mp4', @@ -133,6 +133,8 @@ class BlueskyIE(InfoExtractor): 'channel_follower_count': int, 'categories': ['Entertainment'], 'tags': [], + 'chapters': list, + 'heatmap': 'count:100', }, 'add_ie': ['Youtube'], }, { @@ -184,14 +186,14 @@ class BlueskyIE(InfoExtractor): }, }, }, { - 'url': 'https://bsky.app/profile/alt.bun.how/post/3l7rdfxhyds2f', + 'url': 'https://bsky.app/profile/cinny.bun.how/post/3l7rdfxhyds2f', 'md5': '8775118b235cf9fa6b5ad30f95cda75c', 'info_dict': { 'id': '3l7rdfxhyds2f', 'ext': 'mp4', 'uploader': 'cinnamon', - 'uploader_id': 'alt.bun.how', - 'uploader_url': 'https://bsky.app/profile/alt.bun.how', + 'uploader_id': 'cinny.bun.how', + 'uploader_url': 'https://bsky.app/profile/cinny.bun.how', 'channel_id': 'did:plc:7x6rtuenkuvxq3zsvffp2ide', 'channel_url': 'https://bsky.app/profile/did:plc:7x6rtuenkuvxq3zsvffp2ide', 'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$', @@ -341,6 +343,7 @@ def _extract_videos(self, root, video_id, embed_path='embed', record_path='recor formats.append({ 'format_id': 'blob', + 'quality': 1, 'url': update_url_query( self._BLOB_URL_TMPL.format(endpoint), {'did': did, 'cid': video_cid}), **traverse_obj(root, (*embed_path, 'aspectRatio', { diff --git a/yt_dlp/extractor/eggs.py b/yt_dlp/extractor/eggs.py new file mode 100644 index 0000000000..6e032441cf --- /dev/null +++ b/yt_dlp/extractor/eggs.py @@ -0,0 +1,155 @@ +import secrets + +from .common import InfoExtractor +from .youtube import YoutubeIE +from ..utils import ( + int_or_none, + parse_iso8601, + str_or_none, + url_or_none, +) +from ..utils.traversal import traverse_obj + + +class EggsBaseIE(InfoExtractor): + _API_HEADERS = { + 'Accept': '*/*', + 'apVersion': '8.2.00', + 'deviceName': 'Android', + } + + def _real_initialize(self): + self._API_HEADERS['deviceId'] = secrets.token_hex(8) + + def _call_api(self, endpoint, video_id): + return self._download_json( + f'https://app-front-api.eggs.mu/v1/{endpoint}', video_id, + headers=self._API_HEADERS) + + def _extract_music_info(self, data): + if yt_url := traverse_obj(data, ('youtubeUrl', {url_or_none})): + return self.url_result(yt_url, ie=YoutubeIE) + + artist_name = traverse_obj(data, ('artist', 'artistName', {str_or_none})) + music_id = traverse_obj(data, ('musicId', {str_or_none})) + webpage_url = None + if artist_name and music_id: + webpage_url = f'https://eggs.mu/artist/{artist_name}/song/{music_id}' + + return { + 'id': music_id, + 'vcodec': 'none', + 'webpage_url': webpage_url, + 'extractor_key': EggsIE.ie_key(), + 'extractor': EggsIE.IE_NAME, + **traverse_obj(data, { + 'title': ('musicTitle', {str}), + 'url': ('musicDataPath', {url_or_none}), + 'uploader': ('artist', 'displayName', {str}), + 'uploader_id': ('artist', 'artistId', {str_or_none}), + 'thumbnail': ('imageDataPath', {url_or_none}), + 'view_count': ('numberOfMusicPlays', {int_or_none}), + 'like_count': ('numberOfLikes', {int_or_none}), + 'comment_count': ('numberOfComments', {int_or_none}), + 'composers': ('composer', {str}, all), + 'tags': ('tags', ..., {str}), + 'timestamp': ('releaseDate', {parse_iso8601}), + 'artist': ('artist', 'displayName', {str}), + })} + + +class EggsIE(EggsBaseIE): + IE_NAME = 'eggs:single' + _VALID_URL = r'https?://eggs\.mu/artist/[^/?#]+/song/(?P[\da-f-]+)' + + _TESTS = [{ + 'url': 'https://eggs.mu/artist/32_sunny_girl/song/0e95fd1d-4d61-4d5b-8b18-6092c551da90', + 'info_dict': { + 'id': '0e95fd1d-4d61-4d5b-8b18-6092c551da90', + 'ext': 'm4a', + 'title': 'シネマと信号', + 'uploader': 'Sunny Girl', + 'thumbnail': r're:https?://.*\.jpg(?:\?.*)?$', + 'uploader_id': '1607', + 'like_count': int, + 'timestamp': 1731327327, + 'composers': ['橘高連太郎'], + 'view_count': int, + 'comment_count': int, + 'artists': ['Sunny Girl'], + 'upload_date': '20241111', + 'tags': ['SunnyGirl', 'シネマと信号'], + }, + }, { + 'url': 'https://eggs.mu/artist/KAMO_3pband/song/1d4bc45f-1af6-47a9-8b30-a70cae350b4f', + 'info_dict': { + 'id': '80cLKA2wnoA', + 'ext': 'mp4', + 'title': 'KAMO「いい女だから」Audio', + 'uploader': 'KAMO', + 'live_status': 'not_live', + 'channel_id': 'UCsHLBw2__5Q9y55skXPotOg', + 'channel_follower_count': int, + 'description': 'md5:d260da711ecbec3e720293dc11401b87', + 'availability': 'public', + 'uploader_id': '@KAMO_band', + 'upload_date': '20240925', + 'thumbnail': 'https://i.ytimg.com/vi/80cLKA2wnoA/maxresdefault.jpg', + 'comment_count': int, + 'channel_url': 'https://www.youtube.com/channel/UCsHLBw2__5Q9y55skXPotOg', + 'view_count': int, + 'duration': 151, + 'like_count': int, + 'channel': 'KAMO', + 'playable_in_embed': True, + 'uploader_url': 'https://www.youtube.com/@KAMO_band', + 'tags': [], + 'timestamp': 1727271121, + 'age_limit': 0, + 'categories': ['People & Blogs'], + }, + 'add_ie': ['Youtube'], + 'params': {'skip_download': 'Youtube'}, + }] + + def _real_extract(self, url): + song_id = self._match_id(url) + json_data = self._call_api(f'musics/{song_id}', song_id) + return self._extract_music_info(json_data) + + +class EggsArtistIE(EggsBaseIE): + IE_NAME = 'eggs:artist' + _VALID_URL = r'https?://eggs\.mu/artist/(?P\w+)/?(?:[?#&]|$)' + + _TESTS = [{ + 'url': 'https://eggs.mu/artist/32_sunny_girl', + 'info_dict': { + 'id': '32_sunny_girl', + 'thumbnail': 'https://image-pro.eggs.mu/profile/1607.jpeg?updated_at=2024-04-03T20%3A06%3A00%2B09%3A00', + 'description': 'Muddy Mine / 東京高田馬場CLUB PHASE / Gt.Vo 橘高 連太郎 / Ba.Cho 小野 ゆうき / Dr 大森 りゅうひこ', + 'title': 'Sunny Girl', + }, + 'playlist_mincount': 18, + }, { + 'url': 'https://eggs.mu/artist/KAMO_3pband', + 'info_dict': { + 'id': 'KAMO_3pband', + 'description': '川崎発3ピースバンド', + 'thumbnail': 'https://image-pro.eggs.mu/profile/35217.jpeg?updated_at=2024-11-27T16%3A31%3A50%2B09%3A00', + 'title': 'KAMO', + }, + 'playlist_mincount': 2, + }] + + def _real_extract(self, url): + artist_id = self._match_id(url) + artist_data = self._call_api(f'artists/{artist_id}', artist_id) + song_data = self._call_api(f'artists/{artist_id}/musics', artist_id) + return self.playlist_result( + traverse_obj(song_data, ('data', ..., {dict}, {self._extract_music_info})), + playlist_id=artist_id, **traverse_obj(artist_data, { + 'title': ('displayName', {str}), + 'description': ('profile', {str}), + 'thumbnail': ('imageDataPath', {url_or_none}), + })) diff --git a/yt_dlp/extractor/lbry.py b/yt_dlp/extractor/lbry.py index 0445b7cbfc..7b22f90e9b 100644 --- a/yt_dlp/extractor/lbry.py +++ b/yt_dlp/extractor/lbry.py @@ -310,7 +310,13 @@ def _real_extract(self, url): if stream_type in self._SUPPORTED_STREAM_TYPES: claim_id, is_live = result['claim_id'], False streaming_url = self._call_api_proxy( - 'get', claim_id, {'uri': uri}, 'streaming url')['streaming_url'] + 'get', claim_id, { + 'uri': uri, + **traverse_obj(parse_qs(url), { + 'signature': ('signature', 0), + 'signature_ts': ('signature_ts', 0), + }), + }, 'streaming url')['streaming_url'] # GET request to v3 API returns original video/audio file if available direct_url = re.sub(r'/api/v\d+/', '/api/v3/', streaming_url) diff --git a/yt_dlp/extractor/nest.py b/yt_dlp/extractor/nest.py new file mode 100644 index 0000000000..3f8316b3e5 --- /dev/null +++ b/yt_dlp/extractor/nest.py @@ -0,0 +1,117 @@ +from .common import InfoExtractor +from ..utils import ExtractorError, float_or_none, update_url_query, url_or_none +from ..utils.traversal import traverse_obj + + +class NestIE(InfoExtractor): + _VALID_URL = r'https?://video\.nest\.com/(?:embedded/)?live/(?P\w+)' + _EMBED_REGEX = [rf'