From 6893fd745ad5ed65c1bf6121ed873c95cfeaf98e Mon Sep 17 00:00:00 2001 From: alim4r <7687869+alim4r@users.noreply.github.com> Date: Thu, 21 Apr 2022 18:28:59 +0200 Subject: [PATCH] Update get_scrobble parameters --- maloja/database/__init__.py | 4 +++- maloja/database/sqldb.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py index f8e1d5e..e50eaed 100644 --- a/maloja/database/__init__.py +++ b/maloja/database/__init__.py @@ -112,10 +112,11 @@ def incoming_scrobble(rawscrobble,fix=True,client=None,api=None,dbconn=None): #return {"status":"success","scrobble":scrobbledict} return scrobbledict + @waitfordb def reparse_scrobble(timestamp): log(f"Reparsing Scrobble {timestamp}") - scrobble = sqldb.get_scrobble(timestamp) + scrobble = sqldb.get_scrobble(timestamp=timestamp, include_internal=True) if not scrobble or not scrobble['rawscrobble']: return @@ -185,6 +186,7 @@ def get_scrobbles(dbconn=None,**keys): #return result[keys['page']*keys['perpage']:(keys['page']+1)*keys['perpage']] return list(reversed(result)) + @waitfordb def get_scrobbles_num(dbconn=None,**keys): (since,to) = keys.get('timerange').timestamps() diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py index 8888587..be27292 100644 --- a/maloja/database/sqldb.py +++ b/maloja/database/sqldb.py @@ -704,14 +704,14 @@ def get_artist(id,dbconn=None): @cached_wrapper @connection_provider -def get_scrobble(timestamp,dbconn=None): +def get_scrobble(timestamp, include_internal=False, dbconn=None): op = DB['scrobbles'].select().where( DB['scrobbles'].c.timestamp==timestamp ) result = dbconn.execute(op).all() scrobble = result[0] - return scrobbles_db_to_dict([scrobble], True)[0] + return scrobbles_db_to_dict(rows=[scrobble], include_internal=include_internal)[0] ##### MAINTENANCE