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

Added parameters to module "progress" to change bar design, changed

Browse source 
format keys
This commit is contained in:
Rémi Dupré 2018-09-07 16:48:03 +02:00
parent 870d4d75d5
commit 56426ee0a6
No known key found for this signature in database
GPG key ID: 88498F75F2DBC639
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bumblebee/modules/progress.py
View file

@ -5,7 +5,9 @@ Parameters:
* progress.placeholder: Text to display while no process is running (defaults to "n/a") * progress.placeholder: Text to display while no process is running (defaults to "n/a")
* progress.barwidth: Width of the progressbar if it is used (defaults to 8) * progress.barwidth: Width of the progressbar if it is used (defaults to 8)
* progress.format: Format string (defaults to "{bar} {cmd} {arg}") * progress.format: Format string (defaults to "{bar} {cmd} {arg}")
Available values are: {bar} {pid} {cmd} {arg} {per} {qty} {spd} Available values are: {bar} {pid} {cmd} {arg} {percentage} {quantity} {speed} {time}
* progress.barfilledchar: Character used to draw the filled part of the bar (defaults to "#"), notice that it can be a string
* progress.baremptychar: Character used to draw the empty part of the bar (defaults to "-"), notice that it can be a string
Requires the following executable: Requires the following executable:
* progress * progress
@ -29,9 +31,12 @@ class Module(bumblebee.engine.Module):
if self.update_progress_info(widget): if self.update_progress_info(widget):
width = self.parameter("barwidth", 8) width = self.parameter("barwidth", 8)
count = round((width * widget.get("per")) / 100) count = round((width * widget.get("per")) / 100)
filledchar = self.parameter("barfilledchar", "#")
emptychar = self.parameter("baremptychar", "-")
bar = "[{}{}]".format( bar = "[{}{}]".format(
"#" * count, filledchar * count,
"--" * (width - count) emptychar * (width - count)
) )
str_format = self.parameter("format", '{bar} {cmd} {arg}') str_format = self.parameter("format", '{bar} {cmd} {arg}')
@ -40,10 +45,10 @@ class Module(bumblebee.engine.Module):
pid = widget.get("pid"), pid = widget.get("pid"),
cmd = widget.get("cmd"), cmd = widget.get("cmd"),
arg = widget.get("arg"), arg = widget.get("arg"),
per = widget.get("per"), percentage = widget.get("per"),
qty = widget.get("qty"), quantity = widget.get("qty"),
spd = widget.get("spd"), speed = widget.get("spd"),
tim = widget.get("tim") time = widget.get("tim")
) )
else: else:
return self.parameter("placeholder", 'n/a') return self.parameter("placeholder", 'n/a')
@ -69,7 +74,7 @@ class Module(bumblebee.engine.Module):
raw = bumblebee.util.execute("progress -q") raw = bumblebee.util.execute("progress -q")
result = extract_nospeed.match(raw) result = extract_nospeed.match(raw)
widget.set("spd", "??? b/s") widget.set("spd", "???.? B/s")
widget.set("tim", "??:??:??") widget.set("tim", "??:??:??")
else: else:
widget.set("spd", result.group(6)) widget.set("spd", result.group(6))