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

diff --git a/sima/lib/track.py b/sima/lib/track.py
index c88de6c..706c125 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,12 +33,13 @@ class Track(object):
 
     def __init__(self, file=None, time=0, pos=-1, **kwargs):
         self.title = self.artist = self.album = self.albumartist = ''
-        self.pos = pos
+        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']
@@ -124,13 +126,15 @@ 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 != 'Various Artists':
+           name = self.albumartist
+       if 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