mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Fixed ephemeral entity creation

Browse Source
This commit is contained in:
krateng 2023-03-31 14:10:53 +02:00
parent 246608f5e0
commit 19de87cb66
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maloja/database/__init__.py
View File

@ -110,7 +110,7 @@ def incoming_scrobble(rawscrobble,fix=True,client=None,api=None,dbconn=None):
proxy_scrobble_all(scrobbledict['track']['artists'],scrobbledict['track']['title'],scrobbledict['time']) proxy_scrobble_all(scrobbledict['track']['artists'],scrobbledict['track']['title'],scrobbledict['time'])
dbcache.invalidate_caches(scrobbledict['time']) dbcache.invalidate_caches(scrobbledict['time'])
dbcache.invalidate_entity_cache() # because album info might have changed
#return {"status":"success","scrobble":scrobbledict} #return {"status":"success","scrobble":scrobbledict}
return scrobbledict return scrobbledict
@ -450,7 +450,9 @@ def artist_info(dbconn=None,**keys):
artist = keys.get('artist') artist = keys.get('artist')
if artist is None: raise exceptions.MissingEntityParameter() if artist is None: raise exceptions.MissingEntityParameter()
artist_id = sqldb.get_artist_id(artist,dbconn=dbconn) artist_id = sqldb.get_artist_id(artist,create_new=False,dbconn=dbconn)
if not artist_id: raise exceptions.ArtistDoesNotExist(artist)
artist = sqldb.get_artist(artist_id,dbconn=dbconn) artist = sqldb.get_artist(artist_id,dbconn=dbconn)
alltimecharts = get_charts_artists(timerange=alltime(),dbconn=dbconn) alltimecharts = get_charts_artists(timerange=alltime(),dbconn=dbconn)
#we cant take the scrobble number from the charts because that includes all countas scrobbles #we cant take the scrobble number from the charts because that includes all countas scrobbles
@ -503,7 +505,9 @@ def track_info(dbconn=None,**keys):
track = keys.get('track') track = keys.get('track')
if track is None: raise exceptions.MissingEntityParameter() if track is None: raise exceptions.MissingEntityParameter()
track_id = sqldb.get_track_id(track,dbconn=dbconn) track_id = sqldb.get_track_id(track,create_new=False,dbconn=dbconn)
if not track_id: raise exceptions.TrackDoesNotExist(track['title'])
track = sqldb.get_track(track_id,dbconn=dbconn) track = sqldb.get_track(track_id,dbconn=dbconn)
alltimecharts = get_charts_tracks(timerange=alltime(),resolve_ids=False,dbconn=dbconn) alltimecharts = get_charts_tracks(timerange=alltime(),resolve_ids=False,dbconn=dbconn)
#scrobbles = get_scrobbles_num(track=track,timerange=alltime()) #scrobbles = get_scrobbles_num(track=track,timerange=alltime())
@ -539,9 +543,10 @@ def album_info(dbconn=None,**keys):
album = keys.get('album') album = keys.get('album')
if album is None: raise exceptions.MissingEntityParameter() if album is None: raise exceptions.MissingEntityParameter()
album_id = sqldb.get_album_id(album,dbconn=dbconn) album_id = sqldb.get_album_id(album,create_new=False,dbconn=dbconn)
album = sqldb.get_album(album_id,dbconn=dbconn) if not album_id: raise exceptions.AlbumDoesNotExist(album['albumtitle'])
album = sqldb.get_album(album_id,dbconn=dbconn)
alltimecharts = get_charts_albums(timerange=alltime(),dbconn=dbconn) alltimecharts = get_charts_albums(timerange=alltime(),dbconn=dbconn)
#scrobbles = get_scrobbles_num(track=track,timerange=alltime()) #scrobbles = get_scrobbles_num(track=track,timerange=alltime())

16
maloja/database/exceptions.py
View File

@ -27,3 +27,19 @@ class MissingScrobbleParameters(Exception):
class MissingEntityParameter(Exception): class MissingEntityParameter(Exception):
pass pass
class EntityDoesNotExist(HTTPError):
entitytype = 'Entity'
def __init__(self,name):
self.entityname = name
super().__init__(
status=404,
body=f"The {self.entitytype} '{self.entityname}' does not exist in the database."
)
class ArtistDoesNotExist(EntityDoesNotExist):
entitytype = 'Artist'
class AlbumDoesNotExist(EntityDoesNotExist):
entitytype = 'Album'
class TrackDoesNotExist(EntityDoesNotExist):
entitytype = 'Track'