yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 05:59:17 +02:00
Code Issues Releases Wiki Activity

Fix #772: Prevent skipping on file import if album_mbid is different

Browse source
This commit is contained in:
Eliot Berriot 2019-03-27 12:13:25 +01:00
parent d5712ea2fb
commit 31227b8641
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
3 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/funkwhale_api/music/tasks.py
View file

@ -431,9 +431,10 @@ def _get_track(data):
artist_mbid = data.get("musicbrainz_artistid", None)
artist_fid = data.get("artist_fid", None)
artist_name = data["artist"]
query = Q(name__iexact=artist_name)
if artist_mbid:
query |= Q(mbid=artist_mbid)
query = Q(mbid=artist_mbid)
else:
query = Q(name__iexact=artist_name)
if artist_fid:
query |= Q(fid=artist_fid)
defaults = {
@ -476,9 +477,12 @@ def _get_track(data):
# get / create album
album_title = data["album"]
album_fid = data.get("album_fid", None)
query = Q(title__iexact=album_title, artist=album_artist)
if album_mbid:
query |= Q(mbid=album_mbid)
query = Q(mbid=album_mbid)
else:
query = Q(title__iexact=album_title, artist=album_artist)
if album_fid:
query |= Q(fid=album_fid)
defaults = {