forked from yt-dlp/yt-dlp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'yt-dlp:master' into master
- Loading branch information
Showing
9 changed files
with
551 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<id>[\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<id>\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': '川崎発３ピースバンド', | ||
| '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}), | ||
| })) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<id>\w+)' | ||
| _EMBED_REGEX = [rf'<iframe [^>]*\bsrc=[\'"](?P<url>{_VALID_URL})'] | ||
| _TESTS = [{ | ||
| 'url': 'https://video.nest.com/embedded/live/4fvYdSo8AX?autoplay=0', | ||
| 'info_dict': { | ||
| 'id': '4fvYdSo8AX', | ||
| 'ext': 'mp4', | ||
| 'title': 'startswith:Outside ', | ||
| 'alt_title': 'Outside', | ||
| 'description': '<null>', | ||
| 'location': 'Los Angeles', | ||
| 'availability': 'public', | ||
| 'thumbnail': r're:https?://', | ||
| 'live_status': 'is_live', | ||
| }, | ||
| 'params': { | ||
| # m3u8 download | ||
| 'skip_download': True, | ||
| }, | ||
| }, { | ||
| 'url': 'https://video.nest.com/live/4fvYdSo8AX', | ||
| 'only_matching': True, | ||
| }] | ||
| _WEBPAGE_TESTS = [{ | ||
| 'url': 'https://www.pacificblue.biz/noyo-harbor-webcam/', | ||
| 'info_dict': { | ||
| 'id': '4fvYdSo8AX', | ||
| 'ext': 'mp4', | ||
| 'title': 'startswith:Outside ', | ||
| 'alt_title': 'Outside', | ||
| 'description': '<null>', | ||
| 'location': 'Los Angeles', | ||
| 'availability': 'public', | ||
| 'thumbnail': r're:https?://', | ||
| 'live_status': 'is_live', | ||
| }, | ||
| 'params': { | ||
| # m3u8 download | ||
| 'skip_download': True, | ||
| }, | ||
| }] | ||
|
|
||
| def _real_extract(self, url): | ||
| video_id = self._match_id(url) | ||
| item = self._download_json( | ||
| 'https://video.nest.com/api/dropcam/cameras.get_by_public_token', | ||
| video_id, query={'token': video_id})['items'][0] | ||
| uuid = item.get('uuid') | ||
| stream_domain = item.get('live_stream_host') | ||
| if not stream_domain or not uuid: | ||
| raise ExtractorError('Unable to construct playlist URL') | ||
|
|
||
| thumb_domain = item.get('nexus_api_nest_domain_host') | ||
| return { | ||
| 'id': video_id, | ||
| **traverse_obj(item, { | ||
| 'description': ('description', {str}), | ||
| 'title': (('title', 'name', 'where'), {str}, filter, any), | ||
| 'alt_title': ('name', {str}), | ||
| 'location': ((('timezone', {lambda x: x.split('/')[1].replace('_', ' ')}), 'where'), {str}, filter, any), | ||
| }), | ||
| 'thumbnail': update_url_query( | ||
| f'https://{thumb_domain}/get_image', | ||
| {'uuid': uuid, 'public': video_id}) if thumb_domain else None, | ||
| 'availability': self._availability(is_private=item.get('is_public') is False), | ||
| 'formats': self._extract_m3u8_formats( | ||
| f'https://{stream_domain}/nexus_aac/{uuid}/playlist.m3u8', | ||
| video_id, 'mp4', live=True, query={'public': video_id}), | ||
| 'is_live': True, | ||
| } | ||
|
|
||
|
|
||
| class NestClipIE(InfoExtractor): | ||
| _VALID_URL = r'https?://video\.nest\.com/(?:embedded/)?clip/(?P<id>\w+)' | ||
| _EMBED_REGEX = [rf'<iframe [^>]*\bsrc=[\'"](?P<url>{_VALID_URL})'] | ||
| _TESTS = [{ | ||
| 'url': 'https://video.nest.com/clip/f34c9dd237a44eca9a0001af685e3dff', | ||
| 'info_dict': { | ||
| 'id': 'f34c9dd237a44eca9a0001af685e3dff', | ||
| 'ext': 'mp4', | ||
| 'title': 'NestClip video #f34c9dd237a44eca9a0001af685e3dff', | ||
| 'thumbnail': 'https://clips.dropcam.com/f34c9dd237a44eca9a0001af685e3dff.jpg', | ||
| 'timestamp': 1735413474.468, | ||
| 'upload_date': '20241228', | ||
| }, | ||
| }, { | ||
| 'url': 'https://video.nest.com/embedded/clip/34e0432adc3c46a98529443d8ad5aa76', | ||
| 'info_dict': { | ||
| 'id': '34e0432adc3c46a98529443d8ad5aa76', | ||
| 'ext': 'mp4', | ||
| 'title': 'Shootout at Veterans Boulevard at Fleur De Lis Drive', | ||
| 'thumbnail': 'https://clips.dropcam.com/34e0432adc3c46a98529443d8ad5aa76.jpg', | ||
| 'upload_date': '20230817', | ||
| 'timestamp': 1692262897.191, | ||
| }, | ||
| }] | ||
|
|
||
| def _real_extract(self, url): | ||
| video_id = self._match_id(url) | ||
| data = self._download_json( | ||
| 'https://video.nest.com/api/dropcam/videos.get_by_filename', video_id, | ||
| query={'filename': f'{video_id}.mp4'}) | ||
| return { | ||
| 'id': video_id, | ||
| **traverse_obj(data, ('items', 0, { | ||
| 'title': ('title', {str}), | ||
| 'thumbnail': ('thumbnail_url', {url_or_none}), | ||
| 'url': ('download_url', {url_or_none}), | ||
| 'timestamp': ('start_time', {float_or_none}), | ||
| })), | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.