fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-22 15:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

PICARD-1288: Fix artist genre fallback

Browse Source
This commit is contained in:
Philipp Wolfer
2019-02-20 12:00:59 +01:00
parent 02ba76b39b
commit bf7337884b
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
picard/mbjson.py
View File

@@ -366,7 +366,8 @@ def recording_to_metadata(node, m, track=None):
# set tags from artists
if track:
for artist in value:
track.append_track_artist(artist['artist']['id'])
artist_obj = track.append_track_artist(artist['artist']['id'])
add_genres_from_artist_credits(artist, artist_obj)
elif key == 'relations':
_relations_to_metadata(value, m)
elif key in ('genres', 'tags') and track:
@@ -448,7 +449,8 @@ def release_to_metadata(node, m, album=None):
# set tags from artists
if album is not None:
for artist in value:
album.append_album_artist(artist['artist']['id'])
artist_obj = album.append_album_artist(artist['artist']['id'])
add_genres_from_artist_credits(artist, artist_obj)
elif key == 'relations':
_relations_to_metadata(value, m)
elif key == 'label-info':
@@ -490,6 +492,20 @@ def add_secondary_release_types(node, m):
m.add_unique('~secondaryreleasetype', secondary_type.lower())
def add_genres_from_artist_credits(node, obj):
if 'artist' not in node:
return
artist = node['artist']
if 'genres' in artist:
add_genres(artist['genres'], obj)
if 'tags' in artist:
add_genres(artist['tags'], obj)
if 'user-genres' in artist:
add_user_genres(artist['user-genres'], obj)
if 'user-tags' in artist:
add_user_genres(artist['user-tags'], obj)
def add_genres(node, obj):
if obj is not None:
for tag in node: