masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #510 from fmartingr/shell-ignore-stdout

Browse Source 
Allow empty stdout on shell module
This commit is contained in:
enkore 2016-12-25 20:54:37 +01:00 committed by GitHub
commit 7fb73bb9c0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
i3pystatus/shell.py
View File

@ -1,6 +1,5 @@
from i3pystatus import IntervalModule from i3pystatus import IntervalModule
from i3pystatus.core.command import run_through_shell from i3pystatus.core.command import run_through_shell
import logging
class Shell(IntervalModule): class Shell(IntervalModule):
@ -14,9 +13,11 @@ class Shell(IntervalModule):
color = "#FFFFFF" color = "#FFFFFF"
error_color = "#FF0000" error_color = "#FF0000"
ignore_emtpy_stdout = False
settings = ( settings = (
("command", "command to be executed"), ("command", "command to be executed"),
("ignore_emtpy_stdout", "Let the block be empty"),
("color", "standard color"), ("color", "standard color"),
("error_color", "color to use when non zero exit code is returned"), ("error_color", "color to use when non zero exit code is returned"),
"format" "format"
@ -36,7 +37,11 @@ class Shell(IntervalModule):
elif stderr: elif stderr:
out = stderr out = stderr
full_text = self.format.format(output=out).strip()
if not full_text and not self.ignore_emtpy_stdout:
full_text = "Command `%s` returned %d" % (self.command, retvalue)
self.output = { self.output = {
"full_text": self.format.format(output=out) if out else "Command `%s` returned %d" % (self.command, retvalue), "full_text": full_text,
"color": self.color if retvalue == 0 else self.error_color "color": self.color if retvalue == 0 else self.error_color
} }