Fixed Track object with MPD >= 0.20 (Closes #12)

diff --git a/doc/Changelog b/doc/Changelog
index e539281f3e0578b3f82e4fd881576f1d7c85db8e..2a0034e5a7036a7fd0b766f457b69ecc289deadd 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 MPD_sima v0.14.2
 
  * Fixed MPD client cache (filters empty strings)
 MPD_sima v0.14.2
 
  * Fixed MPD client cache (filters empty strings)

+ * Fixed Track object to work with MPD >= 0.20

 
 -- kaliko jack <kaliko@azylum.org> UNRELEASED
 
 
 -- kaliko jack <kaliko@azylum.org> UNRELEASED
 

diff --git a/sima/lib/track.py b/sima/lib/track.py
index 10f2bdcb3a238bf895016454f7985456140071b4..936177851b0d2aa0ea74abc75034f2db945b4aa8 100644 (file)
--- a/sima/lib/track.py
+++ b/sima/lib/track.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
 # -*- coding: utf-8 -*-
 

-# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015, 2016 Jack Kaliko <kaliko@azylum.org>

 # Copyright (c) 2009 J. Alexander Treuman (Tag collapse method)
 # Copyright (c) 2008 Rick van Hattem
 #
 # Copyright (c) 2009 J. Alexander Treuman (Tag collapse method)
 # Copyright (c) 2008 Rick van Hattem
 #


@@ -78,8 +78,8 @@ class Track:
         )
 
     def __str__(self):
         )
 
     def __str__(self):

-        return '{artist} - {album} - {title} ({duration})'.format(
-                duration=self.duration,
+        return '{artist} - {album} - {title} ({length})'.format(
+                length=self.length,

                 **self.__dict__
                 )
 
                 **self.__dict__
                 )
 


@@ -122,12 +122,12 @@ class Track:
         """set time property"""
         self._time = int(value)
 
         """set time property"""
         self._time = int(value)
 

-    time = property(get_time, set_time, doc='song duration in seconds (use :attr:`duration` for human readable time)')
+    time = property(get_time, set_time, doc='song duration in seconds (use :attr:`length` for human readable time)')

 
     @property
 
     @property

-    def duration(self):
+    def length(self):

         """Get a fancy duration as ``%H:%M:%S`` (use :attr:`time` to get duration in second only)"""
         """Get a fancy duration as ``%H:%M:%S`` (use :attr:`time` to get duration in second only)"""

-        temps = time.gmtime(int(self.time))
+        temps = time.gmtime(int(self.time))  #TODO: returns a date not a duration

         if temps.tm_hour:
             fmt = '%H:%M:%S'
         else:
         if temps.tm_hour:
             fmt = '%H:%M:%S'
         else: