nogafam
/
youtube-dl
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

[qqmusic] review

This commit is contained in:
forDream 2017-08-14 08:28:41 +08:00
parent 5c037c0d1f
commit 134d85a7bd
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube_dl/extractor/qqmusic.py
View File

@ -166,15 +166,15 @@ class QQPlaylistBaseIE(InfoExtractor):
default_num = 1 default_num = 1
json_text = self.get_singer_all_songs(singmid, default_num) json_text = self.get_singer_all_songs(singmid, default_num)
json_obj = self._parse_json(json_text, singmid) json_obj_all_songs = self._parse_json(json_text, singmid)
if json_obj['code'] == 0: if json_obj_all_songs['code'] == 0:
total = json_obj['data']['total'] total = json_obj_all_songs['data']['total']
json_text = self.get_singer_all_songs(singmid, total) json_text = self.get_singer_all_songs(singmid, total)
json_obj = self._parse_json(json_text, singmid) json_obj_all_songs = self._parse_json(json_text, singmid)
for item in json_obj['data']['list']: for item in json_obj_all_songs['data']['list']:
if not (item['musicData'].get('songmid') is None): if item['musicData'].get('songmid') is not None:
songmid = item['musicData']['songmid'] songmid = item['musicData']['songmid']
entries.append(self.url_result(r'https://y.qq.com/n/yqq/song/%s.html' % songmid, 'QQMusic', songmid)) entries.append(self.url_result(r'https://y.qq.com/n/yqq/song/%s.html' % songmid, 'QQMusic', songmid))
@ -248,7 +248,7 @@ class QQMusicAlbumIE(QQPlaylistBaseIE):
entries = [ entries = [
self.url_result( self.url_result(
'https://y.qq.com/n/yqq/song/' + song['songmid'] + ".html", 'QQMusic', song['songmid'] 'https://y.qq.com/n/yqq/song/' + song['songmid'] + '.html', 'QQMusic', song['songmid']
) for song in album['list'] ) for song in album['list']
] ]
album_name = album.get('name') album_name = album.get('name')
@ -294,8 +294,7 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
list_id = self._match_id(url) list_id = self._match_id(url)
# list_type, num_id = list_id.split("_") list_type = 'toplist'
list_type = "toplist"
num_id = list_id num_id = list_id
toplist_json = self._download_json( toplist_json = self._download_json(
@ -305,7 +304,7 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
entries = [ entries = [
self.url_result( self.url_result(
'https://y.qq.com/n/yqq/song/' + song['data']['songmid'] + ".html", 'QQMusic', 'https://y.qq.com/n/yqq/song/' + song['data']['songmid'] + '.html', 'QQMusic',
song['data']['songmid'] song['data']['songmid']
) for song in toplist_json['songlist'] ) for song in toplist_json['songlist']
] ]
@ -357,7 +356,7 @@ class QQMusicPlaylistIE(QQPlaylistBaseIE):
cdlist = list_json['cdlist'][0] cdlist = list_json['cdlist'][0]
entries = [ entries = [
self.url_result( self.url_result(
'https://y.qq.com/n/yqq/song/' + song['songmid'] + ".html", 'QQMusic', song['songmid'] 'https://y.qq.com/n/yqq/song/' + song['songmid'] + '.html', 'QQMusic', song['songmid']
) for song in cdlist['songlist'] ) for song in cdlist['songlist']
] ]