- """Get artist object from track"""
- return Artist(name=self.artist, mbid=self.musicbrainz_artistid)
+ """Get artist object from track"""
+ name = self.artist
+ mbid = self.musicbrainz_artistid
+ if self.albumartist and self.albumartist != 'Various Artists':
+ name = self.albumartist.split(', ')[0]
+ if (self.musicbrainz_albumartistid and
+ self.musicbrainz_albumartistid != '89ad4ac3-39f7-470e-963a-56509c546377'):
+ mbid = self.musicbrainz_albumartistid.split(', ')[0]
+ return Artist(name=name, mbid=mbid)