X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fneteasemusic.py;h=0d36474fa069b793ff32e90e6de1804de09058ac;hb=15707c7e024f1f29e7abd8ddaa362196ef2d4af6;hp=435cd8e2eeceb59f716f2871521595918cc9eb54;hpb=e0ef13ddebfab39d8c59c8cd9c11882cfc604070;p=youtube-dl.git diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py index 435cd8e2e..0d36474fa 100644 --- a/youtube_dl/extractor/neteasemusic.py +++ b/youtube_dl/extractor/neteasemusic.py @@ -8,11 +8,14 @@ import re from .common import InfoExtractor from ..compat import ( - compat_urllib_parse, + compat_urllib_parse_urlencode, compat_str, compat_itertools_count, ) -from ..utils import sanitized_Request +from ..utils import ( + sanitized_Request, + float_or_none, +) class NetEaseMusicBaseIE(InfoExtractor): @@ -52,7 +55,7 @@ class NetEaseMusicBaseIE(InfoExtractor): formats.append({ 'url': song_url, 'ext': details.get('extension'), - 'abr': details.get('bitrate', 0) / 1000, + 'abr': float_or_none(details.get('bitrate'), scale=1000), 'format_id': song_format, 'filesize': details.get('size'), 'asr': details.get('sr') @@ -150,7 +153,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE): 'ids': '[%s]' % song_id } info = self.query_api( - 'song/detail?' + compat_urllib_parse.urlencode(params), + 'song/detail?' + compat_urllib_parse_urlencode(params), song_id, 'Downloading song info')['songs'][0] formats = self.extract_formats(info)