From fd4c99f88898ff978df7ccb5a1a958f478b07910 Mon Sep 17 00:00:00 2001 From: krateng Date: Wed, 27 Dec 2023 14:36:43 +0100 Subject: [PATCH] Fix GH-311, fix GH-282 --- dev/releases/3.2.yml | 8 +++++++- maloja/database/__init__.py | 2 +- maloja/database/sqldb.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev/releases/3.2.yml b/dev/releases/3.2.yml index 3c890e6..fa78d45 100644 --- a/dev/releases/3.2.yml +++ b/dev/releases/3.2.yml @@ -32,8 +32,14 @@ minor_release_name: "Nicole" - "[Bugfix] Fixed Spotify authentication thread blocking the process from terminating" - "[Technical] Upgraded all third party modules to use requests module and send User Agent" 3.2.2: + commit: "febaff97228b37a192f2630aa331cac5e5c3e98e" notes: - "[Security] Fixed XSS vulnerability in error page (Disclosed by https://github.com/NULLYUKI)" - "[Architecture] Reworked the default directory selection" - "[Feature] Added option to show scrobbles on tile charts" - - "[Bugfix] Fixed Last.fm authentication" \ No newline at end of file + - "[Bugfix] Fixed Last.fm authentication" +3.2.3: + notes: + - "[Bugfix] Fixed initial permission check" + - "[Bugfix] Fixed and updated various texts" + - "[Bugfix] Fixed moving tracks to different album" \ No newline at end of file diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py index fe5ce62..e3978e0 100644 --- a/maloja/database/__init__.py +++ b/maloja/database/__init__.py @@ -318,7 +318,7 @@ def associate_tracks_to_album(target_id,source_ids): if target_id: target = sqldb.get_album(target_id) log(f"Adding {sources} into {target}") - sqldb.add_tracks_to_albums({src:target_id for src in source_ids}) + sqldb.add_tracks_to_albums({src:target_id for src in source_ids},replace=True) else: sqldb.remove_album(source_ids) result = {'sources':sources,'target':target} diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py index 0748170..5dce8a0 100644 --- a/maloja/database/sqldb.py +++ b/maloja/database/sqldb.py @@ -406,7 +406,7 @@ def add_track_to_album(track_id,album_id,replace=False,dbconn=None): def add_tracks_to_albums(track_to_album_id_dict,replace=False,dbconn=None): for track_id in track_to_album_id_dict: - add_track_to_album(track_id,track_to_album_id_dict[track_id],dbconn=dbconn) + add_track_to_album(track_id,track_to_album_id_dict[track_id],replace=replace,dbconn=dbconn) @connection_provider def remove_album(*track_ids,dbconn=None):