diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py index e9c73273e4395da4b2419f0050b6dc20f50ebb54..fc4da9cad672a80381be476042f8deeacab29d60 100644 --- a/api/funkwhale_api/music/tasks.py +++ b/api/funkwhale_api/music/tasks.py @@ -503,7 +503,9 @@ def _get_track(data): # get / create track track_title = data["title"] track_number = data.get("track_number", 1) - query = Q(title__iexact=track_title, artist=artist, album=album) + query = Q( + title__iexact=track_title, artist=artist, album=album, position=track_number + ) if track_mbid: query |= Q(mbid=track_mbid) if track_fid: diff --git a/api/tests/music/test_tasks.py b/api/tests/music/test_tasks.py index 76d820cca73f75d39f16fee3382ffdd2118fc193..0fc85a0c11b49155f51b83aef0b8db91561bc5f9 100644 --- a/api/tests/music/test_tasks.py +++ b/api/tests/music/test_tasks.py @@ -156,6 +156,25 @@ def test_can_create_track_from_file_metadata_distinct_release_mbid(factories): assert new_track != track +def test_can_create_track_from_file_metadata_distinct_position(factories): + """Cf https://dev.funkwhale.audio/funkwhale/funkwhale/issues/740""" + artist = factories["music.Artist"]() + album = factories["music.Album"](artist=artist) + track = factories["music.Track"](album=album, artist=artist) + metadata = { + "artist": artist.name, + "album": album.title, + "title": track.title, + "track_number": track.position + 1, + "musicbrainz_artistid": artist.mbid, + "musicbrainz_albumid": album.mbid, + } + + new_track = tasks.get_track_from_import_metadata(metadata) + + assert new_track != track + + def test_can_create_track_from_file_metadata_federation(factories, mocker, r_mock): metadata = { "artist": "Artist", diff --git a/changes/changelog.d/740.bugfix b/changes/changelog.d/740.bugfix new file mode 100644 index 0000000000000000000000000000000000000000..5cf04c826906b92af522b2ca8850d7747e7f5da8 --- /dev/null +++ b/changes/changelog.d/740.bugfix @@ -0,0 +1 @@ +Do not consider tracks as duplicates during import if they have different positions (#740)