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

Fixed error logging

This commit is contained in:
RemixDev 2021-01-06 21:06:50 +01:00
parent 933ac68c77
commit 81e3056ff9
No known key found for this signature in database
GPG Key ID: B33962B465BDB51C
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deemix/app/queuemanager.py
View File

@ -30,8 +30,8 @@ class QueueManager:
try: try:
trackAPI = dz.api.get_track(id) trackAPI = dz.api.get_track(id)
except APIError as e: except APIError as e:
e = json.loads(str(e)) e = str(e)
return QueueError("https://deezer.com/track/"+str(id), f"Wrong URL: {e['type']+': ' if 'type' in e else ''}{e['message'] if 'message' in e else ''}") return QueueError("https://deezer.com/track/"+str(id), f"Wrong URL: {e}")
if 'id' in trackAPI and 'title' in trackAPI: if 'id' in trackAPI and 'title' in trackAPI:
id = trackAPI['id'] id = trackAPI['id']
else: else:
@ -41,7 +41,7 @@ class QueueManager:
try: try:
trackAPI_gw = dz.gw.get_track_with_fallback(id) trackAPI_gw = dz.gw.get_track_with_fallback(id)
except gwAPIError as e: except gwAPIError as e:
e = json.loads(str(e)) e = str(e)
message = "Wrong URL" message = "Wrong URL"
if "DATA_ERROR" in e: message += f": {e['DATA_ERROR']}" if "DATA_ERROR" in e: message += f": {e['DATA_ERROR']}"
return QueueError("https://deezer.com/track/"+str(id), message) return QueueError("https://deezer.com/track/"+str(id), message)
@ -78,8 +78,8 @@ class QueueManager:
try: try:
albumAPI = dz.api.get_album(id) albumAPI = dz.api.get_album(id)
except APIError as e: except APIError as e:
e = json.loads(str(e)) e = str(e)
return QueueError("https://deezer.com/album/"+str(id), f"Wrong URL: {e['type']+': ' if 'type' in e else ''}{e['message'] if 'message' in e else ''}") return QueueError("https://deezer.com/album/"+str(id), f"Wrong URL: {e}")
if str(id).startswith('upc'): id = albumAPI['id'] if str(id).startswith('upc'): id = albumAPI['id']
@ -138,7 +138,7 @@ class QueueManager:
userPlaylist = dz.gw.get_playlist_page(id) userPlaylist = dz.gw.get_playlist_page(id)
playlistAPI = map_user_playlist(userPlaylist['DATA']) playlistAPI = map_user_playlist(userPlaylist['DATA'])
except gwAPIError as e: except gwAPIError as e:
e = json.loads(str(e)) e = str(e)
message = "Wrong URL" message = "Wrong URL"
if "DATA_ERROR" in e: if "DATA_ERROR" in e:
message += f": {e['DATA_ERROR']}" message += f": {e['DATA_ERROR']}"
@ -184,8 +184,8 @@ class QueueManager:
try: try:
artistAPI = dz.api.get_artist(id) artistAPI = dz.api.get_artist(id)
except APIError as e: except APIError as e:
e = json.loads(str(e)) e = str(e)
return QueueError("https://deezer.com/artist/"+str(id), f"Wrong URL: {e['type']+': ' if 'type' in e else ''}{e['message'] if 'message' in e else ''}") return QueueError("https://deezer.com/artist/"+str(id), f"Wrong URL: {e}")
if interface: interface.send("startAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']}) if interface: interface.send("startAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']})
rootArtist = { rootArtist = {
@ -207,8 +207,8 @@ class QueueManager:
try: try:
artistAPI = dz.api.get_artist(id) artistAPI = dz.api.get_artist(id)
except APIError as e: except APIError as e:
e = json.loads(str(e)) e = str(e)
return QueueError("https://deezer.com/artist/"+str(id)+"/discography", f"Wrong URL: {e['type']+': ' if 'type' in e else ''}{e['message'] if 'message' in e else ''}") return QueueError("https://deezer.com/artist/"+str(id)+"/discography", f"Wrong URL: {e}")
if interface: interface.send("startAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']}) if interface: interface.send("startAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']})
rootArtist = { rootArtist = {
@ -231,8 +231,8 @@ class QueueManager:
try: try:
artistAPI = dz.api.get_artist(id) artistAPI = dz.api.get_artist(id)
except APIError as e: except APIError as e:
e = json.loads(str(e)) e = str(e)
return QueueError("https://deezer.com/artist/"+str(id)+"/top_track", f"Wrong URL: {e['type']+': ' if 'type' in e else ''}{e['message'] if 'message' in e else ''}") return QueueError("https://deezer.com/artist/"+str(id)+"/top_track", f"Wrong URL: {e}")
# Emulate the creation of a playlist # Emulate the creation of a playlist
# Can't use generatePlaylistQueueItem as this is not a real playlist # Can't use generatePlaylistQueueItem as this is not a real playlist