X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Ftrack.py;h=2df220cc849811e48ac95e342302f4a7257cbdf5;hb=a260ebea93f23d72aa6e0178744b0f64c469b7ba;hp=d83bc6346c76e72184d7355558a4e19351430510;hpb=71e95000c13d7d9356ab0ee9046ffdc25465d9e6;p=mpd-sima.git

diff --git a/sima/lib/track.py b/sima/lib/track.py
index d83bc63..2df220c 100644
--- a/sima/lib/track.py
+++ b/sima/lib/track.py
@@ -23,7 +23,8 @@
 
 import time
 
-from .meta import Artist, SEPARATOR
+from .meta import Artist, Album, SEPARATOR
+
 
 class Track:
     """
@@ -38,7 +39,7 @@ class Track:
     """
 
     def __init__(self, file=None, duration=0, pos=-1, **kwargs):
-        self.title = self.artist = self.album = self.albumartist = ''
+        self.title = self.artist = self.album = self.albumartist = self.genre = ''
         self.musicbrainz_artistid = self.musicbrainz_albumartistid = None
         self.musicbrainz_albumid = self.musicbrainz_trackid = None
         self.pos = int(pos)
@@ -52,8 +53,8 @@ class Track:
                                  'genre', 'albumartist',
                                  'musicbrainz_artistid',
                                  'musicbrainz_albumartistid']
-        #  have tags been collapsed?
-        self.collapsed_tags = list()
+        # Which tags have been collapsed?
+        self.collapsed_tags = []
         # Needed for multiple tags which returns a list instead of a string
         self._collapse_tags()
 
@@ -80,9 +81,9 @@ class Track:
 
     def __str__(self):
         return '{artist} - {album} - {title} ({length})'.format(
-                length=self.length,
-                **self.__dict__
-                )
+            length=self.length,
+            **self.__dict__
+        )
 
     def __int__(self):
         return int(self.duration)
@@ -116,8 +117,9 @@ class Track:
 
     @property
     def length(self):
-        """Get a fancy duration as ``%H:%M:%S`` (use :attr:`duration` to get duration in second only)"""
-        temps = time.gmtime(self.duration)  #TODO: returns a date not a duration
+        """Get a fancy duration as ``%H:%M:%S`` (use :attr:`duration` to get
+        duration in second only)"""
+        temps = time.gmtime(self.duration)  # TODO: returns a date not a duration
         if temps.tm_hour:
             fmt = '%H:%M:%S'
         else:
@@ -128,10 +130,11 @@ class Track:
     def genres(self):
         """Fetches Genres for the track
         Multivalue genre are dealt with:
-          * when genre tag is multivalued
-          * when single tag uses coma or semi-colon separator
+
+        * when genre tag is multivalued
+        * when single tag uses coma or semi-colon separator
         """
-        if 'genre' not in self.__dict__:
+        if not self.genre:
             return []
         genres = self.genre.split(SEPARATOR)
         for sep in [',', ';']:
@@ -149,5 +152,12 @@ class Track:
             return Artist(name='[unknown]', **self.__dict__)
         return Artist(**self.__dict__)
 
+    @property
+    def Album(self):
+        """Get the :class:`sima.lib.meta.Album` associated to this track"""
+        if not self.album:
+            return Album(name='[unknown]', **self.__dict__)
+        return Album(name=self.album, **self.__dict__)
+
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab