gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'qqmusic-more-formats' of https://github.com/ping/youtube-dl into ping-qqmusic-more-formats

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-06-05 23:14:44 +08:00
parent d31573fa37 8b8cde2140
commit 4bde5ce992
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
youtube_dl/extractor/qqmusic.py
View file

@ -18,10 +18,10 @@ class QQMusicIE(InfoExtractor):
_VALID_URL = r'http://y.qq.com/#type=song&mid=(?P<id>[0-9A-Za-z]+)' _VALID_URL = r'http://y.qq.com/#type=song&mid=(?P<id>[0-9A-Za-z]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://y.qq.com/#type=song&mid=004295Et37taLD', 'url': 'http://y.qq.com/#type=song&mid=004295Et37taLD',
'md5': 'bed90b6db2a7a7a7e11bc585f471f63a', 'md5': '9ce1c1c8445f561506d2e3cfb0255705',
'info_dict': { 'info_dict': {
'id': '004295Et37taLD', 'id': '004295Et37taLD',
'ext': 'm4a', 'ext': 'mp3',
'title': '可惜没如果', 'title': '可惜没如果',
'upload_date': '20141227', 'upload_date': '20141227',
'creator': '林俊杰', 'creator': '林俊杰',
@ -29,6 +29,12 @@ class QQMusicIE(InfoExtractor):
} }
}] }]
_FORMATS = {
'mp3-320': {'prefix': 'M800', 'ext': 'mp3', 'preference': 40, 'abr': 320},
'mp3-128': {'prefix': 'M500', 'ext': 'mp3', 'preference': 30, 'abr': 128},
'm4a': {'prefix': 'C200', 'ext': 'm4a', 'preference': 10}
}
# Reference: m_r_GetRUin() in top_player.js # Reference: m_r_GetRUin() in top_player.js
# http://imgcache.gtimg.cn/music/portal_v3/y/top_player.js # http://imgcache.gtimg.cn/music/portal_v3/y/top_player.js
@staticmethod @staticmethod
@ -68,11 +74,20 @@ class QQMusicIE(InfoExtractor):
'http://base.music.qq.com/fcgi-bin/fcg_musicexpress.fcg?json=3&guid=%s' % guid, 'http://base.music.qq.com/fcgi-bin/fcg_musicexpress.fcg?json=3&guid=%s' % guid,
mid, note='Retrieve vkey', errnote='Unable to get vkey', mid, note='Retrieve vkey', errnote='Unable to get vkey',
transform_source=strip_jsonp)['key'] transform_source=strip_jsonp)['key']
song_url = 'http://cc.stream.qqmusic.qq.com/C200%s.m4a?vkey=%s&guid=%s&fromtag=0' % (mid, vkey, guid)
formats = []
for k, f in self._FORMATS.items():
formats.append({
'url': 'http://cc.stream.qqmusic.qq.com/%s%s.%s?vkey=%s&guid=%s&fromtag=0'
% (f['prefix'], mid, f['ext'], vkey, guid),
'format': k, 'format_id': k, 'preference': f['preference'],
'abr': f.get('abr')
})
self._sort_formats(formats)
return { return {
'id': mid, 'id': mid,
'url': song_url, 'formats': formats,
'title': song_name, 'title': song_name,
'upload_date': publish_time, 'upload_date': publish_time,
'creator': singer, 'creator': singer,