l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add bumblebee.util.asbool function

Browse source 
Harmonize the boolean parameter value. Now `t`, `true`, `y`, `yes`, `on`, `1` are considered truthy and
everything else falsy.
This commit is contained in:
Frederic Junod 2017-07-08 06:44:08 +02:00
parent cc6da2b70e
commit b0268a412b
6 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bumblebee/modules/disk.py
View file

@ -17,6 +17,7 @@ import os
import bumblebee.input
import bumblebee.output
import bumblebee.engine
import bumblebee.util
class Module(bumblebee.engine.Module):
def __init__(self, engine, config):
@ -24,9 +25,9 @@ class Module(bumblebee.engine.Module):
bumblebee.output.Widget(full_text=self.diskspace)
)
self._path = self.parameter("path", "/")
self._sused = self.parameter("showUsed", "yes")
self._ssize = self.parameter("showSize", "yes")
self._spercent = self.parameter("showPercent", "yes")
self._sused = bumblebee.util.asbool(self.parameter("showUsed", True))
self._ssize = bumblebee.util.asbool(self.parameter("showSize", True))
self._spercent = bumblebee.util.asbool(self.parameter("showPercent", True))
self._app = self.parameter("open", "xdg-open")
self._perc = 0
self._used = 0
@ -37,19 +38,19 @@ class Module(bumblebee.engine.Module):
self._path))
def diskspace(self, widget):
if self._sused == "yes":
if self._sused:
used_str = bumblebee.util.bytefmt(self._used)
else:
used_str = ""
if self._ssize == "yes":
if self._ssize:
size_str = bumblebee.util.bytefmt(self._size)
else:
size_str = ""
if self._spercent == "yes":
if self._spercent:
percent_str = self._perc
else:
percent_str = ""
if self._sused != "yes" or self._ssize != "yes":
if not self._sused or not self._ssize:
separator = ""
else:
separator = "/"