benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* morituri/common/musicbrainzngs.py:

Browse Source 
Handle multiple artists correctly.
This commit is contained in:
Thomas Vander Stichele
2012-04-01 20:42:46 +00:00
parent 9bf5892dbd
commit a5cd47d44c
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2012-04-01 Thomas Vander Stichele <thomas at apestaart dot org>
* morituri/common/musicbrainzngs.py:
Handle multiple artists correctly.
2012-04-01 Thomas Vander Stichele <thomas at apestaart dot org>
patch by: Christophe Fergeau <cfergeau@redhat.com)

35
morituri/common/musicbrainzngs.py
View File

@@ -101,15 +101,19 @@ def _getMetadata(release, discid):
metadata = DiscMetadata()
if len(release['artist-credit']) > 1:
log.warning('musicbrainzngs', 'artist-credit more than 1: %r',
release['artist-credit'])
credit = release['artist-credit']
artist = credit[0]['artist']
albumArtistName = credit[0].get(
'name', credit[0]['artist'].get('name', None))
if len(credit) > 1:
log.debug('musicbrainzngs', 'artist-credit more than 1: %r', credit)
for i, c in enumerate(credit):
if isinstance(c, dict):
credit[i] = c.get(
'name', c['artist'].get('name', None))
albumArtistName = "".join(credit)
# FIXME: is there a better way to check for VA
metadata.various = False
@@ -150,15 +154,18 @@ def _getMetadata(release, discid):
metadata.title = title
for t in medium['track-list']:
track = TrackMetadata()
if len(t['recording']['artist-credit']) > 1:
# FIXME: do something sensible for multiple artists
log.warning('musicbrainzngs', 'artist-credit more than 1: %r',
t['recording']['artist-credit'])
credit = t['recording']['artist-credit']
trackArtistName = credit[0].get(
'name', credit[0]['artist'].get('name', None))
if len(credit) > 1:
log.debug('musicbrainzngs',
'artist-credit more than 1: %r', credit)
# credit is of the form [dict, str, dict, ... ]
for i, c in enumerate(credit):
if isinstance(c, dict):
credit[i] = c.get(
'name', c['artist'].get('name', None))
trackArtistName = "".join(credit)
if not artist:
track.artist = metadata.artist