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

Added logging alert for bitrate fallback 

Added 'bitrateFallback' and 'searchFallback' emits for queueUpdate
This adds #57
This commit is contained in:
RemixDev 2020-09-20 11:29:18 +02:00
parent 0848941583
commit 7461ed2359
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
deemix/app/downloadjob.py
View File

@ -241,6 +241,16 @@ class DownloadJob:
newTrack = self.dz.get_track_gw(searchedId) newTrack = self.dz.get_track_gw(searchedId)
track.parseEssentialData(self.dz, newTrack) track.parseEssentialData(self.dz, newTrack)
track.searched = True track.searched = True
if self.interface:
self.interface.send('queueUpdate', {
'uuid': self.queueItem.uuid,
'searchFallback': True,
'data': {
'id': track.id,
'title': track.title,
'artist': track.mainArtist['name']
},
})
return self.download(trackAPI_gw, track) return self.download(trackAPI_gw, track)
else: else:
raise DownloadFailed("notEncodedNoAlternative") raise DownloadFailed("notEncodedNoAlternative")
@ -261,6 +271,16 @@ class DownloadJob:
newTrack = self.dz.get_track_gw(searchedId) newTrack = self.dz.get_track_gw(searchedId)
track.parseEssentialData(self.dz, newTrack) track.parseEssentialData(self.dz, newTrack)
track.searched = True track.searched = True
if self.interface:
self.interface.send('queueUpdate', {
'uuid': self.queueItem.uuid,
'searchFallback': True,
'data': {
'id': track.id,
'title': track.title,
'artist': track.mainArtist['name']
},
})
return self.download(trackAPI_gw, track) return self.download(trackAPI_gw, track)
else: else:
raise DownloadFailed("wrongBitrateNoAlternative") raise DownloadFailed("wrongBitrateNoAlternative")
@ -475,6 +495,16 @@ class DownloadJob:
newTrack = self.dz.get_track_gw(searchedId) newTrack = self.dz.get_track_gw(searchedId)
track.parseEssentialData(self.dz, newTrack) track.parseEssentialData(self.dz, newTrack)
track.searched = True track.searched = True
if self.interface:
self.interface.send('queueUpdate', {
'uuid': self.queueItem.uuid,
'searchFallback': True,
'data': {
'id': track.id,
'title': track.title,
'artist': track.mainArtist['name']
},
})
return False return False
else: else:
raise DownloadFailed("notAvailableNoAlternative") raise DownloadFailed("notAvailableNoAlternative")
@ -541,6 +571,7 @@ class DownloadJob:
return 0 return 0
fallback = self.settings['fallbackBitrate'] fallback = self.settings['fallbackBitrate']
falledBack = False
formats_non_360 = { formats_non_360 = {
9: "FLAC", 9: "FLAC",
@ -577,6 +608,19 @@ class DownloadJob:
except request_exception.HTTPError: # if the format is not available, Deezer returns a 403 error except request_exception.HTTPError: # if the format is not available, Deezer returns a 403 error
pass pass
if fallback: if fallback:
if not falledBack:
falledBack = True
logger.info(f"[{track.mainArtist['name']} - {track.title}] Fallback to lower bitrate")
if self.interface:
self.interface.send('queueUpdate', {
'uuid': self.queueItem.uuid,
'bitrateFallback': True,
'data': {
'id': track.id,
'title': track.title,
'artist': track.mainArtist['name']
},
})
continue continue
else: else:
return error_num return error_num