Browse Source

[qqmusic] flake8

totalwebcasting
Yen Chi Hsuan 10 years ago
parent
commit
5488973961
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      youtube_dl/extractor/qqmusic.py

+ 7
- 7
youtube_dl/extractor/qqmusic.py View File

@ -173,7 +173,7 @@ class QQMusicAlbumIE(QQPlaylistBaseIE):
class QQMusicToplistIE(QQPlaylistBaseIE): class QQMusicToplistIE(QQPlaylistBaseIE):
_VALID_URL = r'http://y\.qq\.com/#type=toplist&p=(?P<id>(top|global)_[0-9]+)' _VALID_URL = r'http://y\.qq\.com/#type=toplist&p=(?P<id>(top|global)_[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://y.qq.com/#type=toplist&p=global_12', 'url': 'http://y.qq.com/#type=toplist&p=global_12',
'info_dict': { 'info_dict': {
@ -200,7 +200,7 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
@staticmethod @staticmethod
def strip_qq_jsonp(code): def strip_qq_jsonp(code):
return js_to_json(re.sub(r'^MusicJsonCallback\((.*?)\)/\*.+?\*/$', r'\1', code)) return js_to_json(re.sub(r'^MusicJsonCallback\((.*?)\)/\*.+?\*/$', r'\1', code))
def _real_extract(self, url): def _real_extract(self, url):
list_id = self._match_id(url) list_id = self._match_id(url)
@ -208,7 +208,7 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
num_id = list_id.split("_")[1] num_id = list_id.split("_")[1]
list_page = self._download_webpage( list_page = self._download_webpage(
"http://y.qq.com/y/static/toplist/index/%s.html" % list_id,
"http://y.qq.com/y/static/toplist/index/%s.html" % list_id,
list_id, 'Download toplist page') list_id, 'Download toplist page')
entries = [] entries = []
@ -216,10 +216,11 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
jsonp_url = "http://y.qq.com/y/static/toplist/json/top/%s/1.js" % num_id jsonp_url = "http://y.qq.com/y/static/toplist/json/top/%s/1.js" % num_id
else: else:
jsonp_url = "http://y.qq.com/y/static/toplist/json/global/%s/1_1.js" % num_id jsonp_url = "http://y.qq.com/y/static/toplist/json/global/%s/1_1.js" % num_id
list = self._download_json(jsonp_url, list_id, note='Retrieve toplist json',
list = self._download_json(
jsonp_url, list_id, note='Retrieve toplist json',
errnote='Unable to get toplist json', transform_source=self.strip_qq_jsonp) errnote='Unable to get toplist json', transform_source=self.strip_qq_jsonp)
for song in list['l']: for song in list['l']:
s = song['s'] s = song['s']
song_mid = s.split("|")[20] song_mid = s.split("|")[20]
@ -233,4 +234,3 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
list_desc = None list_desc = None
return self.playlist_result(entries, list_id, list_name, list_desc) return self.playlist_result(entries, list_id, list_name, list_desc)

Loading…
Cancel
Save