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

Added direct testing fallback for getPreferredBitrate

This commit is contained in:
RemixDev 2020-08-22 13:35:24 +02:00
parent b6eff13349
commit 2dab230a73
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deemix/api/deezer.py
View File

@ -59,6 +59,7 @@ class Deezer:
for key, value in response.items(): for key, value in response.items():
if key.startswith("FILESIZE_"): if key.startswith("FILESIZE_"):
filesizes[key] = value filesizes[key] = value
filesizes[key+"_TESTED"] = False
return filesizes return filesizes
def gw_api_call(self, method, args=None): def gw_api_call(self, method, args=None):

20
deemix/app/downloadjob.py
View File

@ -506,6 +506,7 @@ class DownloadJob:
logger.warn(f"[{track.mainArtist['name']} - {track.title}] Track not available in FLAC, falling back if necessary") logger.warn(f"[{track.mainArtist['name']} - {track.title}] Track not available in FLAC, falling back if necessary")
self.removeTrackPercentage() self.removeTrackPercentage()
track.filesizes['FILESIZE_FLAC'] = "0" track.filesizes['FILESIZE_FLAC'] = "0"
track.filesizes['FILESIZE_FLAC_TESTED'] = True
return self.download(trackAPI_gw, track) return self.download(trackAPI_gw, track)
if track.searched: if track.searched:
result['searched'] = f"{track.mainArtist['name']} - {track.title}" result['searched'] = f"{track.mainArtist['name']} - {track.title}"
@ -546,13 +547,20 @@ class DownloadJob:
for format_num, format in formats.items(): for format_num, format in formats.items():
if format_num <= int(self.bitrate): if format_num <= int(self.bitrate):
if f"FILESIZE_{format}" in track.filesizes and int(track.filesizes[f"FILESIZE_{format}"]) != 0: if f"FILESIZE_{format}" in track.filesizes:
return format_num if int(track.filesizes[f"FILESIZE_{format}"]) != 0:
return format_num
elif not track.filesizes[f"FILESIZE_{format}_TESTED"]:
request = get(self.dz.get_track_stream_url(track.id, track.MD5, track.mediaVersion, format_num), stream=True)
try:
request.raise_for_status()
return format_num
except HTTPError: # if the format is not available, Deezer returns a 403 error
pass
if fallback:
continue
else: else:
if fallback: return error_num
continue
else:
return error_num
return error_num # fallback is enabled and loop went through all formats return error_num # fallback is enabled and loop went through all formats