X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Ftrack.py;h=3926c4d97c628541128aa7470054edcc9c9c1926;hb=5b2c4dfff740e7c915951d57b6516b3146cad066;hp=706c125fba03d97c22db9d8de712075601c23f40;hpb=08d0003d11906338f32a54891edd13fe8316abcd;p=mpd-sima.git

diff --git a/sima/lib/track.py b/sima/lib/track.py
index 706c125..3926c4d 100644
--- a/sima/lib/track.py
+++ b/sima/lib/track.py
@@ -42,7 +42,9 @@ class Track:
         self._time = time
         self.__dict__.update(**kwargs)
         self.tags_to_collapse = ['artist', 'album', 'title', 'date',
-                                 'genre', 'albumartist']
+                                 'genre', 'albumartist',
+                                 'musicbrainz_artistid',
+                                 'musicbrainz_albumartistid']
         #  have tags been collapsed?
         self.collapse_tags_bool = False
         self.collapsed_tags = list()
@@ -127,14 +129,15 @@ class Track:
         return time.strftime(fmt, temps)
 
     def get_artist(self):
-       """Get artist object from track"""
-       name = self.artist
-       mbid = self.musicbrainz_artistid
-       if self.albumartist != 'Various Artists':
-           name = self.albumartist
-       if self.musicbrainz_albumartistid != '89ad4ac3-39f7-470e-963a-56509c546377':
-           mbid = self.musicbrainz_albumartistid
-       return Artist(name=name, mbid=mbid)
+        """Get artist object from track"""
+        name = self.artist
+        mbid = self.musicbrainz_artistid
+        if self.albumartist and self.albumartist != 'Various Artists':
+            name = self.albumartist
+        if (self.musicbrainz_albumartistid and
+            self.musicbrainz_albumartistid != '89ad4ac3-39f7-470e-963a-56509c546377'):
+            mbid = self.musicbrainz_albumartistid
+        return Artist(name=name, mbid=mbid)
 
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab