From dc0518455295f71162ba3c5646b731d691c12b2f Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Mon, 30 Oct 2023 14:53:44 +0100
Subject: [PATCH] Fix GH-253

---
 maloja/database/__init__.py | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py
index d35f456..fe5ce62 100644
--- a/maloja/database/__init__.py
+++ b/maloja/database/__init__.py
@@ -110,15 +110,18 @@ def incoming_scrobble(rawscrobble,fix=True,client=None,api=None,dbconn=None):
 	scrobbledict = rawscrobble_to_scrobbledict(rawscrobble, fix, client)
 	albumupdate = (malojaconfig["ALBUM_INFORMATION_TRUST"] == 'last')
 
+	if scrobbledict:
 
-	sqldb.add_scrobble(scrobbledict,update_album=albumupdate,dbconn=dbconn)
-	proxy_scrobble_all(scrobbledict['track']['artists'],scrobbledict['track']['title'],scrobbledict['time'])
+		sqldb.add_scrobble(scrobbledict,update_album=albumupdate,dbconn=dbconn)
+		proxy_scrobble_all(scrobbledict['track']['artists'],scrobbledict['track']['title'],scrobbledict['time'])
 
-	dbcache.invalidate_caches(scrobbledict['time'])
+		dbcache.invalidate_caches(scrobbledict['time'])
 
+		#return {"status":"success","scrobble":scrobbledict}
+		return scrobbledict
 
-	#return {"status":"success","scrobble":scrobbledict}
-	return scrobbledict
+	else:
+		raise exceptions.MissingScrobbleParameters('artist')
 
 
 @waitfordb
@@ -131,14 +134,16 @@ def reparse_scrobble(timestamp):
 
 	newscrobble = rawscrobble_to_scrobbledict(scrobble['rawscrobble'])
 
-	track_id = sqldb.get_track_id(newscrobble['track'])
+	if newscrobble:
 
-	# check if id changed
-	if sqldb.get_track_id(scrobble['track']) != track_id:
-		sqldb.edit_scrobble(timestamp, {'track':newscrobble['track']})
-		dbcache.invalidate_entity_cache()
-		dbcache.invalidate_caches()
-		return sqldb.get_scrobble(timestamp=timestamp)
+		track_id = sqldb.get_track_id(newscrobble['track'])
+
+		# check if id changed
+		if sqldb.get_track_id(scrobble['track']) != track_id:
+			sqldb.edit_scrobble(timestamp, {'track':newscrobble['track']})
+			dbcache.invalidate_entity_cache()
+			dbcache.invalidate_caches()
+			return sqldb.get_scrobble(timestamp=timestamp)
 
 	return False
 
@@ -190,6 +195,11 @@ def rawscrobble_to_scrobbledict(rawscrobble, fix=True, client=None):
 	if not scrobbledict["track"]["album"]["albumtitle"]:
 		del scrobbledict["track"]["album"]
 
+	# discard if invalid
+	if len(scrobbledict['track']['artists']) == 0:
+		return None
+	# TODO: other checks
+
 	return scrobbledict