third-party-mirrors/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-06-05 09:53:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed duplicate albums and tracks from association edits

Browse Source
This commit is contained in:
krateng 2023-10-24 16:42:43 +02:00
parent f8e65cd611
commit 32b17c6a2c
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
maloja/database/sqldb.py
View File

@ -650,7 +650,10 @@ def add_artists_to_tracks(track_ids,artist_ids,dbconn=None):
]) ])
result = dbconn.execute(op) result = dbconn.execute(op)
clean_db(dbconn=dbconn)
# the resulting tracks could now be duplicates of existing ones
# this also takes care of clean_db
merge_duplicate_tracks(dbconn=dbconn)
return True return True
@ -673,7 +676,10 @@ def remove_artists_from_tracks(track_ids,artist_ids,dbconn=None):
) )
result = dbconn.execute(op) result = dbconn.execute(op)
clean_db(dbconn=dbconn)
# the resulting tracks could now be duplicates of existing ones
# this also takes care of clean_db
merge_duplicate_tracks(dbconn=dbconn)
return True return True
@ -687,7 +693,10 @@ def add_artists_to_albums(album_ids,artist_ids,dbconn=None):
]) ])
result = dbconn.execute(op) result = dbconn.execute(op)
clean_db(dbconn=dbconn)
# the resulting albums could now be duplicates of existing ones
# this also takes care of clean_db
merge_duplicate_albums(dbconn=dbconn)
return True return True
@ -705,7 +714,10 @@ def remove_artists_from_albums(album_ids,artist_ids,dbconn=None):
) )
result = dbconn.execute(op) result = dbconn.execute(op)
clean_db(dbconn=dbconn)
# the resulting albums could now be duplicates of existing ones
# this also takes care of clean_db
merge_duplicate_albums(dbconn=dbconn)
return True return True
@ -1587,10 +1599,15 @@ def renormalize_names():
@connection_provider @connection_provider
def merge_duplicate_tracks(artist_id,dbconn=None): def merge_duplicate_tracks(artist_id=None,dbconn=None):
affected_track_conditions = []
if artist_id:
affected_track_conditions = [DB['trackartists'].c.artist_id == artist_id]
rows = dbconn.execute( rows = dbconn.execute(
DB['trackartists'].select().where( DB['trackartists'].select().where(
DB['trackartists'].c.artist_id == artist_id *affected_track_conditions
) )
) )
affected_tracks = [r.track_id for r in rows] affected_tracks = [r.track_id for r in rows]
@ -1623,10 +1640,15 @@ def merge_duplicate_tracks(artist_id,dbconn=None):
@connection_provider @connection_provider
def merge_duplicate_albums(artist_id,dbconn=None): def merge_duplicate_albums(artist_id=None,dbconn=None):
affected_album_conditions = []
if artist_id:
affected_album_conditions = [DB['albumartists'].c.artist_id == artist_id]
rows = dbconn.execute( rows = dbconn.execute(
DB['albumartists'].select().where( DB['albumartists'].select().where(
DB['albumartists'].c.artist_id == artist_id *affected_album_conditions
) )
) )
affected_albums = [r.album_id for r in rows] affected_albums = [r.album_id for r in rows]