From 8a3b8c2112a719af469e3ee8290cf35eb0d693ed Mon Sep 17 00:00:00 2001 From: schroeji Date: Wed, 16 Sep 2015 23:25:34 +0200 Subject: [PATCH 1/2] Fixed a race condition which sometimes caused an empty output. --- i3pystatus/cmus.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/i3pystatus/cmus.py b/i3pystatus/cmus.py index 1b8be5b..a461662 100644 --- a/i3pystatus/cmus.py +++ b/i3pystatus/cmus.py @@ -74,9 +74,7 @@ class Cmus(IntervalModule): return response def run(self): - self.output = {} response = self._query_cmus() - if response: fdict = { 'file': response.get('file', ''), @@ -97,12 +95,12 @@ class Cmus(IntervalModule): filename = os.path.basename(fdict['file']) filebase, _ = os.path.splitext(filename) fdict['artist'], fdict['title'] = _extract_artist_title(filebase) + self.output = {"full_text" : formatp(self.format, **fdict), + "color" : self.color} - self.output['full_text'] = formatp(self.format, **fdict) - self.output['color'] = self.color else: - self.output['full_text'] = self.format_not_running - self.output['color'] = self.color_not_running + self.output = {"full_text" : self.format_not_running, + "color" : self.color_not_running} def playpause(self): status = self._query_cmus().get('status', '') From f68d790cccb811931e7f79a3be867f29dbf46164 Mon Sep 17 00:00:00 2001 From: schroeji Date: Thu, 17 Sep 2015 10:46:37 +0200 Subject: [PATCH 2/2] Removed spaces in front of the colons to pass Travis CI. --- i3pystatus/cmus.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i3pystatus/cmus.py b/i3pystatus/cmus.py index a461662..dd2cec4 100644 --- a/i3pystatus/cmus.py +++ b/i3pystatus/cmus.py @@ -95,12 +95,12 @@ class Cmus(IntervalModule): filename = os.path.basename(fdict['file']) filebase, _ = os.path.splitext(filename) fdict['artist'], fdict['title'] = _extract_artist_title(filebase) - self.output = {"full_text" : formatp(self.format, **fdict), - "color" : self.color} + self.output = {"full_text": formatp(self.format, **fdict), + "color": self.color} else: - self.output = {"full_text" : self.format_not_running, - "color" : self.color_not_running} + self.output = {"full_text": self.format_not_running, + "color": self.color_not_running} def playpause(self): status = self._query_cmus().get('status', '')