X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fneteasemusic.py;h=a8e0a64ed4933644965fd07c3eb3216fc532c915;hb=d609edf4f14e56e3dbb3ffc0be057585c0533666;hp=419f3ecc96307a1199f43515636733e44009490d;hpb=02b386f80abc16f5334e980c2fb729b0cc69a0d6;p=youtube-dl diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py index 419f3ecc9..a8e0a64ed 100644 --- a/youtube_dl/extractor/neteasemusic.py +++ b/youtube_dl/extractor/neteasemusic.py @@ -4,13 +4,14 @@ from __future__ import unicode_literals from hashlib import md5 from base64 import b64encode from datetime import datetime -import itertools import re from .common import InfoExtractor from ..compat import ( compat_urllib_request, compat_urllib_parse, + compat_str, + compat_itertools_count, ) @@ -21,14 +22,14 @@ class NetEaseMusicBaseIE(InfoExtractor): @classmethod def _encrypt(cls, dfsid): - salt_bytes = bytearray(cls._NETEASE_SALT, 'utf-8') - string_bytes = bytearray(str(dfsid)) + salt_bytes = bytearray(cls._NETEASE_SALT.encode('utf-8')) + string_bytes = bytearray(compat_str(dfsid).encode('ascii')) salt_len = len(salt_bytes) for i in range(len(string_bytes)): string_bytes[i] = string_bytes[i] ^ salt_bytes[i % salt_len] m = md5() - m.update(string_bytes) - result = b64encode(m.digest()) + m.update(bytes(string_bytes)) + result = b64encode(m.digest()).decode('ascii') return result.replace('/', '_').replace('+', '-') @classmethod @@ -52,7 +53,7 @@ class NetEaseMusicBaseIE(InfoExtractor): @classmethod def convert_milliseconds(cls, ms): - return int(round(ms/1000.0)) + return int(round(ms / 1000.0)) def query_api(self, endpoint, video_id, note): req = compat_urllib_request.Request('%s%s' % (self._API_BASE, endpoint)) @@ -62,6 +63,7 @@ class NetEaseMusicBaseIE(InfoExtractor): class NetEaseMusicIE(NetEaseMusicBaseIE): IE_NAME = 'netease:song' + IE_DESC = '网易云音乐' _VALID_URL = r'https?://music\.163\.com/(#/)?song\?id=(?P[0-9]+)' _TESTS = [{ 'url': 'http://music.163.com/#/song?id=32102397', @@ -146,7 +148,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE): self._sort_formats(formats) lyrics_info = self.query_api( - 'song/lyric?id=%s&lv=-1&tv=-1' % song_id, + 'song/lyric?id=%s&lv=-1&tv=-1' % song_id, song_id, 'Downloading lyrics data') lyrics = self._process_lyrics(lyrics_info) @@ -169,6 +171,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE): class NetEaseMusicAlbumIE(NetEaseMusicBaseIE): IE_NAME = 'netease:album' + IE_DESC = '网易云音乐 - 专辑' _VALID_URL = r'https?://music\.163\.com/(#/)?album\?id=(?P[0-9]+)' _TEST = { 'url': 'http://music.163.com/#/album?id=220780', @@ -183,7 +186,7 @@ class NetEaseMusicAlbumIE(NetEaseMusicBaseIE): album_id = self._match_id(url) info = self.query_api( - 'album/%s?id=%s' % (album_id, album_id), + 'album/%s?id=%s' % (album_id, album_id), album_id, 'Downloading album data')['album'] name = info['name'] @@ -198,6 +201,7 @@ class NetEaseMusicAlbumIE(NetEaseMusicBaseIE): class NetEaseMusicSingerIE(NetEaseMusicBaseIE): IE_NAME = 'netease:singer' + IE_DESC = '网易云音乐 - 歌手' _VALID_URL = r'https?://music\.163\.com/(#/)?artist\?id=(?P[0-9]+)' _TESTS = [{ 'note': 'Singer has aliases.', @@ -221,14 +225,14 @@ class NetEaseMusicSingerIE(NetEaseMusicBaseIE): singer_id = self._match_id(url) info = self.query_api( - 'artist/%s?id=%s' % (singer_id, singer_id), + 'artist/%s?id=%s' % (singer_id, singer_id), singer_id, 'Downloading singer data') name = info['artist']['name'] if info['artist']['trans']: name = '%s - %s' % (name, info['artist']['trans']) if info['artist']['alias']: - name = '%s - %s' % (name, ";".join(info['artist']['alias'])) + name = '%s - %s' % (name, ';'.join(info['artist']['alias'])) entries = [ self.url_result('http://music.163.com/#/song?id=%s' % song['id'], @@ -240,6 +244,7 @@ class NetEaseMusicSingerIE(NetEaseMusicBaseIE): class NetEaseMusicListIE(NetEaseMusicBaseIE): IE_NAME = 'netease:playlist' + IE_DESC = '网易云音乐 - 歌单' _VALID_URL = r'https?://music\.163\.com/(#/)?(playlist|discover/toplist)\?id=(?P[0-9]+)' _TESTS = [{ 'url': 'http://music.163.com/#/playlist?id=79177352', @@ -264,7 +269,7 @@ class NetEaseMusicListIE(NetEaseMusicBaseIE): list_id = self._match_id(url) info = self.query_api( - 'playlist/detail?id=%s&lv=-1&tv=-1' % list_id, + 'playlist/detail?id=%s&lv=-1&tv=-1' % list_id, list_id, 'Downloading playlist data')['result'] name = info['name'] @@ -285,6 +290,7 @@ class NetEaseMusicListIE(NetEaseMusicBaseIE): class NetEaseMusicMvIE(NetEaseMusicBaseIE): IE_NAME = 'netease:mv' + IE_DESC = '网易云音乐 - MV' _VALID_URL = r'https?://music\.163\.com/(#/)?mv\?id=(?P[0-9]+)' _TEST = { 'url': 'http://music.163.com/#/mv?id=415350', @@ -325,6 +331,7 @@ class NetEaseMusicMvIE(NetEaseMusicBaseIE): class NetEaseMusicProgramIE(NetEaseMusicBaseIE): IE_NAME = 'netease:program' + IE_DESC = '网易云音乐 - 电台节目' _VALID_URL = r'https?://music\.163\.com/(#/?)program\?id=(?P[0-9]+)' _TESTS = [{ 'url': 'http://music.163.com/#/program?id=10109055', @@ -378,7 +385,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE): self.to_screen( 'Downloading just the main audio %s because of --no-playlist' % info['mainSong']['id']) - + formats = self.extract_formats(info['mainSong']) self._sort_formats(formats) @@ -409,6 +416,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE): class NetEaseMusicDjRadioIE(NetEaseMusicBaseIE): IE_NAME = 'netease:djradio' + IE_DESC = '网易云音乐 - 电台' _VALID_URL = r'https?://music\.163\.com/(#/)?djradio\?id=(?P[0-9]+)' _TEST = { 'url': 'http://music.163.com/#/djradio?id=42', @@ -427,9 +435,9 @@ class NetEaseMusicDjRadioIE(NetEaseMusicBaseIE): name = None desc = None entries = [] - for offset in itertools.count(start=0, step=self._PAGE_SIZE): + for offset in compat_itertools_count(start=0, step=self._PAGE_SIZE): info = self.query_api( - 'dj/program/byradio?asc=false&limit=%d&radioId=%s&offset=%d' + 'dj/program/byradio?asc=false&limit=%d&radioId=%s&offset=%d' % (self._PAGE_SIZE, dj_id, offset), dj_id, 'Downloading dj programs - %d' % offset)