From bd8ee2ce70aab6b5328b27a8ceff81c6cdfac69d Mon Sep 17 00:00:00 2001 From: kaliko Date: Wed, 8 Feb 2017 17:12:58 +0100 Subject: [PATCH 1/1] Fixed Track object with MPD >= 0.20 (Closes #12) --- doc/Changelog | 1 + sima/lib/track.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index e539281..2a0034e 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ MPD_sima v0.14.2 * Fixed MPD client cache (filters empty strings) + * Fixed Track object to work with MPD >= 0.20 -- kaliko jack UNRELEASED diff --git a/sima/lib/track.py b/sima/lib/track.py index 10f2bdc..9361778 100644 --- a/sima/lib/track.py +++ b/sima/lib/track.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015 Jack Kaliko +# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015, 2016 Jack Kaliko # Copyright (c) 2009 J. Alexander Treuman (Tag collapse method) # Copyright (c) 2008 Rick van Hattem # @@ -78,8 +78,8 @@ class Track: ) def __str__(self): - return '{artist} - {album} - {title} ({duration})'.format( - duration=self.duration, + return '{artist} - {album} - {title} ({length})'.format( + length=self.length, **self.__dict__ ) @@ -122,12 +122,12 @@ class Track: """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 - def duration(self): + def length(self): """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: -- 2.39.5