xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-23 19:33:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ie/neteasemusic] Extract more formats from new API (#10258)

Browse Source 
Closes #9196, Closes #10239
Authored by: hafeoz
This commit is contained in:
hafeoz 2024-06-27 16:17:32 +00:00 committed by GitHub
parent f2a4ea1794
commit 7a03f88c40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 109 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
yt_dlp/extractor/neteasemusic.py
View File

@ -22,12 +22,22 @@
class NetEaseMusicBaseIE(InfoExtractor): class NetEaseMusicBaseIE(InfoExtractor):
_FORMATS = ['bMusic', 'mMusic', 'hMusic'] # XXX: _extract_formats logic depends on the order of the levels in each tier
_LEVELS = (
'standard', # free tier; 标准; 128kbps mp3 or aac
'higher', # free tier; 192kbps mp3 or aac
'exhigh', # free tier; 极高 (HQ); 320kbps mp3 or aac
'lossless', # VIP tier; 无损 (SQ); 48kHz/16bit flac
'hires', # VIP tier; 高解析度无损 (Hi-Res); 192kHz/24bit flac
'jyeffect', # VIP tier; 高清臻音 (Spatial Audio); 96kHz/24bit flac
'jymaster', # SVIP tier; 超清母带 (Master); 192kHz/24bit flac
'sky', # SVIP tier; 沉浸环绕声 (Surround Audio); flac
)
_API_BASE = 'http://music.163.com/api/' _API_BASE = 'http://music.163.com/api/'
_GEO_BYPASS = False _GEO_BYPASS = False
@staticmethod @staticmethod
def kilo_or_none(value): def _kilo_or_none(value):
return int_or_none(value, scale=1000) return int_or_none(value, scale=1000)
def _create_eapi_cipher(self, api_path, query_body, cookies): def _create_eapi_cipher(self, api_path, query_body, cookies):
@ -66,45 +76,43 @@ def _download_eapi_json(self, path, video_id, query_body, headers={}, **kwargs):
**headers, **headers,
}, **kwargs) }, **kwargs)
def _call_player_api(self, song_id, bitrate): def _call_player_api(self, song_id, level):
return self._download_eapi_json( return self._download_eapi_json(
'/song/enhance/player/url', song_id, {'ids': f'[{song_id}]', 'br': bitrate}, '/song/enhance/player/url/v1', song_id,
note=f'Downloading song URL info: bitrate {bitrate}') {'ids': f'[{song_id}]', 'level': level, 'encodeType': 'flac'},
note=f'Downloading song URL info: level {level}')
def extract_formats(self, info): def _extract_formats(self, info):
err = 0
formats = [] formats = []
song_id = info['id'] song_id = info['id']
for song_format in self._FORMATS: for level in self._LEVELS:
details = info.get(song_format) song = traverse_obj(
if not details: self._call_player_api(song_id, level), ('data', lambda _, v: url_or_none(v['url']), any))
if not song:
break # Media is not available due to removal or geo-restriction
actual_level = song.get('level')
if actual_level and actual_level != level:
if level in ('lossless', 'jymaster'):
break # We've already extracted the highest level of the user's account tier
continue continue
bitrate = int_or_none(details.get('bitrate')) or 999000 formats.append({
for song in traverse_obj(self._call_player_api(song_id, bitrate), ('data', lambda _, v: url_or_none(v['url']))): 'url': song['url'],
song_url = song['url'] 'format_id': level,
if self._is_valid_url(song_url, info['id'], 'song'): 'vcodec': 'none',
formats.append({ **traverse_obj(song, {
'url': song_url, 'ext': ('type', {str}),
'format_id': song_format, 'abr': ('br', {self._kilo_or_none}),
'asr': traverse_obj(details, ('sr', {int_or_none})), 'filesize': ('size', {int_or_none}),
**traverse_obj(song, { }),
'ext': ('type', {str}), })
'abr': ('br', {self.kilo_or_none}), if not actual_level:
'filesize': ('size', {int_or_none}), break # Only 1 level is available if API does not return a value (netease:program)
}),
})
elif err == 0:
err = traverse_obj(song, ('code', {int})) or 0
if not formats: if not formats:
if err != 0 and (err < 200 or err >= 400): self.raise_geo_restricted(
raise ExtractorError(f'No media links found (site code {err})', expected=True) 'No media links found; possibly due to geo restriction', countries=['CN'])
else:
self.raise_geo_restricted(
'No media links found: probably due to geo restriction.', countries=['CN'])
return formats return formats
def query_api(self, endpoint, video_id, note): def _query_api(self, endpoint, video_id, note):
result = self._download_json( result = self._download_json(
f'{self._API_BASE}{endpoint}', video_id, note, headers={'Referer': self._API_BASE}) f'{self._API_BASE}{endpoint}', video_id, note, headers={'Referer': self._API_BASE})
code = traverse_obj(result, ('code', {int})) code = traverse_obj(result, ('code', {int}))
@ -128,32 +136,29 @@ def _get_entries(self, songs_data, entry_keys=None, id_key='id', name_key='name'
class NetEaseMusicIE(NetEaseMusicBaseIE): class NetEaseMusicIE(NetEaseMusicBaseIE):
IE_NAME = 'netease:song' IE_NAME = 'netease:song'
IE_DESC = '网易云音乐' IE_DESC = '网易云音乐'
_VALID_URL = r'https?://(y\.)?music\.163\.com/(?:[#m]/)?song\?.*?\bid=(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:y\.)?music\.163\.com/(?:[#m]/)?song\?.*?\bid=(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://music.163.com/#/song?id=548648087', 'url': 'https://music.163.com/#/song?id=550136151',
'info_dict': { 'info_dict': {
'id': '548648087', 'id': '550136151',
'ext': 'mp3', 'ext': 'mp3',
'title': '戒烟 (Live)', 'title': 'It\'s Ok (Live)',
'creator': '李荣浩 / 朱正廷 / 陈立农 / 尤长靖 / ONER灵超 / ONER木子洋 / 杨非同 / 陆定昊', 'creators': 'count:10',
'timestamp': 1522944000, 'timestamp': 1522944000,
'upload_date': '20180405', 'upload_date': '20180405',
'description': 'md5:3650af9ee22c87e8637cb2dde22a765c', 'description': 'md5:9fd07059c2ccee3950dc8363429a3135',
'subtitles': {'lyrics': [{'ext': 'lrc'}]}, 'duration': 197,
'duration': 256,
'thumbnail': r're:^http.*\.jpg', 'thumbnail': r're:^http.*\.jpg',
'album': '偶像练习生 表演曲目合集', 'album': '偶像练习生 表演曲目合集',
'average_rating': int, 'average_rating': int,
'album_artist': '偶像练习生', 'album_artists': ['偶像练习生'],
}, },
}, { }, {
'note': 'No lyrics.',
'url': 'http://music.163.com/song?id=17241424', 'url': 'http://music.163.com/song?id=17241424',
'info_dict': { 'info_dict': {
'id': '17241424', 'id': '17241424',
'ext': 'mp3', 'ext': 'mp3',
'title': 'Opus 28', 'title': 'Opus 28',
'creator': 'Dustin O\'Halloran',
'upload_date': '20080211', 'upload_date': '20080211',
'timestamp': 1202745600, 'timestamp': 1202745600,
'duration': 263, 'duration': 263,
@ -161,15 +166,18 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
'album': 'Piano Solos Vol. 2', 'album': 'Piano Solos Vol. 2',
'album_artist': 'Dustin O\'Halloran', 'album_artist': 'Dustin O\'Halloran',
'average_rating': int, 'average_rating': int,
'description': '[00:05.00]纯音乐，请欣赏\n',
'album_artists': ['Dustin O\'Halloran'],
'creators': ['Dustin O\'Halloran'],
'subtitles': {'lyrics': [{'ext': 'lrc'}]},
}, },
}, { }, {
'url': 'https://y.music.163.com/m/song?app_version=8.8.45&id=95670&uct2=sKnvS4+0YStsWkqsPhFijw%3D%3D&dlt=0846', 'url': 'https://y.music.163.com/m/song?app_version=8.8.45&id=95670&uct2=sKnvS4+0YStsWkqsPhFijw%3D%3D&dlt=0846',
'md5': '95826c73ea50b1c288b22180ec9e754d', 'md5': 'b896be78d8d34bd7bb665b26710913ff',
'info_dict': { 'info_dict': {
'id': '95670', 'id': '95670',
'ext': 'mp3', 'ext': 'mp3',
'title': '国际歌', 'title': '国际歌',
'creator': '马备',
'upload_date': '19911130', 'upload_date': '19911130',
'timestamp': 691516800, 'timestamp': 691516800,
'description': 'md5:1ba2f911a2b0aa398479f595224f2141', 'description': 'md5:1ba2f911a2b0aa398479f595224f2141',
@ -180,6 +188,8 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
'average_rating': int, 'average_rating': int,
'album': '红色摇滚', 'album': '红色摇滚',
'album_artist': '侯牧人', 'album_artist': '侯牧人',
'creators': ['马备'],
'album_artists': ['侯牧人'],
}, },
}, { }, {
'url': 'http://music.163.com/#/song?id=32102397', 'url': 'http://music.163.com/#/song?id=32102397',
@ -188,7 +198,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
'id': '32102397', 'id': '32102397',
'ext': 'mp3', 'ext': 'mp3',
'title': 'Bad Blood', 'title': 'Bad Blood',
'creator': 'Taylor Swift / Kendrick Lamar', 'creators': ['Taylor Swift', 'Kendrick Lamar'],
'upload_date': '20150516', 'upload_date': '20150516',
'timestamp': 1431792000, 'timestamp': 1431792000,
'description': 'md5:21535156efb73d6d1c355f95616e285a', 'description': 'md5:21535156efb73d6d1c355f95616e285a',
@ -207,7 +217,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
'id': '22735043', 'id': '22735043',
'ext': 'mp3', 'ext': 'mp3',
'title': '소원을 말해봐 (Genie)', 'title': '소원을 말해봐 (Genie)',
'creator': '少女时代', 'creators': ['少女时代'],
'upload_date': '20100127', 'upload_date': '20100127',
'timestamp': 1264608000, 'timestamp': 1264608000,
'description': 'md5:03d1ffebec3139aa4bafe302369269c5', 'description': 'md5:03d1ffebec3139aa4bafe302369269c5',
@ -251,12 +261,12 @@ def _process_lyrics(self, lyrics_info):
def _real_extract(self, url): def _real_extract(self, url):
song_id = self._match_id(url) song_id = self._match_id(url)
info = self.query_api( info = self._query_api(
f'song/detail?id={song_id}&ids=%5B{song_id}%5D', song_id, 'Downloading song info')['songs'][0] f'song/detail?id={song_id}&ids=%5B{song_id}%5D', song_id, 'Downloading song info')['songs'][0]
formats = self.extract_formats(info) formats = self._extract_formats(info)
lyrics = self._process_lyrics(self.query_api( lyrics = self._process_lyrics(self._query_api(
f'song/lyric?id={song_id}&lv=-1&tv=-1', song_id, 'Downloading lyrics data')) f'song/lyric?id={song_id}&lv=-1&tv=-1', song_id, 'Downloading lyrics data'))
lyric_data = { lyric_data = {
'description': traverse_obj(lyrics, (('lyrics_merged', 'lyrics'), 0, 'data'), get_all=False), 'description': traverse_obj(lyrics, (('lyrics_merged', 'lyrics'), 0, 'data'), get_all=False),
@ -267,14 +277,14 @@ def _real_extract(self, url):
'id': song_id, 'id': song_id,
'formats': formats, 'formats': formats,
'alt_title': '/'.join(traverse_obj(info, (('transNames', 'alias'), ...))) or None, 'alt_title': '/'.join(traverse_obj(info, (('transNames', 'alias'), ...))) or None,
'creator': ' / '.join(traverse_obj(info, ('artists', ..., 'name'))) or None, 'creators': traverse_obj(info, ('artists', ..., 'name')) or None,
'album_artist': ' / '.join(traverse_obj(info, ('album', 'artists', ..., 'name'))) or None, 'album_artists': traverse_obj(info, ('album', 'artists', ..., 'name')) or None,
**lyric_data, **lyric_data,
**traverse_obj(info, { **traverse_obj(info, {
'title': ('name', {str}), 'title': ('name', {str}),
'timestamp': ('album', 'publishTime', {self.kilo_or_none}), 'timestamp': ('album', 'publishTime', {self._kilo_or_none}),
'thumbnail': ('album', 'picUrl', {url_or_none}), 'thumbnail': ('album', 'picUrl', {url_or_none}),
'duration': ('duration', {self.kilo_or_none}), 'duration': ('duration', {self._kilo_or_none}),
'album': ('album', 'name', {str}), 'album': ('album', 'name', {str}),
'average_rating': ('score', {int_or_none}), 'average_rating': ('score', {int_or_none}),
}), }),
@ -284,7 +294,7 @@ def _real_extract(self, url):
class NetEaseMusicAlbumIE(NetEaseMusicBaseIE): class NetEaseMusicAlbumIE(NetEaseMusicBaseIE):
IE_NAME = 'netease:album' IE_NAME = 'netease:album'
IE_DESC = '网易云音乐 - 专辑' IE_DESC = '网易云音乐 - 专辑'
_VALID_URL = r'https?://music\.163\.com/(#/)?album\?id=(?P<id>[0-9]+)' _VALID_URL = r'https?://music\.163\.com/(?:#/)?album\?id=(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://music.163.com/#/album?id=133153666', 'url': 'https://music.163.com/#/album?id=133153666',
'info_dict': { 'info_dict': {
@ -294,7 +304,7 @@ class NetEaseMusicAlbumIE(NetEaseMusicBaseIE):
'description': '桃几2021年翻唱合集', 'description': '桃几2021年翻唱合集',
'thumbnail': r're:^http.*\.jpg', 'thumbnail': r're:^http.*\.jpg',
}, },
'playlist_mincount': 13, 'playlist_mincount': 12,
}, { }, {
'url': 'http://music.163.com/#/album?id=220780', 'url': 'http://music.163.com/#/album?id=220780',
'info_dict': { 'info_dict': {
@ -328,7 +338,7 @@ def _real_extract(self, url):
class NetEaseMusicSingerIE(NetEaseMusicBaseIE): class NetEaseMusicSingerIE(NetEaseMusicBaseIE):
IE_NAME = 'netease:singer' IE_NAME = 'netease:singer'
IE_DESC = '网易云音乐 - 歌手' IE_DESC = '网易云音乐 - 歌手'
_VALID_URL = r'https?://music\.163\.com/(#/)?artist\?id=(?P<id>[0-9]+)' _VALID_URL = r'https?://music\.163\.com/(?:#/)?artist\?id=(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'note': 'Singer has aliases.', 'note': 'Singer has aliases.',
'url': 'http://music.163.com/#/artist?id=10559', 'url': 'http://music.163.com/#/artist?id=10559',
@ -358,7 +368,7 @@ class NetEaseMusicSingerIE(NetEaseMusicBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
singer_id = self._match_id(url) singer_id = self._match_id(url)
info = self.query_api( info = self._query_api(
f'artist/{singer_id}?id={singer_id}', singer_id, note='Downloading singer data') f'artist/{singer_id}?id={singer_id}', singer_id, note='Downloading singer data')
name = join_nonempty( name = join_nonempty(
@ -372,7 +382,7 @@ def _real_extract(self, url):
class NetEaseMusicListIE(NetEaseMusicBaseIE): class NetEaseMusicListIE(NetEaseMusicBaseIE):
IE_NAME = 'netease:playlist' IE_NAME = 'netease:playlist'
IE_DESC = '网易云音乐 - 歌单' IE_DESC = '网易云音乐 - 歌单'
_VALID_URL = r'https?://music\.163\.com/(#/)?(playlist|discover/toplist)\?id=(?P<id>[0-9]+)' _VALID_URL = r'https?://music\.163\.com/(?:#/)?(?:playlist|discover/toplist)\?id=(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://music.163.com/#/playlist?id=79177352', 'url': 'http://music.163.com/#/playlist?id=79177352',
'info_dict': { 'info_dict': {
@ -405,11 +415,15 @@ class NetEaseMusicListIE(NetEaseMusicBaseIE):
'url': 'http://music.163.com/#/discover/toplist?id=3733003', 'url': 'http://music.163.com/#/discover/toplist?id=3733003',
'info_dict': { 'info_dict': {
'id': '3733003', 'id': '3733003',
'title': 're:韩国Melon排行榜周榜 [0-9]{4}-[0-9]{2}-[0-9]{2}', 'title': 're:韩国Melon排行榜周榜(?: [0-9]{4}-[0-9]{2}-[0-9]{2})?',
'description': 'md5:73ec782a612711cadc7872d9c1e134fc', 'description': 'md5:73ec782a612711cadc7872d9c1e134fc',
'upload_date': '20200109',
'uploader_id': '2937386',
'tags': ['韩语', '榜单'],
'uploader': 'Melon榜单',
'timestamp': 1578569373,
}, },
'playlist_count': 50, 'playlist_count': 50,
'skip': 'Blocked outside Mainland China',
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -426,7 +440,7 @@ def _real_extract(self, url):
'tags': ('tags', ..., {str}), 'tags': ('tags', ..., {str}),
'uploader': ('creator', 'nickname', {str}), 'uploader': ('creator', 'nickname', {str}),
'uploader_id': ('creator', 'userId', {str_or_none}), 'uploader_id': ('creator', 'userId', {str_or_none}),
'timestamp': ('updateTime', {self.kilo_or_none}), 'timestamp': ('updateTime', {self._kilo_or_none}),
})) }))
if traverse_obj(info, ('playlist', 'specialType')) == 10: if traverse_obj(info, ('playlist', 'specialType')) == 10:
metainfo['title'] = f'{metainfo.get("title")} {strftime_or_none(metainfo.get("timestamp"), "%Y-%m-%d")}' metainfo['title'] = f'{metainfo.get("title")} {strftime_or_none(metainfo.get("timestamp"), "%Y-%m-%d")}'
@ -437,7 +451,7 @@ def _real_extract(self, url):
class NetEaseMusicMvIE(NetEaseMusicBaseIE): class NetEaseMusicMvIE(NetEaseMusicBaseIE):
IE_NAME = 'netease:mv' IE_NAME = 'netease:mv'
IE_DESC = '网易云音乐 - MV' IE_DESC = '网易云音乐 - MV'
_VALID_URL = r'https?://music\.163\.com/(#/)?mv\?id=(?P<id>[0-9]+)' _VALID_URL = r'https?://music\.163\.com/(?:#/)?mv\?id=(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://music.163.com/#/mv?id=10958064', 'url': 'https://music.163.com/#/mv?id=10958064',
'info_dict': { 'info_dict': {
@ -445,7 +459,7 @@ class NetEaseMusicMvIE(NetEaseMusicBaseIE):
'ext': 'mp4', 'ext': 'mp4',
'title': '交换余生', 'title': '交换余生',
'description': 'md5:e845872cff28820642a2b02eda428fea', 'description': 'md5:e845872cff28820642a2b02eda428fea',
'creator': '林俊杰', 'creators': ['林俊杰'],
'upload_date': '20200916', 'upload_date': '20200916',
'thumbnail': r're:http.*\.jpg', 'thumbnail': r're:http.*\.jpg',
'duration': 364, 'duration': 364,
@ -460,7 +474,7 @@ class NetEaseMusicMvIE(NetEaseMusicBaseIE):
'ext': 'mp4', 'ext': 'mp4',
'title': '이럴거면 그러지말지', 'title': '이럴거면 그러지말지',
'description': '白雅言自作曲唱甜蜜爱情', 'description': '白雅言自作曲唱甜蜜爱情',
'creator': '白娥娟', 'creators': ['白娥娟'],
'upload_date': '20150520', 'upload_date': '20150520',
'thumbnail': r're:http.*\.jpg', 'thumbnail': r're:http.*\.jpg',
'duration': 216, 'duration': 216,
@ -468,12 +482,28 @@ class NetEaseMusicMvIE(NetEaseMusicBaseIE):
'like_count': int, 'like_count': int,
'comment_count': int, 'comment_count': int,
}, },
'skip': 'Blocked outside Mainland China',
}, {
'note': 'This MV has multiple creators.',
'url': 'https://music.163.com/#/mv?id=22593543',
'info_dict': {
'id': '22593543',
'ext': 'mp4',
'title': '老北京杀器',
'creators': ['秃子2z', '辉子', 'Saber梁维嘉'],
'duration': 206,
'upload_date': '20240618',
'like_count': int,
'comment_count': int,
'thumbnail': r're:http.*\.jpg',
'view_count': int,
},
}] }]
def _real_extract(self, url): def _real_extract(self, url):
mv_id = self._match_id(url) mv_id = self._match_id(url)
info = self.query_api( info = self._query_api(
f'mv/detail?id={mv_id}&type=mp4', mv_id, 'Downloading mv info')['data'] f'mv/detail?id={mv_id}&type=mp4', mv_id, 'Downloading mv info')['data']
formats = [ formats = [
@ -484,13 +514,13 @@ def _real_extract(self, url):
return { return {
'id': mv_id, 'id': mv_id,
'formats': formats, 'formats': formats,
'creators': traverse_obj(info, ('artists', ..., 'name')) or [info.get('artistName')],
**traverse_obj(info, { **traverse_obj(info, {
'title': ('name', {str}), 'title': ('name', {str}),
'description': (('desc', 'briefDesc'), {str}, {lambda x: x or None}), 'description': (('desc', 'briefDesc'), {str}, {lambda x: x or None}),
'creator': ('artistName', {str}),
'upload_date': ('publishTime', {unified_strdate}), 'upload_date': ('publishTime', {unified_strdate}),
'thumbnail': ('cover', {url_or_none}), 'thumbnail': ('cover', {url_or_none}),
'duration': ('duration', {self.kilo_or_none}), 'duration': ('duration', {self._kilo_or_none}),
'view_count': ('playCount', {int_or_none}), 'view_count': ('playCount', {int_or_none}),
'like_count': ('likeCount', {int_or_none}), 'like_count': ('likeCount', {int_or_none}),
'comment_count': ('commentCount', {int_or_none}), 'comment_count': ('commentCount', {int_or_none}),
@ -501,7 +531,7 @@ def _real_extract(self, url):
class NetEaseMusicProgramIE(NetEaseMusicBaseIE): class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
IE_NAME = 'netease:program' IE_NAME = 'netease:program'
IE_DESC = '网易云音乐 - 电台节目' IE_DESC = '网易云音乐 - 电台节目'
_VALID_URL = r'https?://music\.163\.com/(#/?)program\?id=(?P<id>[0-9]+)' _VALID_URL = r'https?://music\.163\.com/(?:#/)?program\?id=(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://music.163.com/#/program?id=10109055', 'url': 'http://music.163.com/#/program?id=10109055',
'info_dict': { 'info_dict': {
@ -509,7 +539,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
'ext': 'mp3', 'ext': 'mp3',
'title': '不丹足球背后的故事', 'title': '不丹足球背后的故事',
'description': '喜马拉雅人的足球梦 ...', 'description': '喜马拉雅人的足球梦 ...',
'creator': '大话西藏', 'creators': ['大话西藏'],
'timestamp': 1434179287, 'timestamp': 1434179287,
'upload_date': '20150613', 'upload_date': '20150613',
'thumbnail': r're:http.*\.jpg', 'thumbnail': r're:http.*\.jpg',
@ -522,7 +552,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
'id': '10141022', 'id': '10141022',
'title': '滚滚电台的有声节目', 'title': '滚滚电台的有声节目',
'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b', 'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b',
'creator': '滚滚电台ORZ', 'creators': ['滚滚电台ORZ'],
'timestamp': 1434450733, 'timestamp': 1434450733,
'upload_date': '20150616', 'upload_date': '20150616',
'thumbnail': r're:http.*\.jpg', 'thumbnail': r're:http.*\.jpg',
@ -536,7 +566,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
'ext': 'mp3', 'ext': 'mp3',
'title': '滚滚电台的有声节目', 'title': '滚滚电台的有声节目',
'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b', 'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b',
'creator': '滚滚电台ORZ', 'creators': ['滚滚电台ORZ'],
'timestamp': 1434450733, 'timestamp': 1434450733,
'upload_date': '20150616', 'upload_date': '20150616',
'thumbnail': r're:http.*\.jpg', 'thumbnail': r're:http.*\.jpg',
@ -550,7 +580,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
program_id = self._match_id(url) program_id = self._match_id(url)
info = self.query_api( info = self._query_api(
f'dj/program/detail?id={program_id}', program_id, note='Downloading program info')['program'] f'dj/program/detail?id={program_id}', program_id, note='Downloading program info')['program']
metainfo = traverse_obj(info, { metainfo = traverse_obj(info, {
@ -558,17 +588,17 @@ def _real_extract(self, url):
'description': ('description', {str}), 'description': ('description', {str}),
'creator': ('dj', 'brand', {str}), 'creator': ('dj', 'brand', {str}),
'thumbnail': ('coverUrl', {url_or_none}), 'thumbnail': ('coverUrl', {url_or_none}),
'timestamp': ('createTime', {self.kilo_or_none}), 'timestamp': ('createTime', {self._kilo_or_none}),
}) })
if not self._yes_playlist( if not self._yes_playlist(
info['songs'] and program_id, info['mainSong']['id'], playlist_label='program', video_label='song'): info['songs'] and program_id, info['mainSong']['id'], playlist_label='program', video_label='song'):
formats = self.extract_formats(info['mainSong']) formats = self._extract_formats(info['mainSong'])
return { return {
'id': str(info['mainSong']['id']), 'id': str(info['mainSong']['id']),
'formats': formats, 'formats': formats,
'duration': traverse_obj(info, ('mainSong', 'duration', {self.kilo_or_none})), 'duration': traverse_obj(info, ('mainSong', 'duration', {self._kilo_or_none})),
**metainfo, **metainfo,
} }
@ -579,7 +609,7 @@ def _real_extract(self, url):
class NetEaseMusicDjRadioIE(NetEaseMusicBaseIE): class NetEaseMusicDjRadioIE(NetEaseMusicBaseIE):
IE_NAME = 'netease:djradio' IE_NAME = 'netease:djradio'
IE_DESC = '网易云音乐 - 电台' IE_DESC = '网易云音乐 - 电台'
_VALID_URL = r'https?://music\.163\.com/(#/)?djradio\?id=(?P<id>[0-9]+)' _VALID_URL = r'https?://music\.163\.com/(?:#/)?djradio\?id=(?P<id>[0-9]+)'
_TEST = { _TEST = {
'url': 'http://music.163.com/#/djradio?id=42', 'url': 'http://music.163.com/#/djradio?id=42',
'info_dict': { 'info_dict': {
@ -597,7 +627,7 @@ def _real_extract(self, url):
metainfo = {} metainfo = {}
entries = [] entries = []
for offset in itertools.count(start=0, step=self._PAGE_SIZE): for offset in itertools.count(start=0, step=self._PAGE_SIZE):
info = self.query_api( info = self._query_api(
f'dj/program/byradio?asc=false&limit={self._PAGE_SIZE}&radioId={dj_id}&offset={offset}', f'dj/program/byradio?asc=false&limit={self._PAGE_SIZE}&radioId={dj_id}&offset={offset}',
dj_id, note=f'Downloading dj programs - {offset}') dj_id, note=f'Downloading dj programs - {offset}')