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

[modules/progress] double to single quotes

Browse source
This commit is contained in:
tobi-wan-kenobi 2020-04-10 16:58:54 +02:00
parent 8875e75734
commit 55c8f6af28
1 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
modules/contrib/progress.py
View file

@ -2,12 +2,12 @@
Show progress for cp, mv, dd, ... Show progress for cp, mv, dd, ...
Parameters: 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} {percentage} {quantity} {speed} {time} 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.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 * 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,29 +29,29 @@ class Module(bumblebee.engine.Module):
def get_progress_text(self, widget): def get_progress_text(self, widget):
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", "#") filledchar = self.parameter('barfilledchar', '#')
emptychar = self.parameter("baremptychar", "-") emptychar = self.parameter('baremptychar', '-')
bar = "[{}{}]".format( bar = '[{}{}]'.format(
filledchar * count, filledchar * count,
emptychar * (width - count) emptychar * (width - count)
) )
str_format = self.parameter("format", '{bar} {cmd} {arg}') str_format = self.parameter('format', '{bar} {cmd} {arg}')
return str_format.format( return str_format.format(
bar = bar, bar = bar,
pid = widget.get("pid"), pid = widget.get('pid'),
cmd = widget.get("cmd"), cmd = widget.get('cmd'),
arg = widget.get("arg"), arg = widget.get('arg'),
percentage = widget.get("per"), percentage = widget.get('per'),
quantity = widget.get("qty"), quantity = widget.get('qty'),
speed = widget.get("spd"), speed = widget.get('spd'),
time = widget.get("tim") time = 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):
"""Update widget's informations about the copy""" """Update widget's informations about the copy"""
@ -64,40 +64,41 @@ class Module(bumblebee.engine.Module):
# 5. quantity (.. unit / .. unit formated) # 5. quantity (.. unit / .. unit formated)
# 6. speed # 6. speed
# 7. time remaining # 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.*') 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 -qW 0.1") raw = bumblebee.util.execute('progress -qW 0.1')
result = extract_wtspeed.match(raw) result = extract_wtspeed.match(raw)
if not result: if not result:
# Abord speed measures # Abord speed measures
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))
widget.set("tim", result.group(7)) 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))
widget.set("arg", result.group(3)) widget.set('arg', result.group(3))
widget.set("per", float(result.group(4))) widget.set('per', float(result.group(4)))
widget.set("qty", result.group(5)) widget.set('qty', result.group(5))
return True return True
except Exception: except Exception:
return False return False
def state(self, widget): def state(self, widget):
if self._active(): if self._active():
return "copying" return 'copying'
return "pending" return 'pending'
def _active(self): def _active(self):
"""Checks wether a copy is running or not""" """Checks wether a copy is running or not"""
raw = bumblebee.util.execute("progress -q") raw = bumblebee.util.execute('progress -q')
return bool(raw) return bool(raw)
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4