From 8cdc84871f2f588c55f1390b853e6e4b885e7876 Mon Sep 17 00:00:00 2001 From: tobi-wan-kenobi Date: Thu, 28 May 2020 08:23:47 +0200 Subject: [PATCH] [modules] move amixer2 to amixer --- bumblebee_status/modules/contrib/amixer.py | 52 ++++++++++-- bumblebee_status/modules/contrib/amixer2.py | 87 --------------------- 2 files changed, 45 insertions(+), 94 deletions(-) delete mode 100644 bumblebee_status/modules/contrib/amixer2.py diff --git a/bumblebee_status/modules/contrib/amixer.py b/bumblebee_status/modules/contrib/amixer.py index 2fb901b..9e3bb3d 100644 --- a/bumblebee_status/modules/contrib/amixer.py +++ b/bumblebee_status/modules/contrib/amixer.py @@ -1,17 +1,21 @@ -"""get volume level +"""get volume level or control it Parameters: - * amixer.device: Device to use, defaults to "Master,0" + * amixer.device: Device to use (default is Master,0) + * amixer.percent_change: How much to change volume by when scrolling on the module (default is 4%) contributed by `zetxx `_ - many thanks! + +input handling contributed by `ardadem _ - many thanks! """ import re import core.module import core.widget +import core.input import util.cli - +import util.format class Module(core.module.Module): def __init__(self, config, theme): @@ -19,8 +23,43 @@ class Module(core.module.Module): self.__level = "n/a" self.__muted = True - device = self.parameter("device", "Master,0") - self._cmdString = "amixer get {}".format(device) + self.__device = self.parameter("device", "Master,0") + self.__change = util.format.asint( + self.parameter("percent_change", "4%").strip("%"), 0, 100 + ) + + events = [ + { + "type": "mute", + "action": self.toggle, + "button": core.input.LEFT_MOUSE, + }, + { + "type": "volume", + "action": self.increase_volume, + "button": core.input.WHEEL_UP, + }, + { + "type": "volume", + "action": self.decrease_volume, + "button": core.input.WHEEL_DOWN, + }, + ] + + for event in events: + core.input.register(self, button=event["button"], cmd=event["action"]) + + def toggle(self, event): + self.set_parameter("toggle") + + def increase_volume(self, event): + self.set_parameter("{}%+".format(self.__change)) + + def decrease_volume(self, event): + self.set_parameter("{}%-".format(self.__change)) + + def set_parameter(self, parameter): + util.cli.execute("amixer -q set {} {}".format(self.__device, parameter)) def volume(self, widget): if self.__level == "n/a": @@ -37,7 +76,7 @@ class Module(core.module.Module): def update(self): try: self.__level = util.cli.execute( - "amixer get {}".format(self.parameter("device", "Master,0")) + "amixer get {}".format(self.__device) ) except Exception as e: self.__level = "n/a" @@ -47,5 +86,4 @@ class Module(core.module.Module): return ["warning", "muted"] return ["unmuted"] - # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 diff --git a/bumblebee_status/modules/contrib/amixer2.py b/bumblebee_status/modules/contrib/amixer2.py deleted file mode 100644 index b6d3e44..0000000 --- a/bumblebee_status/modules/contrib/amixer2.py +++ /dev/null @@ -1,87 +0,0 @@ -"""get volume level or control it - -Parameters: - * amixer.device: Device to use (default is Master,0) - * amixer.percent_change: How much to change volume by when scrolling on the module (default is 4%) - -contributed by `zetxx `_ - many thanks! -""" -import re - -import core.module -import core.widget -import core.input - -import util.cli -import util.format - -class Module(core.module.Module): - def __init__(self, config, theme): - super().__init__(config, theme, core.widget.Widget(self.volume)) - - self._level = "n/a" - self._muted = True - self._device = self.parameter("device", "Master,0") - self._change = util.format.asint( - self.parameter("percent_change", "4%").strip("%"), 0, 100 - ) - - events = [ - { - "type": "mute", - "action": self.toggle, - "button": core.input.LEFT_MOUSE, - }, - { - "type": "volume", - "action": self.increase_volume, - "button": core.input.WHEEL_UP, - }, - { - "type": "volume", - "action": self.decrease_volume, - "button": core.input.WHEEL_DOWN, - }, - ] - - for event in events: - core.input.register(self, button=event["button"], cmd=event["action"]) - - def toggle(self, event): - self.set_parameter("toggle") - - def increase_volume(self, event): - self.set_parameter("{}%+".format(self._change)) - - def decrease_volume(self, event): - self.set_parameter("{}%-".format(self._change)) - - def set_parameter(self, parameter): - util.cli.execute("amixer -q set {} {}".format(self._device, parameter)) - - def volume(self, widget): - if self._level == "n/a": - return self._level - m = re.search(r"([\d]+)\%", self._level) - self._muted = True - if m: - if m.group(1) != "0" and "[on]" in self._level: - self._muted = False - return "{}%".format(m.group(1)) - else: - return "0%" - - def update(self): - try: - self._level = util.cli.execute( - "amixer get {}".format(self._device) - ) - except Exception as e: - self._level = "n/a" - - def state(self, widget): - if self._muted: - return ["warning", "muted"] - return ["unmuted"] - -# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4