Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-09 03:04:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved error reporting from third party requests

Browse Source
This commit is contained in:
krateng 2023-10-25 11:52:53 +02:00
parent 7aa5ad5dff
commit 78aa48f797
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maloja/thirdparty/__init__.py vendored
View File

@ -23,6 +23,14 @@ services = {
"metadata":[] "metadata":[]
} }
class InvalidResponse(Exception):
"""Invalid Response from Third Party"""
class RateLimitExceeded(Exception):
"""Rate Limit exceeded"""
# have a limited number of worker threads so we don't completely hog the cpu with # have a limited number of worker threads so we don't completely hog the cpu with
# these requests. they are mostly network bound, so python will happily open up 200 new # these requests. they are mostly network bound, so python will happily open up 200 new
# requests and then when all the responses come in we suddenly can't load pages anymore # requests and then when all the responses come in we suddenly can't load pages anymore
@ -48,9 +56,9 @@ def get_image_track_all(track):
log("Got track image for " + str(track) + " from " + service.name) log("Got track image for " + str(track) + " from " + service.name)
return res return res
else: else:
log("Could not get track image for " + str(track) + " from " + service.name) log(f"Could not get track image for {track} from {service.name}")
except Exception as e: except Exception as e:
log("Error getting track image from " + service.name + ": " + repr(e)) log(f"Error getting track image from {service.name}: {e.__doc__}")
def get_image_artist_all(artist): def get_image_artist_all(artist):
with thirdpartylock: with thirdpartylock:
for service in services["metadata"]: for service in services["metadata"]:
@ -60,9 +68,9 @@ def get_image_artist_all(artist):
log("Got artist image for " + str(artist) + " from " + service.name) log("Got artist image for " + str(artist) + " from " + service.name)
return res return res
else: else:
log("Could not get artist image for " + str(artist) + " from " + service.name) log(f"Could not get artist image for {artist} from {service.name}")
except Exception as e: except Exception as e:
log("Error getting artist image from " + service.name + ": " + repr(e)) log(f"Error getting artist image from {service.name}: {e.__doc__}")
def get_image_album_all(album): def get_image_album_all(album):
with thirdpartylock: with thirdpartylock:
for service in services["metadata"]: for service in services["metadata"]:
@ -72,9 +80,9 @@ def get_image_album_all(album):
log("Got album image for " + str(album) + " from " + service.name) log("Got album image for " + str(album) + " from " + service.name)
return res return res
else: else:
log("Could not get album image for " + str(album) + " from " + service.name) log(f"Could not get album image for {album} from {service.name}")
except Exception as e: except Exception as e:
log("Error getting album image from " + service.name + ": " + repr(e)) log(f"Error getting album image from {service.name}: {e.__doc__}")
class GenericInterface: class GenericInterface:
@ -262,13 +270,21 @@ class MetadataInterface(GenericInterface,abstract=True):
try: try:
res = res[node] res = res[node]
except Exception: except Exception:
handleresult = self.handle_json_result_error(data) #allow the handler to throw custom exceptions
# it can also return True to indicate that this is not an error, but simply an instance of 'this api doesnt have any info'
if handleresult is True:
return None return None
#throw the generic error if the handler refused to do anything
raise InvalidResponse()
return res return res
def postprocess_url(self,url): def postprocess_url(self,url):
url = url.replace("http:","https:",1) url = url.replace("http:","https:",1)
return url return url
def handle_json_result_error(self,result):
raise InvalidResponse()

10
maloja/thirdparty/deezer.py vendored
View File

@ -1,4 +1,5 @@
from . import MetadataInterface from . import MetadataInterface, RateLimitExceeded
class Deezer(MetadataInterface): class Deezer(MetadataInterface):
name = "Deezer" name = "Deezer"
@ -22,3 +23,10 @@ class Deezer(MetadataInterface):
return None return None
# we can use the album pic from the track search, # we can use the album pic from the track search,
# but should do so via maloja logic # but should do so via maloja logic
def handle_json_result_error(self,result):
if result.get('data') == []:
return True
if result.get('error',{}).get('code',None) == 4:
raise RateLimitExceeded()