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

Using progress's speed measures

Browse source
This commit is contained in:
Rémi Dupré 2018-09-07 16:36:09 +02:00
parent 090306d37c
commit 870d4d75d5
No known key found for this signature in database
GPG key ID: 88498F75F2DBC639
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
bumblebee/modules/progress.py
View file

@ -5,7 +5,7 @@ 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} Available values are: {bar} {pid} {cmd} {arg} {per} {qty} {spd}
Requires the following executable: Requires the following executable:
* progress * progress
@ -41,23 +41,39 @@ class Module(bumblebee.engine.Module):
cmd = widget.get("cmd"), cmd = widget.get("cmd"),
arg = widget.get("arg"), arg = widget.get("arg"),
per = widget.get("per"), per = widget.get("per"),
qty = widget.get("qty") qty = widget.get("qty"),
spd = widget.get("spd"),
tim = widget.get("tim")
) )
else: else:
return self.parameter("placeholder", 'n/a') return self.parameter("placeholder", 'n/a')
def update_progress_info(self, widget): def update_progress_info(self, widget):
# This regex extracts following groups: # These regex extracts following groups:
# 1. pid # 1. pid
# 2. command # 2. command
# 3. arguments # 3. arguments
# 4. progress (xx.x formated) # 4. progress (xx.x formated)
# 5. quantity (.. unit / .. unit formated) # 5. quantity (.. unit / .. unit formated)
# 6. speed
# 7. time remaining
extract_nospeed = re.compile("\[ *(\d*)\] ([a-zA-Z]*) (.*)\n\t(\d*\.*\d*)% \((.*)\)\n.*") extract_nospeed = re.compile("\[ *(\d*)\] ([a-zA-Z]*) (.*)\n\t(\d*\.*\d*)% \((.*)\)\n.*")
extract_wtspeed = re.compile('\[ *(\d*)\] ([a-zA-Z]*) (.*)\n\t(\d*\.*\d*)% \((.*)\) (\d*\.\d .*) remaining (\d*:\d*:\d*)\n.*')
try: try:
raw = bumblebee.util.execute("progress -q") raw = bumblebee.util.execute("progress -qW 0.1")
result = extract_nospeed.match(raw) result = extract_wtspeed.match(raw)
if not result:
# Abord speed measures
raw = bumblebee.util.execute("progress -q")
result = extract_nospeed.match(raw)
widget.set("spd", "??? b/s")
widget.set("tim", "??:??:??")
else:
widget.set("spd", result.group(6))
widget.set("tim", result.group(7))
widget.set("pid", int(result.group(1))) widget.set("pid", int(result.group(1)))
widget.set("cmd", result.group(2)) widget.set("cmd", result.group(2))