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,
)
@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
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'],
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'
% (self._PAGE_SIZE, dj_id, offset),