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

diff --git a/sima/lib/track.py b/sima/lib/track.py
index 93904c8..3926c4d 100644
--- a/sima/lib/track.py
+++ b/sima/lib/track.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2010, 2011, 2013 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 # Copyright (c) 2009 J. Alexander Treuman (Tag collapse method)
 # Copyright (c) 2008 Rick van Hattem
 #
@@ -23,8 +23,9 @@
 
 import time
 
+from .meta import Artist
 
-class Track(object):
+class Track:
     """
     Track object.
     Instanciate with Player replies.
@@ -32,15 +33,18 @@ class Track(object):
 
     def __init__(self, file=None, time=0, pos=-1, **kwargs):
         self.title = self.artist = self.album = self.albumartist = ''
+        self.musicbrainz_artistid = self.musicbrainz_albumartistid = None
         self.pos = int(pos)
         self._empty = False
         self._file = file
         if not kwargs:
             self._empty = True
-        self.time = time
+        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()
@@ -124,13 +128,16 @@ class Track(object):
             fmt = '%M:%S'
         return time.strftime(fmt, temps)
 
-
-def main():
-    pass
-
-# Script starts here
-if __name__ == '__main__':
-    main()
+    def get_artist(self):
+        """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