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

Generalized scrobble updating

Browse Source
This commit is contained in:
krateng 2022-04-22 17:43:14 +02:00
parent a8f8d86ec1
commit f5d1fbc576
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maloja/database/__init__.py
View File

@ -121,13 +121,13 @@ def reparse_scrobble(timestamp):
if not scrobble or not scrobble['rawscrobble']: if not scrobble or not scrobble['rawscrobble']:
return return
scrobbledict = rawscrobble_to_scrobbledict(scrobble['rawscrobble']) newscrobble = rawscrobble_to_scrobbledict(scrobble['rawscrobble'])
track_id = sqldb.get_track_id(scrobbledict['track']) track_id = sqldb.get_track_id(newscrobble['track'])
# check if id changed # check if id changed
if sqldb.get_track_id(scrobble['track']) != track_id: if sqldb.get_track_id(scrobble['track']) != track_id:
sqldb.update_scrobble_track_id(timestamp, track_id) sqldb.edit_scrobble(timestamp, {'track':newscrobble['track']})
def rawscrobble_to_scrobbledict(rawscrobble, fix=True, client=None): def rawscrobble_to_scrobbledict(rawscrobble, fix=True, client=None):

55
maloja/database/sqldb.py
View File

@ -208,21 +208,22 @@ def artist_db_to_dict(row,dbconn=None):
### DICT -> DB ### DICT -> DB
# These should return None when no data is in the dict so they can be used for update statements
def scrobble_dict_to_db(info,dbconn=None): def scrobble_dict_to_db(info,dbconn=None):
return { return {
"timestamp":info['time'], "timestamp":info.get('time'),
"origin":info['origin'], "origin":info.get('origin'),
"duration":info['duration'], "duration":info.get('duration'),
"track_id":get_track_id(info['track'],dbconn=dbconn), "track_id":get_track_id(info.get('track'),dbconn=dbconn),
"extra":json.dumps(info.get('extra',{})), "extra":json.dumps(info.get('extra')),
"rawscrobble":json.dumps(info.get('rawscrobble',{})) "rawscrobble":json.dumps(info.get('rawscrobble'))
} }
def track_dict_to_db(info,dbconn=None): def track_dict_to_db(info,dbconn=None):
return { return {
"title":info['title'], "title":info.get('title'),
"title_normalized":normalize_name(info['title']), "title_normalized":normalize_name(info.get('title'),'') or None,
"length":info.get('length') "length":info.get('length')
} }
@ -280,16 +281,6 @@ def delete_scrobble(scrobble_id,dbconn=None):
return True return True
@connection_provider
def update_scrobble_track_id(scrobble_id, track_id, dbconn=None):
with SCROBBLE_LOCK:
op = DB['scrobbles'].update().where(
DB['scrobbles'].c.timestamp == scrobble_id
).values(track_id=track_id)
dbconn.execute(op)
### these will 'get' the ID of an entity, creating it if necessary ### these will 'get' the ID of an entity, creating it if necessary
@ -372,13 +363,34 @@ def get_artist_id(artistname,create_new=True,dbconn=None):
### Edit existing ### Edit existing
@connection_provider
def edit_scrobble(scrobble_id,scrobbleupdatedict,dbconn=None):
dbentry = scrobble_dict_to_db(scrobbleupdatedict,dbconn=dbconn)
dbentry = {k:v for k,v in dbentry.items() if v}
print("Updating scrobble",dbentry)
with SCROBBLE_LOCK:
op = DB['scrobbles'].update().where(
DB['scrobbles'].c.timestamp == scrobble_id
).values(
**dbentry
)
dbconn.execute(op)
@connection_provider @connection_provider
def edit_artist(id,artistupdatedict,dbconn=None): def edit_artist(id,artistupdatedict,dbconn=None):
artist = get_artist(id) artist = get_artist(id)
changedartist = artistupdatedict # well changedartist = artistupdatedict # well
dbentry = artist_dict_to_db(artistupdatedict) dbentry = artist_dict_to_db(artistupdatedict,dbconn=dbconn)
dbentry = {k:v for k,v in dbentry.items() if v}
existing_artist_id = get_artist_id(changedartist,create_new=False,dbconn=dbconn) existing_artist_id = get_artist_id(changedartist,create_new=False,dbconn=dbconn)
if existing_artist_id not in (None,id): if existing_artist_id not in (None,id):
@ -396,10 +408,11 @@ def edit_artist(id,artistupdatedict,dbconn=None):
@connection_provider @connection_provider
def edit_track(id,trackupdatedict,dbconn=None): def edit_track(id,trackupdatedict,dbconn=None):
track = get_track(id) track = get_track(id,dbconn=dbconn)
changedtrack = {**track,**trackupdatedict} changedtrack = {**track,**trackupdatedict}
dbentry = track_dict_to_db(trackupdatedict) dbentry = track_dict_to_db(trackupdatedict,dbconn=dbconn)
dbentry = {k:v for k,v in dbentry.items() if v}
existing_track_id = get_track_id(changedtrack,create_new=False,dbconn=dbconn) existing_track_id = get_track_id(changedtrack,create_new=False,dbconn=dbconn)
if existing_track_id not in (None,id): if existing_track_id not in (None,id):