lukas
/
deemix-py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed bitrate check to check for 403 error instead of content-length

This commit is contained in:
uh_wot 2020-05-04 20:06:23 +02:00
parent 38e8b8f7a4
commit 84bbfbb300
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deemix/app/downloader.py
View File

@ -104,17 +104,20 @@ def getPreferredBitrate(dz, track, bitrate, fallback=True):
if not fallback: if not fallback:
formats = {9: 'flac', 3: 'mp3_320', 1: 'mp3_128', 15: '360_hq', 14: '360_mq', 13: '360_lq'} formats = {9: 'flac', 3: 'mp3_320', 1: 'mp3_128', 15: '360_hq', 14: '360_mq', 13: '360_lq'}
request = get(dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], bitrate)) request = get(dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], bitrate))
if request.headers["Content-Length"] != "0": try:
return int(bitrate) request.raise_for_status()
else: except HTTPError:
return -100 return -100
return int(bitrate)
if int(bitrate) in [13, 14, 15]: if int(bitrate) in [13, 14, 15]:
formats = {'360_hq': 15, '360_mq': 14, '360_lq': 13} formats = {'360_hq': 15, '360_mq': 14, '360_lq': 13}
selectedFormat = -200 selectedFormat = -200
for format, formatNum in formats.items(): for format, formatNum in formats.items():
if formatNum <= int(bitrate): if formatNum <= int(bitrate):
request = get(dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], formatNum)) request = get(dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], formatNum))
if request.headers["Content-Length"] == "0": try:
request.raise_for_status()
except HTTPError:
continue continue
selectedFormat = formatNum selectedFormat = formatNum
break break
@ -124,7 +127,9 @@ def getPreferredBitrate(dz, track, bitrate, fallback=True):
for format, formatNum in formats.items(): for format, formatNum in formats.items():
if formatNum <= int(bitrate): if formatNum <= int(bitrate):
request = get(dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], formatNum)) request = get(dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], formatNum))
if request.headers["Content-Length"] == "0": try:
request.raise_for_status()
except HTTPError:
continue continue
selectedFormat = formatNum selectedFormat = formatNum
break break