projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c037c0
)
[qqmusic] review
author
forDream
<gam2046@gmail.com>
Mon, 14 Aug 2017 00:28:41 +0000
(08:28 +0800)
committer
forDream
<gam2046@gmail.com>
Tue, 15 Aug 2017 05:14:35 +0000
(13:14 +0800)
youtube_dl/extractor/qqmusic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/qqmusic.py
b/youtube_dl/extractor/qqmusic.py
index 42be6bc7bb1ddf1b5d23f8290d412e1c0dbc1187..38f4b2cab99764b541e209a9d403c6fe1b6474e9 100644
(file)
--- a/
youtube_dl/extractor/qqmusic.py
+++ b/
youtube_dl/extractor/qqmusic.py
@@
-166,15
+166,15
@@
class QQPlaylistBaseIE(InfoExtractor):
default_num = 1
json_text = self.get_singer_all_songs(singmid, default_num)
default_num = 1
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:
- total = json_obj['data']['total']
+ if json_obj
_all_songs
['code'] == 0:
+ 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']:
- if
not (item['musicData'].get('songmid') is None)
:
+ for item in json_obj
_all_songs
['data']['list']:
+ if
item['musicData'].get('songmid') is not None
:
songmid = item['musicData']['songmid']
entries.append(self.url_result(r'https://y.qq.com/n/yqq/song/%s.html' % songmid, 'QQMusic', songmid))
songmid = item['musicData']['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 = [
self.url_result(
entries = [
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']
]
album_name = album.get('name')
) for song in album['list']
]
album_name = album.get('name')
@@
-294,8
+294,7
@@
class QQMusicToplistIE(QQPlaylistBaseIE):
def _real_extract(self, url):
list_id = self._match_id(url)
def _real_extract(self, url):
list_id = self._match_id(url)
- # list_type, num_id = list_id.split("_")
- list_type = "toplist"
+ list_type = 'toplist'
num_id = list_id
toplist_json = self._download_json(
num_id = list_id
toplist_json = self._download_json(
@@
-305,7
+304,7
@@
class QQMusicToplistIE(QQPlaylistBaseIE):
entries = [
self.url_result(
entries = [
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']
) for song in toplist_json['songlist']
]
song['data']['songmid']
) for song in toplist_json['songlist']
]
@@
-357,7
+356,7
@@
class QQMusicPlaylistIE(QQPlaylistBaseIE):
cdlist = list_json['cdlist'][0]
entries = [
self.url_result(
cdlist = list_json['cdlist'][0]
entries = [
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']
]