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

Added 'errid' for queueManager as well

This commit is contained in:
RemixDev 2020-07-23 16:41:11 +02:00
parent 4d82b385db
commit eaf0ecd086
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deemix/app/queuemanager.py
View File

@ -69,6 +69,7 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
if type == None or id == None: if type == None or id == None:
logger.warn("URL not recognized") logger.warn("URL not recognized")
result['error'] = "URL not recognized" result['error'] = "URL not recognized"
result['errid'] = "invalidURL"
elif type == "track": elif type == "track":
if id.startswith("isrc"): if id.startswith("isrc"):
try: try:
@ -77,6 +78,7 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
id = trackAPI['id'] id = trackAPI['id']
else: else:
result['error'] = "Track ISRC is not available on deezer" result['error'] = "Track ISRC is not available on deezer"
result['errid'] = "ISRCnotOnDeezer"
return result return result
except APIError as e: except APIError as e:
e = json.loads(str(e)) e = json.loads(str(e))
@ -204,6 +206,7 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
if not playlistAPI['public'] and playlistAPI['creator']['id'] != str(dz.user['id']): if not playlistAPI['public'] and playlistAPI['creator']['id'] != str(dz.user['id']):
logger.warn("You can't download others private playlists.") logger.warn("You can't download others private playlists.")
result['error'] = "You can't download others private playlists." result['error'] = "You can't download others private playlists."
result['errid'] = "notYourPrivatePlaylist"
return result return result
playlistTracksAPI = dz.get_playlist_tracks_gw(id) playlistTracksAPI = dz.get_playlist_tracks_gw(id)
@ -255,6 +258,7 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
if not sp.spotifyEnabled: if not sp.spotifyEnabled:
logger.warn("Spotify Features is not setted up correctly.") logger.warn("Spotify Features is not setted up correctly.")
result['error'] = "Spotify Features is not setted up correctly." result['error'] = "Spotify Features is not setted up correctly."
result['errid'] = "spotifyDisabled"
return result return result
try: try:
track_id = sp.get_trackid_spotify(dz, id, settings['fallbackSearch']) track_id = sp.get_trackid_spotify(dz, id, settings['fallbackSearch'])
@ -266,10 +270,12 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
else: else:
logger.warn("Track not found on deezer!") logger.warn("Track not found on deezer!")
result['error'] = "Track not found on deezer!" result['error'] = "Track not found on deezer!"
result['errid'] = "trackNotOnDeezer"
elif type == "spotifyalbum": elif type == "spotifyalbum":
if not sp.spotifyEnabled: if not sp.spotifyEnabled:
logger.warn("Spotify Features is not setted up correctly.") logger.warn("Spotify Features is not setted up correctly.")
result['error'] = "Spotify Features is not setted up correctly." result['error'] = "Spotify Features is not setted up correctly."
result['errid'] = "spotifyDisabled"
return result return result
try: try:
album_id = sp.get_albumid_spotify(dz, id) album_id = sp.get_albumid_spotify(dz, id)
@ -281,10 +287,12 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
else: else:
logger.warn("Album not found on deezer!") logger.warn("Album not found on deezer!")
result['error'] = "Album not found on deezer!" result['error'] = "Album not found on deezer!"
result['errid'] = "albumNotOnDeezer"
elif type == "spotifyplaylist": elif type == "spotifyplaylist":
if not sp.spotifyEnabled: if not sp.spotifyEnabled:
logger.warn("Spotify Features is not setted up correctly.") logger.warn("Spotify Features is not setted up correctly.")
result['error'] = "Spotify Features is not setted up correctly." result['error'] = "Spotify Features is not setted up correctly."
result['errid'] = "spotifyDisabled"
return result return result
if interface: if interface:
interface.send("startConvertingSpotifyPlaylist", str(id)) interface.send("startConvertingSpotifyPlaylist", str(id))
@ -301,6 +309,7 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
else: else:
logger.warn("URL not supported yet") logger.warn("URL not supported yet")
result['error'] = "URL not supported yet" result['error'] = "URL not supported yet"
result['errid'] = "unsupportedURL"
return result return result
@ -343,7 +352,7 @@ def addToQueue(dz, sp, url, settings, bitrate=None, interface=None):
if 'error' in queueItem: if 'error' in queueItem:
logger.error(f"[{queueItem['link']}] {queueItem['error']}") logger.error(f"[{queueItem['link']}] {queueItem['error']}")
if interface: if interface:
interface.send("errorMessage", queueItem['error']) interface.send("queueError", queueItem)
return False return False
if queueItem['uuid'] in list(queueList.keys()): if queueItem['uuid'] in list(queueList.keys()):
logger.warn(f"[{queueItem['uuid']}] Already in queue, will not be added again.") logger.warn(f"[{queueItem['uuid']}] Already in queue, will not be added again.")