Merge pull request #53 from zetxx/master

new module: added volume level for amixer

bumblebee/modules/amixer.py

@@ -0,0 +1,36 @@
+"""get volume level
+
+"""
+import re
+
+import bumblebee.input
+import bumblebee.output
+import bumblebee.engine
+
+class Module(bumblebee.engine.Module):
+    def __init__(self, engine, config):
+        super(Module, self).__init__(engine, config,
+            bumblebee.output.Widget(full_text=self.volume)
+        )
+        self._level = "0"
+        self._muted = True
+        device = self.parameter("device", "Master,0")
+        self._cmdString = "amixer get {}".format(device)
+
+    def volume(self, widget):
+        m = re.search(r'([\d]+)\%', self._level)
+        self._muted = True
+        if m:
+            if m.group(1) != "0":
+                self._muted = False
+            return "{}%".format(m.group(1))
+        else:
+            return "0%"
+
+    def update(self, widgets):
+        self._level = bumblebee.util.execute(self._cmdString)
+
+    def state(self, widget):
+        if self._muted:
+            return [ "warning", "muted" ]
+        return [ "unmuted" ]

themes/icons/ascii.json

@@ -22,6 +22,10 @@
 		"muted": { "prefix": "audio(mute)" },
 		"unmuted": { "prefix": "audio" }
 	},
+	"amixer": {
+		"muted": { "prefix": "audio(mute)" },
+		"unmuted": { "prefix": "audio" }
+	},
 	"pasource": {
 		"muted": { "prefix": "mic(mute)" },
 		"unmuted": { "prefix": "mic" }

themes/icons/awesome-fonts.json

@@ -9,7 +9,6 @@
 	"cpu": { "prefix": "" },
 	"disk": { "prefix": "" },
 	"dnf": { "prefix": "" },
-	"pacman": { "prefix": "" },
 	"brightness": { "prefix": "" },
 	"load": { "prefix": "" },
 	"layout": { "prefix": "" },
@@ -35,6 +34,10 @@
 		"muted": { "prefix": "" },
 		"unmuted": { "prefix": "" }
 	},
+	"amixer": {
+		"muted": { "prefix": "" },
+		"unmuted": { "prefix": "" }
+	},
 	"pasource": {
 		"muted": { "prefix": "" },
 		"unmuted": { "prefix": "" }