From e17ef8614fe8a25ffb913748dfa090463cb4b969 Mon Sep 17 00:00:00 2001
From: es80 <49912978+es80@users.noreply.github.com>
Date: Sun, 21 Jun 2020 17:56:52 +0100
Subject: [PATCH 001/506] fix a regression for shell subprocess

---
 bumblebee_status/modules/contrib/shell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index a451692..6fd9aa2 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -60,7 +60,7 @@ class Module(core.module.Module):
     def update(self):
         # if requested then run not async version and just execute command in this thread
         if not self.__async:
-            self.__output = util.cli.execute(self.__command, ignore_errors=True).strip()
+            self.__output = util.cli.execute(self.__command, shell=True, ignore_errors=True).strip()
             return
 
         # if previous thread didn't end yet then don't do anything

From f67ef9d64a5d71c4cbad5cb5a28471e943814bc4 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Sun, 21 Jun 2020 10:28:37 -0700
Subject: [PATCH 002/506] add spotify-buttons

---
 .../modules/contrib/spotify-buttons.py        | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/spotify-buttons.py

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
new file mode 100644
index 0000000..46c5e7a
--- /dev/null
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -0,0 +1,93 @@
+import sys
+import dbus
+
+import core.module
+import core.widget
+import core.input
+import core.decorators
+"""Displays the current song being played
+
+Requires the following library:
+    * python-dbus
+
+Parameters:
+    * spotify-buttons.format:   Format string (defaults to '{artist} - {title}')
+      Available values are: {album}, {title}, {artist}, {trackNumber}, {playbackStatus}
+    * spotify-buttons.layout:
+"""
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.spotify))
+
+        self.__layout = self.parameter("layout", "spotify-buttons.prev spotify-buttons.pause spotify-buttons.next")
+
+        self.__song = ""
+        self.__format = self.parameter("format", "{artist} - {title}")
+        prev_button = self.parameter("previous", "LEFT_CLICK")
+        next_button = self.parameter("next", "RIGHT_CLICK")
+        pause_button = self.parameter("pause", "MIDDLE_CLICK")
+
+        cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
+                /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
+        #core.input.register(self, button=buttons[prev_button], cmd=cmd + "Previous")
+        #core.input.register(self, button=buttons[next_button], cmd=cmd + "Next")
+        #core.input.register(self, button=buttons[pause_button], cmd=cmd + "PlayPause")
+
+        widget_map = {}
+        for widget in self.__layout.split():
+            widget = self.add_widget(name = widget_name)
+            if widget_name = "spotify-buttons.prev":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": cmd + "Previous",
+                }
+            elif widget_name = "spotify-buttons.pause":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": cmd + "PlayPause",
+                }
+            elif widget_name = "spotify-buttons.next":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": cmd + "Next",
+                }
+
+    @core.decorators.scrollable
+    def spotify(self, widget):
+        return self.string_song
+
+    def hidden(self):
+        return self.string_song == ""
+
+    def update(self):
+        try:
+            bus = dbus.SessionBus()
+            spotify = bus.get_object(
+                "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
+            )
+            spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties")
+            props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata")
+            playback_status = str(
+                spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
+            )
+            self.__song = self.__format.format(
+                album=str(props.get("xesam:album")),
+                title=str(props.get("xesam:title")),
+                artist=",".join(props.get("xesam:artist")),
+                trackNumber=str(props.get("xesam:trackNumber")),
+                playbackStatus="\u25B6"
+                if playback_status == "Playing"
+                else "\u258D\u258D"
+                if playback_status == "Paused"
+                else "",
+            )
+
+        except Exception:
+            self.__song = ""
+
+    @property
+    def string_song(self):
+        if sys.version_info.major < 3:
+            return unicode(self.__song)
+        return str(self.__song)

From ca62f689067248b99afd93f03d80b71480aed6d5 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Sun, 21 Jun 2020 12:31:11 -0700
Subject: [PATCH 003/506] create + map widgets for buttons

---
 bumblebee_status/modules/contrib/spotify-buttons.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
index 46c5e7a..36f126c 100644
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -30,28 +30,27 @@ class Module(core.module.Module):
 
         cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
                 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
-        #core.input.register(self, button=buttons[prev_button], cmd=cmd + "Previous")
-        #core.input.register(self, button=buttons[next_button], cmd=cmd + "Next")
-        #core.input.register(self, button=buttons[pause_button], cmd=cmd + "PlayPause")
 
         widget_map = {}
-        for widget in self.__layout.split():
+        for widget_name in self.__layout.split():
             widget = self.add_widget(name = widget_name)
-            if widget_name = "spotify-buttons.prev":
+            if widget_name == "spotify-buttons.prev":
                 widget_map[widget] = {
                     "button": core.input.LEFT_MOUSE,
                     "cmd": cmd + "Previous",
                 }
-            elif widget_name = "spotify-buttons.pause":
+            elif widget_name == "spotify-buttons.pause":
                 widget_map[widget] = {
                     "button": core.input.LEFT_MOUSE,
                     "cmd": cmd + "PlayPause",
                 }
-            elif widget_name = "spotify-buttons.next":
+            elif widget_name == "spotify-buttons.next":
                 widget_map[widget] = {
                     "button": core.input.LEFT_MOUSE,
                     "cmd": cmd + "Next",
                 }
+        for widget, callback_options in widget_map.items():
+            core.input.register(widget, **callback_options)
 
     @core.decorators.scrollable
     def spotify(self, widget):

From 3558176044c2b48ed70c94d23436071ff4748193 Mon Sep 17 00:00:00 2001
From: "tobias.hannaske" <tobias@hannaske.net>
Date: Mon, 22 Jun 2020 10:33:49 +0200
Subject: [PATCH 004/506] Do not execute iwgetid if the interface is recognized
 as tunnel

---
 bumblebee_status/modules/core/nic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index a5f26b0..585c65f 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -125,7 +125,7 @@ class Module(core.module.Module):
             widget.set("state", state)
 
     def get_ssid(self, intf):
-        if self._iswlan(intf) and self.iwgetid:
+        if self._iswlan(intf) and not self._istunnel(intf) and self.iwgetid:
             return util.cli.execute(
                 "{} -r {}".format(self.iwgetid, intf), ignore_errors=True
             )

From 34dadadf90705e50099af8b66aa0afd38cd73560 Mon Sep 17 00:00:00 2001
From: Tobias Witek <git@witek.at>
Date: Tue, 23 Jun 2020 15:51:14 +0200
Subject: [PATCH 005/506] [core] re-enable minimize of widgets

by default, allow toggling the minimized state of a widget via the
middle mouse and draw a single unicode char instead of the actual
widget, maintaining all states.

fixes #661
---
 bumblebee-status                |  5 +++++
 bumblebee_status/core/module.py |  8 +++++---
 bumblebee_status/core/output.py |  8 +++++++-
 bumblebee_status/core/widget.py |  1 +
 tests/core/test_module.py       |  7 +++++++
 tests/core/test_output.py       | 33 +++++++++++++++++++++++----------
 6 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index f995850..21f8c32 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -19,6 +19,7 @@ import core.module
 import core.input
 import core.event
 
+import util.format
 
 started = False
 
@@ -110,6 +111,10 @@ def main():
         modules.reverse()
 
     output.modules(modules)
+
+    if util.format.asbool(config.get("engine.collapsible", True)) == True:
+        core.input.register(None, core.input.MIDDLE_MOUSE, output.toggle_minimize)
+
     core.event.trigger("start")
     started = True
     while True:
diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index cba01ac..af708db 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -184,12 +184,14 @@ class Module(core.input.Object):
     :rtype: bumblebee_status.widget.Widget
     """
 
-    def widget(self, name=None):
-        if not name:
+    def widget(self, name=None, widget_id=None):
+        if not name and not widget_id:
             return self.widgets()[0]
 
         for w in self.widgets():
-            if w.name == name:
+            if name and w.name == name:
+                return w
+            if w.id == widget_id:
                 return w
         return None
 
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index ab68c6a..4aaf1e9 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -152,6 +152,12 @@ class i3(object):
             return self.__modules
         self.__modules = modules if isinstance(modules, list) else [modules]
 
+    def toggle_minimize(self, event):
+        for module in self.__modules:
+            widget = module.widget(widget_id=event["instance"])
+            if widget:
+                widget.minimized = not widget.minimized
+
     def draw(self, what, args=None):
         cb = getattr(self, what)
         data = cb(args) if args else cb()
@@ -187,7 +193,7 @@ class i3(object):
             except:
                 blk.set("min-width", minwidth)
         blk.set("align", widget.theme("align"))
-        blk.set("full_text", self.__content[widget])
+        blk.set("full_text", "\u2026" if widget.minimized else self.__content[widget])
         if widget.get("pango", False):
             blk.set("markup", "pango")
         if self.__config.debug():
diff --git a/bumblebee_status/core/widget.py b/bumblebee_status/core/widget.py
index dd9fe1f..928aedd 100644
--- a/bumblebee_status/core/widget.py
+++ b/bumblebee_status/core/widget.py
@@ -15,6 +15,7 @@ class Widget(util.store.Store, core.input.Object):
         self.__full_text = full_text
         self.module = None
         self.name = name
+        self.minimized = False
 
     @property
     def module(self):
diff --git a/tests/core/test_module.py b/tests/core/test_module.py
index ef65c88..68415b7 100644
--- a/tests/core/test_module.py
+++ b/tests/core/test_module.py
@@ -129,6 +129,13 @@ def test_get_widget_by_name(empty_config, widget_a, widget_b):
     assert module.widget("i-do-not-exist") == None
     assert module.widget() == widget_a
 
+def test_get_widget_by_id(empty_config, widget_a, widget_b):
+    module = SampleModule(config=empty_config, widgets=[widget_a, widget_b])
+
+    assert module.widget(widget_id=widget_a.id) == widget_a
+    assert module.widget(widget_id=widget_b.id) == widget_b
+    assert module.widget(widget_id="i-do-not-exist") == None
+
 
 def test_default_thresholds(empty_config, widget_a, widget_b):
     module = SampleModule(config=empty_config, widgets=[widget_a, widget_b])
diff --git a/tests/core/test_output.py b/tests/core/test_output.py
index fcd9e22..828078c 100644
--- a/tests/core/test_output.py
+++ b/tests/core/test_output.py
@@ -25,6 +25,16 @@ def i3():
 def module_a(mocker):
     widget = mocker.MagicMock()
     widget.full_text.return_value = "test"
+    widget.id = "a"
+    widget.minimized = False
+    return SampleModule(config=core.config.Config([]), widgets=[widget, widget, widget])
+
+@pytest.fixture
+def module_b(mocker):
+    widget = mocker.MagicMock()
+    widget.full_text.return_value = "test"
+    widget.id = "b"
+    widget.minimized = False
     return SampleModule(config=core.config.Config([]), widgets=[widget, widget, widget])
 
 
@@ -46,16 +56,6 @@ def block_a(separatorTheme, module_a):
         theme=separatorTheme, module=module_a, widget=module_a.widget(),
     )
 
-
-# def setUp(self):
-#    self.i3 = core.output.i3()
-#    widget = unittest.mock.MagicMock()
-#    widget.full_text.return_value = "test"
-#    self.someModule = SampleModule(
-#        config=core.config.Config([]), widgets=[widget, widget, widget]
-#    )
-#    self.separator = "***"
-#
 def test_start(i3):
     all_data = i3.start()
     data = all_data["blocks"]
@@ -83,6 +83,19 @@ def test_register_multiple_modules(i3, module_a):
     i3.modules([module_a, module_a, module_a])
     assert i3.modules() == [module_a, module_a, module_a]
 
+def test_toggle_module(i3, module_a, module_b):
+    i3.modules([module_a, module_b])
+
+    i3.toggle_minimize({ "instance": module_a.widget().id })
+
+    assert module_a.widget().minimized == True
+    assert module_b.widget().minimized == False
+
+    i3.toggle_minimize({ "instance": module_a.widget().id })
+    i3.toggle_minimize({ "instance": module_b.widget().id })
+
+    assert module_a.widget().minimized == False
+    assert module_b.widget().minimized == True
 
 def test_draw_existing_module(mocker, i3):
     i3.test_draw = mocker.MagicMock(

From 441e7d5041b9f91ddb516eaead83f8975cc74e01 Mon Sep 17 00:00:00 2001
From: Tobias Witek <git@witek.at>
Date: Tue, 23 Jun 2020 20:03:17 +0200
Subject: [PATCH 006/506] [core] fix minimize for all modules (nic, traffic,
 etc.)

make it possible to toggle the display state of a widget between
"displayed" and "minimized" also for modules that re-create their
widgets during each iteration.

see #661
---
 bumblebee_status/core/module.py |  3 ++-
 bumblebee_status/core/output.py | 17 +++++++++++------
 bumblebee_status/core/widget.py |  4 ++--
 tests/core/test_output.py       | 20 +++++++++++---------
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index af708db..23ea4b5 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -171,7 +171,8 @@ class Module(core.input.Object):
     """
 
     def add_widget(self, full_text="", name=None):
-        widget = core.widget.Widget(full_text=full_text, name=name)
+        widget_id = "{}::{}".format(self.name, len(self.widgets()))
+        widget = core.widget.Widget(full_text=full_text, name=name, widget_id=widget_id)
         self.widgets().append(widget)
         widget.module = self
         return widget
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 4aaf1e9..929f0f4 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -142,6 +142,9 @@ class i3(object):
         core.event.register("draw", self.draw, "statusline")
         core.event.register("stop", self.draw, "stop")
 
+    def content(self):
+        return self.__content
+
     def theme(self, new_theme=None):
         if new_theme:
             self.__theme = new_theme
@@ -153,10 +156,10 @@ class i3(object):
         self.__modules = modules if isinstance(modules, list) else [modules]
 
     def toggle_minimize(self, event):
-        for module in self.__modules:
-            widget = module.widget(widget_id=event["instance"])
-            if widget:
-                widget.minimized = not widget.minimized
+        widget_id = event["instance"]
+
+        if widget_id in self.__content:
+            self.__content[widget_id]["minimized"] = not self.__content[widget_id]["minimized"]
 
     def draw(self, what, args=None):
         cb = getattr(self, what)
@@ -193,7 +196,7 @@ class i3(object):
             except:
                 blk.set("min-width", minwidth)
         blk.set("align", widget.theme("align"))
-        blk.set("full_text", "\u2026" if widget.minimized else self.__content[widget])
+        blk.set("full_text", "\u2026" if self.__content[widget.id]["minimized"] else self.__content[widget.id]["text"])
         if widget.get("pango", False):
             blk.set("markup", "pango")
         if self.__config.debug():
@@ -236,7 +239,9 @@ class i3(object):
                         module.parameter("interval", self.__config.interval())
                     )
             for widget in module.widgets():
-                self.__content[widget] = widget.full_text()
+                if not widget.id in self.__content:
+                    self.__content[widget.id] = { "minimized": False }
+                self.__content[widget.id]["text"] = widget.full_text()
 
     def statusline(self):
         blocks = []
diff --git a/bumblebee_status/core/widget.py b/bumblebee_status/core/widget.py
index 928aedd..b1c3b4e 100644
--- a/bumblebee_status/core/widget.py
+++ b/bumblebee_status/core/widget.py
@@ -10,12 +10,12 @@ log = logging.getLogger(__name__)
 
 
 class Widget(util.store.Store, core.input.Object):
-    def __init__(self, full_text="", name=None):
+    def __init__(self, full_text="", name=None, widget_id=None):
         super(Widget, self).__init__()
         self.__full_text = full_text
         self.module = None
         self.name = name
-        self.minimized = False
+        self.id = widget_id or self.id
 
     @property
     def module(self):
diff --git a/tests/core/test_output.py b/tests/core/test_output.py
index 828078c..4e0d905 100644
--- a/tests/core/test_output.py
+++ b/tests/core/test_output.py
@@ -26,7 +26,6 @@ def module_a(mocker):
     widget = mocker.MagicMock()
     widget.full_text.return_value = "test"
     widget.id = "a"
-    widget.minimized = False
     return SampleModule(config=core.config.Config([]), widgets=[widget, widget, widget])
 
 @pytest.fixture
@@ -34,7 +33,6 @@ def module_b(mocker):
     widget = mocker.MagicMock()
     widget.full_text.return_value = "test"
     widget.id = "b"
-    widget.minimized = False
     return SampleModule(config=core.config.Config([]), widgets=[widget, widget, widget])
 
 
@@ -86,16 +84,20 @@ def test_register_multiple_modules(i3, module_a):
 def test_toggle_module(i3, module_a, module_b):
     i3.modules([module_a, module_b])
 
+    i3.update()
     i3.toggle_minimize({ "instance": module_a.widget().id })
+    i3.update()
 
-    assert module_a.widget().minimized == True
-    assert module_b.widget().minimized == False
+    assert i3.content()[module_a.widget().id]["minimized"] == True
 
-    i3.toggle_minimize({ "instance": module_a.widget().id })
-    i3.toggle_minimize({ "instance": module_b.widget().id })
-
-    assert module_a.widget().minimized == False
-    assert module_b.widget().minimized == True
+#    assert module_a.widget().minimized == True
+#    assert module_b.widget().minimized == False
+#
+#    i3.toggle_minimize({ "instance": module_a.widget().id })
+#    i3.toggle_minimize({ "instance": module_b.widget().id })
+#
+#    assert module_a.widget().minimized == False
+#    assert module_b.widget().minimized == True
 
 def test_draw_existing_module(mocker, i3):
     i3.test_draw = mocker.MagicMock(

From 582c828deb36e98099ff16ed5fda4dd0c226a826 Mon Sep 17 00:00:00 2001
From: Tobias Witek <git@witek.at>
Date: Tue, 23 Jun 2020 20:20:36 +0200
Subject: [PATCH 007/506] [core] guard against concurrent updates

when a "regular" update (once per interval) and a input-triggered update
(e.g. mouse click on a widget) collide, this can cause the theme colors
to be interleaved wrongly.

fixes #661
---
 bumblebee-status | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index 21f8c32..e4f5982 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -39,7 +39,7 @@ class CommandSocket(object):
         os.unlink(self.__name)
 
 
-def handle_input(output):
+def handle_input(output, update_lock):
     with CommandSocket() as cmdsocket:
         poll = select.poll()
         poll.register(sys.stdin.fileno(), select.POLLIN)
@@ -67,8 +67,10 @@ def handle_input(output):
                         modules[event["name"]] = True
                 except ValueError:
                     pass
+            update_lock.acquire()
             core.event.trigger("update", modules.keys())
             core.event.trigger("draw")
+            update_lock.release()
 
         poll.unregister(sys.stdin.fileno())
 
@@ -96,7 +98,8 @@ def main():
     core.input.register(None, core.input.WHEEL_UP, "i3-msg workspace prev_on_output")
     core.input.register(None, core.input.WHEEL_DOWN, "i3-msg workspace next_on_output")
 
-    input_thread = threading.Thread(target=handle_input, args=(output,))
+    update_lock = threading.Lock()
+    input_thread = threading.Thread(target=handle_input, args=(output, update_lock, ))
     input_thread.daemon = True
     input_thread.start()
 
@@ -118,8 +121,10 @@ def main():
     core.event.trigger("start")
     started = True
     while True:
-        core.event.trigger("update")
-        core.event.trigger("draw")
+        if update_lock.acquire(blocking=False) == True:
+            core.event.trigger("update")
+            core.event.trigger("draw")
+            update_lock.release()
         output.wait(config.interval())
     core.event.trigger("stop")
 

From 92ab1a3e008f581737e25934115e70e5e8bc6b19 Mon Sep 17 00:00:00 2001
From: Tobias Witek <git@witek.at>
Date: Wed, 24 Jun 2020 07:47:31 +0200
Subject: [PATCH 008/506] [util/cli] make sure language is set to "C"

to make parsing of CLI output reliable (i.e. always in english), set
LC_ALL accordingly.

see #662
---
 bumblebee_status/util/cli.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bumblebee_status/util/cli.py b/bumblebee_status/util/cli.py
index 3e4face..8b39aab 100644
--- a/bumblebee_status/util/cli.py
+++ b/bumblebee_status/util/cli.py
@@ -30,6 +30,11 @@ def execute(
     """
     args = cmd if shell else shlex.split(cmd)
     logging.debug(cmd)
+
+    if not env:
+        env = os.environ.copy()
+    env["LC_ALL"] = "C"
+
     try:
         proc = subprocess.Popen(
             args,

From 2eee4c390cf2e411543acba013c8f438b5f9dae9 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Wed, 24 Jun 2020 12:14:26 -0700
Subject: [PATCH 009/506] put text on buttons

---
 .../modules/contrib/spotify-buttons.py        | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
index 36f126c..95be303 100644
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -5,62 +5,35 @@ import core.module
 import core.widget
 import core.input
 import core.decorators
-"""Displays the current song being played
+"""Displays the current song being played and allows pausing, skipping ahead, and skipping back.
 
 Requires the following library:
     * python-dbus
 
 Parameters:
     * spotify-buttons.format:   Format string (defaults to '{artist} - {title}')
-      Available values are: {album}, {title}, {artist}, {trackNumber}, {playbackStatus}
-    * spotify-buttons.layout:
+      Available values are: {album}, {title}, {artist}, {trackNumber}
 """
 
 class Module(core.module.Module):
     def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.spotify))
+        super().__init__(config, theme, [])
 
-        self.__layout = self.parameter("layout", "spotify-buttons.prev spotify-buttons.pause spotify-buttons.next")
+        self.__layout = self.parameter("layout", "spotify-buttons.song spotify-buttons.prev spotify-buttons.pause spotify-buttons.next")
 
         self.__song = ""
+        self.__pause = ""
         self.__format = self.parameter("format", "{artist} - {title}")
-        prev_button = self.parameter("previous", "LEFT_CLICK")
-        next_button = self.parameter("next", "RIGHT_CLICK")
-        pause_button = self.parameter("pause", "MIDDLE_CLICK")
 
-        cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
+        self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
                 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
 
-        widget_map = {}
-        for widget_name in self.__layout.split():
-            widget = self.add_widget(name = widget_name)
-            if widget_name == "spotify-buttons.prev":
-                widget_map[widget] = {
-                    "button": core.input.LEFT_MOUSE,
-                    "cmd": cmd + "Previous",
-                }
-            elif widget_name == "spotify-buttons.pause":
-                widget_map[widget] = {
-                    "button": core.input.LEFT_MOUSE,
-                    "cmd": cmd + "PlayPause",
-                }
-            elif widget_name == "spotify-buttons.next":
-                widget_map[widget] = {
-                    "button": core.input.LEFT_MOUSE,
-                    "cmd": cmd + "Next",
-                }
-        for widget, callback_options in widget_map.items():
-            core.input.register(widget, **callback_options)
-
-    @core.decorators.scrollable
-    def spotify(self, widget):
-        return self.string_song
-
     def hidden(self):
         return self.string_song == ""
 
     def update(self):
         try:
+            self.clear_widgets()
             bus = dbus.SessionBus()
             spotify = bus.get_object(
                 "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
@@ -70,17 +43,46 @@ class Module(core.module.Module):
             playback_status = str(
                 spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
             )
+            if playback_status == "Playing":
+                self.__pause = "\u25B6"
+            else:
+                self.__pause = "\u258D\u258D"
             self.__song = self.__format.format(
                 album=str(props.get("xesam:album")),
                 title=str(props.get("xesam:title")),
                 artist=",".join(props.get("xesam:artist")),
                 trackNumber=str(props.get("xesam:trackNumber")),
-                playbackStatus="\u25B6"
-                if playback_status == "Playing"
-                else "\u258D\u258D"
-                if playback_status == "Paused"
-                else "",
             )
+            #this feels like a stupid way to do this but its all i can think of
+            widget_map = {}
+            for widget_name in self.__layout.split():
+                widget = self.add_widget(name = widget_name)
+                if widget_name == "spotify-buttons.prev":
+                    widget_map[widget] = {
+                        "button": core.input.LEFT_MOUSE,
+                        "cmd": self.__cmd + "Previous",
+                        }
+                    widget.full_text("\u258F\u25C0")
+                elif widget_name == "spotify-buttons.pause":
+                    widget_map[widget] = {
+                        "button": core.input.LEFT_MOUSE,
+                        "cmd": self.__cmd + "PlayPause",
+                        }
+                    widget.full_text(self.__pause)
+                elif widget_name == "spotify-buttons.next":
+                    widget_map[widget] = {
+                        "button": core.input.LEFT_MOUSE,
+                        "cmd": self.__cmd + "Next",
+                        }
+                    widget.full_text("\u25B6\u2595")
+                elif widget_name == "spotify-buttons.song":
+                    widget.full_text(self.__song)
+                else:
+                    raise KeyError(
+                        "The spotify-buttons module does not have a {widget_name!r} widget".format(widget_name=widget_name)
+                        )
+            for widget, callback_options in widget_map.items():
+                core.input.register(widget, **callback_options)
 
         except Exception:
             self.__song = ""

From 0c32d13e6f6a3df98d100d05ce3f3465e83c5d5b Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Wed, 24 Jun 2020 12:15:32 -0700
Subject: [PATCH 010/506] fix playback status

---
 bumblebee_status/modules/contrib/spotify-buttons.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
index 95be303..54b2437 100644
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -44,9 +44,9 @@ class Module(core.module.Module):
                 spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
             )
             if playback_status == "Playing":
-                self.__pause = "\u25B6"
-            else:
                 self.__pause = "\u258D\u258D"
+            else:
+                self.__pause = "\u25B6"
             self.__song = self.__format.format(
                 album=str(props.get("xesam:album")),
                 title=str(props.get("xesam:title")),

From e1a97824586bc9713aa5edecb81d19a22e2faff4 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Wed, 24 Jun 2020 12:18:28 -0700
Subject: [PATCH 011/506] modify comments

---
 bumblebee_status/modules/contrib/spotify-buttons.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
index 54b2437..88c8ae9 100644
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -13,6 +13,8 @@ Requires the following library:
 Parameters:
     * spotify-buttons.format:   Format string (defaults to '{artist} - {title}')
       Available values are: {album}, {title}, {artist}, {trackNumber}
+    * spotify-buttons.layout:   Order in which widgets appear (defaults to song, previous, pause, next)
+      Widget names are: spotify-buttons.song, spotify-buttons.prev, spotify-buttons.pause, spotify-buttons.next
 """
 
 class Module(core.module.Module):

From 7215a11ffe9c1787aef6b5032d6a897956183fb2 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Wed, 24 Jun 2020 12:22:03 -0700
Subject: [PATCH 012/506] black -t py34

---
 .../modules/contrib/spotify-buttons.py        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
index 88c8ae9..26ec14c 100644
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -5,6 +5,7 @@ import core.module
 import core.widget
 import core.input
 import core.decorators
+
 """Displays the current song being played and allows pausing, skipping ahead, and skipping back.
 
 Requires the following library:
@@ -17,11 +18,15 @@ Parameters:
       Widget names are: spotify-buttons.song, spotify-buttons.prev, spotify-buttons.pause, spotify-buttons.next
 """
 
+
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
 
-        self.__layout = self.parameter("layout", "spotify-buttons.song spotify-buttons.prev spotify-buttons.pause spotify-buttons.next")
+        self.__layout = self.parameter(
+            "layout",
+            "spotify-buttons.song spotify-buttons.prev spotify-buttons.pause spotify-buttons.next",
+        )
 
         self.__song = ""
         self.__pause = ""
@@ -55,34 +60,36 @@ class Module(core.module.Module):
                 artist=",".join(props.get("xesam:artist")),
                 trackNumber=str(props.get("xesam:trackNumber")),
             )
-            #this feels like a stupid way to do this but its all i can think of
+            # this feels like a stupid way to do this but its all i can think of
             widget_map = {}
             for widget_name in self.__layout.split():
-                widget = self.add_widget(name = widget_name)
+                widget = self.add_widget(name=widget_name)
                 if widget_name == "spotify-buttons.prev":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "Previous",
-                        }
+                    }
                     widget.full_text("\u258F\u25C0")
                 elif widget_name == "spotify-buttons.pause":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "PlayPause",
-                        }
+                    }
                     widget.full_text(self.__pause)
                 elif widget_name == "spotify-buttons.next":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "Next",
-                        }
+                    }
                     widget.full_text("\u25B6\u2595")
                 elif widget_name == "spotify-buttons.song":
                     widget.full_text(self.__song)
                 else:
                     raise KeyError(
-                        "The spotify-buttons module does not have a {widget_name!r} widget".format(widget_name=widget_name)
+                        "The spotify-buttons module does not have a {widget_name!r} widget".format(
+                            widget_name=widget_name
                         )
+                    )
             for widget, callback_options in widget_map.items():
                 core.input.register(widget, **callback_options)
 

From 4b54d1981c6f415bf4e2ced30f1a6c0ab3cb817c Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Wed, 24 Jun 2020 13:53:02 -0700
Subject: [PATCH 013/506] fix grammar

---
 bumblebee_status/modules/contrib/spotify-buttons.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
index 26ec14c..8adb6d2 100644
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -60,7 +60,8 @@ class Module(core.module.Module):
                 artist=",".join(props.get("xesam:artist")),
                 trackNumber=str(props.get("xesam:trackNumber")),
             )
-            # this feels like a stupid way to do this but its all i can think of
+
+            #add widgets
             widget_map = {}
             for widget_name in self.__layout.split():
                 widget = self.add_widget(name=widget_name)

From bdc38e7934ab8de5ad931d04a7909b6867a84239 Mon Sep 17 00:00:00 2001
From: Tobias Witek <tobi@tobi-wan-kenobi.at>
Date: Thu, 25 Jun 2020 15:43:25 +0200
Subject: [PATCH 014/506] [doc] add shield for bumblebee-status-git AUR package

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6663f4d..9be6247 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 [![Build Status](https://travis-ci.org/tobi-wan-kenobi/bumblebee-status.svg?branch=main)](https://travis-ci.org/tobi-wan-kenobi/bumblebee-status)
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)
-![AUR version](https://img.shields.io/aur/version/bumblebee-status)
+![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
+![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
 [![PyPI version](https://badge.fury.io/py/bumblebee-status.svg)](https://badge.fury.io/py/bumblebee-status)
 [![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)

From 6a8d8302818a716597e7e8d36f943e9912fae6f7 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Thu, 25 Jun 2020 10:20:02 -0700
Subject: [PATCH 015/506] util.format.aslist() for layout

---
 bumblebee_status/modules/contrib/spotify-buttons.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
index 8adb6d2..be198b8 100644
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ b/bumblebee_status/modules/contrib/spotify-buttons.py
@@ -5,6 +5,7 @@ import core.module
 import core.widget
 import core.input
 import core.decorators
+import util.format
 
 """Displays the current song being played and allows pausing, skipping ahead, and skipping back.
 
@@ -25,7 +26,7 @@ class Module(core.module.Module):
 
         self.__layout = self.parameter(
             "layout",
-            "spotify-buttons.song spotify-buttons.prev spotify-buttons.pause spotify-buttons.next",
+            util.format.aslist("spotify-buttons.song,spotify-buttons.prev,spotify-buttons.pause,spotify-buttons.next"),
         )
 
         self.__song = ""
@@ -63,7 +64,7 @@ class Module(core.module.Module):
 
             #add widgets
             widget_map = {}
-            for widget_name in self.__layout.split():
+            for widget_name in self.__layout:
                 widget = self.add_widget(name=widget_name)
                 if widget_name == "spotify-buttons.prev":
                     widget_map[widget] = {

From 057faa55777547ea0ac24394f900a8c1922b4af2 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Thu, 25 Jun 2020 10:23:45 -0700
Subject: [PATCH 016/506] replace original spotify with buttons version

---
 .../modules/contrib/spotify-buttons.py        | 105 -----------------
 bumblebee_status/modules/contrib/spotify.py   | 106 ++++++++++--------
 2 files changed, 58 insertions(+), 153 deletions(-)
 delete mode 100644 bumblebee_status/modules/contrib/spotify-buttons.py

diff --git a/bumblebee_status/modules/contrib/spotify-buttons.py b/bumblebee_status/modules/contrib/spotify-buttons.py
deleted file mode 100644
index be198b8..0000000
--- a/bumblebee_status/modules/contrib/spotify-buttons.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import sys
-import dbus
-
-import core.module
-import core.widget
-import core.input
-import core.decorators
-import util.format
-
-"""Displays the current song being played and allows pausing, skipping ahead, and skipping back.
-
-Requires the following library:
-    * python-dbus
-
-Parameters:
-    * spotify-buttons.format:   Format string (defaults to '{artist} - {title}')
-      Available values are: {album}, {title}, {artist}, {trackNumber}
-    * spotify-buttons.layout:   Order in which widgets appear (defaults to song, previous, pause, next)
-      Widget names are: spotify-buttons.song, spotify-buttons.prev, spotify-buttons.pause, spotify-buttons.next
-"""
-
-
-class Module(core.module.Module):
-    def __init__(self, config, theme):
-        super().__init__(config, theme, [])
-
-        self.__layout = self.parameter(
-            "layout",
-            util.format.aslist("spotify-buttons.song,spotify-buttons.prev,spotify-buttons.pause,spotify-buttons.next"),
-        )
-
-        self.__song = ""
-        self.__pause = ""
-        self.__format = self.parameter("format", "{artist} - {title}")
-
-        self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
-                /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
-
-    def hidden(self):
-        return self.string_song == ""
-
-    def update(self):
-        try:
-            self.clear_widgets()
-            bus = dbus.SessionBus()
-            spotify = bus.get_object(
-                "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
-            )
-            spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties")
-            props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata")
-            playback_status = str(
-                spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
-            )
-            if playback_status == "Playing":
-                self.__pause = "\u258D\u258D"
-            else:
-                self.__pause = "\u25B6"
-            self.__song = self.__format.format(
-                album=str(props.get("xesam:album")),
-                title=str(props.get("xesam:title")),
-                artist=",".join(props.get("xesam:artist")),
-                trackNumber=str(props.get("xesam:trackNumber")),
-            )
-
-            #add widgets
-            widget_map = {}
-            for widget_name in self.__layout:
-                widget = self.add_widget(name=widget_name)
-                if widget_name == "spotify-buttons.prev":
-                    widget_map[widget] = {
-                        "button": core.input.LEFT_MOUSE,
-                        "cmd": self.__cmd + "Previous",
-                    }
-                    widget.full_text("\u258F\u25C0")
-                elif widget_name == "spotify-buttons.pause":
-                    widget_map[widget] = {
-                        "button": core.input.LEFT_MOUSE,
-                        "cmd": self.__cmd + "PlayPause",
-                    }
-                    widget.full_text(self.__pause)
-                elif widget_name == "spotify-buttons.next":
-                    widget_map[widget] = {
-                        "button": core.input.LEFT_MOUSE,
-                        "cmd": self.__cmd + "Next",
-                    }
-                    widget.full_text("\u25B6\u2595")
-                elif widget_name == "spotify-buttons.song":
-                    widget.full_text(self.__song)
-                else:
-                    raise KeyError(
-                        "The spotify-buttons module does not have a {widget_name!r} widget".format(
-                            widget_name=widget_name
-                        )
-                    )
-            for widget, callback_options in widget_map.items():
-                core.input.register(widget, **callback_options)
-
-        except Exception:
-            self.__song = ""
-
-    @property
-    def string_song(self):
-        if sys.version_info.major < 3:
-            return unicode(self.__song)
-        return str(self.__song)
diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index dc371db..159f2ce 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -1,24 +1,3 @@
-# pylint: disable=C0111,R0903
-
-"""Displays the current song being played
-
-Requires the following library:
-    * python-dbus
-
-Parameters:
-    * spotify.format:   Format string (defaults to '{artist} - {title}')
-      Available values are: {album}, {title}, {artist}, {trackNumber}, {playbackStatus}
-    * spotify.previous: Change binding for previous song (default is left click)
-    * spotify.next:     Change binding for next song (default is right click)
-    * spotify.pause:    Change binding for toggling pause (default is middle click)
-
-    Available options for spotify.previous, spotify.next and spotify.pause are:
-        LEFT_CLICK, RIGHT_CLICK, MIDDLE_CLICK, SCROLL_UP, SCROLL_DOWN
-
-
-contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
-"""
-
 import sys
 import dbus
 
@@ -26,41 +5,43 @@ import core.module
 import core.widget
 import core.input
 import core.decorators
+import util.format
+
+"""Displays the current song being played and allows pausing, skipping ahead, and skipping back.
+
+Requires the following library:
+    * python-dbus
+
+Parameters:
+    * spotify-buttons.format:   Format string (defaults to '{artist} - {title}')
+      Available values are: {album}, {title}, {artist}, {trackNumber}
+    * spotify-buttons.layout:   Order in which widgets appear (defaults to song, previous, pause, next)
+      Widget names are: spotify-buttons.song, spotify-buttons.prev, spotify-buttons.pause, spotify-buttons.next
+"""
 
 
 class Module(core.module.Module):
     def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.spotify))
+        super().__init__(config, theme, [])
 
-        buttons = {
-            "LEFT_CLICK": core.input.LEFT_MOUSE,
-            "RIGHT_CLICK": core.input.RIGHT_MOUSE,
-            "MIDDLE_CLICK": core.input.MIDDLE_MOUSE,
-            "SCROLL_UP": core.input.WHEEL_UP,
-            "SCROLL_DOWN": core.input.WHEEL_DOWN,
-        }
+        self.__layout = self.parameter(
+            "layout",
+            util.format.aslist("spotify-buttons.song,spotify-buttons.prev,spotify-buttons.pause,spotify-buttons.next"),
+        )
 
         self.__song = ""
+        self.__pause = ""
         self.__format = self.parameter("format", "{artist} - {title}")
-        prev_button = self.parameter("previous", "LEFT_CLICK")
-        next_button = self.parameter("next", "RIGHT_CLICK")
-        pause_button = self.parameter("pause", "MIDDLE_CLICK")
 
-        cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
+        self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
                 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
-        core.input.register(self, button=buttons[prev_button], cmd=cmd + "Previous")
-        core.input.register(self, button=buttons[next_button], cmd=cmd + "Next")
-        core.input.register(self, button=buttons[pause_button], cmd=cmd + "PlayPause")
-
-    @core.decorators.scrollable
-    def spotify(self, widget):
-        return self.string_song
 
     def hidden(self):
         return self.string_song == ""
 
     def update(self):
         try:
+            self.clear_widgets()
             bus = dbus.SessionBus()
             spotify = bus.get_object(
                 "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
@@ -70,18 +51,50 @@ class Module(core.module.Module):
             playback_status = str(
                 spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
             )
+            if playback_status == "Playing":
+                self.__pause = "\u258D\u258D"
+            else:
+                self.__pause = "\u25B6"
             self.__song = self.__format.format(
                 album=str(props.get("xesam:album")),
                 title=str(props.get("xesam:title")),
                 artist=",".join(props.get("xesam:artist")),
                 trackNumber=str(props.get("xesam:trackNumber")),
-                playbackStatus="\u25B6"
-                if playback_status == "Playing"
-                else "\u258D\u258D"
-                if playback_status == "Paused"
-                else "",
             )
 
+            #add widgets
+            widget_map = {}
+            for widget_name in self.__layout:
+                widget = self.add_widget(name=widget_name)
+                if widget_name == "spotify-buttons.prev":
+                    widget_map[widget] = {
+                        "button": core.input.LEFT_MOUSE,
+                        "cmd": self.__cmd + "Previous",
+                    }
+                    widget.full_text("\u258F\u25C0")
+                elif widget_name == "spotify-buttons.pause":
+                    widget_map[widget] = {
+                        "button": core.input.LEFT_MOUSE,
+                        "cmd": self.__cmd + "PlayPause",
+                    }
+                    widget.full_text(self.__pause)
+                elif widget_name == "spotify-buttons.next":
+                    widget_map[widget] = {
+                        "button": core.input.LEFT_MOUSE,
+                        "cmd": self.__cmd + "Next",
+                    }
+                    widget.full_text("\u25B6\u2595")
+                elif widget_name == "spotify-buttons.song":
+                    widget.full_text(self.__song)
+                else:
+                    raise KeyError(
+                        "The spotify module does not have a {widget_name!r} widget".format(
+                            widget_name=widget_name
+                        )
+                    )
+            for widget, callback_options in widget_map.items():
+                core.input.register(widget, **callback_options)
+
         except Exception:
             self.__song = ""
 
@@ -90,6 +103,3 @@ class Module(core.module.Module):
         if sys.version_info.major < 3:
             return unicode(self.__song)
         return str(self.__song)
-
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 4cbe04f0b0c39921bfd57e873a99f4f364e08bb2 Mon Sep 17 00:00:00 2001
From: LtPeriwinkle <not.yet.periwinkle@gmail.com>
Date: Thu, 25 Jun 2020 10:53:53 -0700
Subject: [PATCH 017/506] remove -buttons, move getting song out of update()

---
 bumblebee_status/modules/contrib/spotify.py | 56 +++++++++++----------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 159f2ce..66b67c9 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -13,10 +13,10 @@ Requires the following library:
     * python-dbus
 
 Parameters:
-    * spotify-buttons.format:   Format string (defaults to '{artist} - {title}')
+    * spotify.format:   Format string (defaults to '{artist} - {title}')
       Available values are: {album}, {title}, {artist}, {trackNumber}
-    * spotify-buttons.layout:   Order in which widgets appear (defaults to song, previous, pause, next)
-      Widget names are: spotify-buttons.song, spotify-buttons.prev, spotify-buttons.pause, spotify-buttons.next
+    * spotify.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
+      Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
 """
 
 
@@ -26,7 +26,7 @@ class Module(core.module.Module):
 
         self.__layout = self.parameter(
             "layout",
-            util.format.aslist("spotify-buttons.song,spotify-buttons.prev,spotify-buttons.pause,spotify-buttons.next"),
+            util.format.aslist("spotify.song,spotify.prev,spotify.pause,spotify.next"),
         )
 
         self.__song = ""
@@ -39,52 +39,54 @@ class Module(core.module.Module):
     def hidden(self):
         return self.string_song == ""
 
-    def update(self):
-        try:
-            self.clear_widgets()
-            bus = dbus.SessionBus()
-            spotify = bus.get_object(
-                "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
-            )
-            spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties")
-            props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata")
-            playback_status = str(
-                spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
-            )
-            if playback_status == "Playing":
-                self.__pause = "\u258D\u258D"
-            else:
-                self.__pause = "\u25B6"
+    def __get_song(self):
+        bus = dbus.SessionBus()
+        spotify = bus.get_object(
+            "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
+        )
+        spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties")
+        props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata")
+        playback_status = str(
+            spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
+        )
+        if playback_status == "Playing":
+            self.__pause = "\u258D\u258D"
+        else:
+            self.__pause = "\u25B6"
             self.__song = self.__format.format(
-                album=str(props.get("xesam:album")),
-                title=str(props.get("xesam:title")),
+            album=str(props.get("xesam:album")),
+            title=str(props.get("xesam:title")),
                 artist=",".join(props.get("xesam:artist")),
                 trackNumber=str(props.get("xesam:trackNumber")),
             )
 
-            #add widgets
+    def update(self):
+        try:
+            self.clear_widgets()
+            self.__get_song()
+            
             widget_map = {}
             for widget_name in self.__layout:
                 widget = self.add_widget(name=widget_name)
-                if widget_name == "spotify-buttons.prev":
+                if widget_name == "spotify.prev":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "Previous",
                     }
                     widget.full_text("\u258F\u25C0")
-                elif widget_name == "spotify-buttons.pause":
+                elif widget_name == "spotify.pause":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "PlayPause",
                     }
                     widget.full_text(self.__pause)
-                elif widget_name == "spotify-buttons.next":
+                elif widget_name == "spotify.next":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "Next",
                     }
                     widget.full_text("\u25B6\u2595")
-                elif widget_name == "spotify-buttons.song":
+                elif widget_name == "spotify.song":
                     widget.full_text(self.__song)
                 else:
                     raise KeyError(

From 542d841622b4aee1339d8f1f274c6d5bb7bf2db9 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 25 Jun 2020 20:00:05 +0200
Subject: [PATCH 018/506] [modules/spotify] add contribution

---
 bumblebee_status/modules/contrib/spotify.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 66b67c9..3f26ef7 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -17,6 +17,10 @@ Parameters:
       Available values are: {album}, {title}, {artist}, {trackNumber}
     * spotify.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
+
+contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
+
+added controls by `LtPeriwinkle <https://github.com/LtPeriwinkle>`_ - many thanks!
 """
 
 

From e9b917c214991ee19d1e5777c0b895d23751578e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 25 Jun 2020 20:00:57 +0200
Subject: [PATCH 019/506] [doc] update spotify

---
 bumblebee_status/modules/contrib/spotify.py | 18 +++++++++---------
 docs/modules.rst                            | 15 ++++++---------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 3f26ef7..eab5573 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -1,12 +1,3 @@
-import sys
-import dbus
-
-import core.module
-import core.widget
-import core.input
-import core.decorators
-import util.format
-
 """Displays the current song being played and allows pausing, skipping ahead, and skipping back.
 
 Requires the following library:
@@ -23,6 +14,15 @@ contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 added controls by `LtPeriwinkle <https://github.com/LtPeriwinkle>`_ - many thanks!
 """
 
+import sys
+import dbus
+
+import core.module
+import core.widget
+import core.input
+import core.decorators
+import util.format
+
 
 class Module(core.module.Module):
     def __init__(self, config, theme):
diff --git a/docs/modules.rst b/docs/modules.rst
index ed99936..41366aa 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1123,24 +1123,21 @@ contributed by `rad4day <https://github.com/rad4day>`_ - many thanks!
 spotify
 ~~~~~~~
 
-Displays the current song being played
+Displays the current song being played and allows pausing, skipping ahead, and skipping back.
 
 Requires the following library:
     * python-dbus
 
 Parameters:
     * spotify.format:   Format string (defaults to '{artist} - {title}')
-      Available values are: {album}, {title}, {artist}, {trackNumber}, {playbackStatus}
-    * spotify.previous: Change binding for previous song (default is left click)
-    * spotify.next:     Change binding for next song (default is right click)
-    * spotify.pause:    Change binding for toggling pause (default is middle click)
-
-    Available options for spotify.previous, spotify.next and spotify.pause are:
-        LEFT_CLICK, RIGHT_CLICK, MIDDLE_CLICK, SCROLL_UP, SCROLL_DOWN
-
+      Available values are: {album}, {title}, {artist}, {trackNumber}
+    * spotify.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
+      Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
 
 contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 
+added controls by `LtPeriwinkle <https://github.com/LtPeriwinkle>`_ - many thanks!
+
 .. image:: ../screenshots/spotify.png
 
 stock

From 72deb7eaf80308d06773183c59f6cc3e6e95cf18 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 25 Jun 2020 20:34:13 +0200
Subject: [PATCH 020/506] [modules] add speed test module

---
 bumblebee_status/core/output.py            |  5 ++-
 bumblebee_status/modules/core/ping.py      |  2 -
 bumblebee_status/modules/core/speedtest.py | 52 ++++++++++++++++++++++
 themes/icons/awesome-fonts.json            |  4 ++
 4 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 bumblebee_status/modules/core/speedtest.py

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 929f0f4..088678d 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -228,16 +228,17 @@ class i3(object):
             if affected_modules and not module.id in affected_modules:
                 continue
             if not affected_modules and module.next_update:
-                if module.parameter("interval", "") == "never":
-                    continue
                 if now < module.next_update:
                     continue
+
             if not redraw_only:
                 module.update_wrapper()
                 if module.parameter("interval", "") != "never":
                     module.next_update = now + util.format.seconds(
                         module.parameter("interval", self.__config.interval())
                     )
+                else:
+                    module.next_update = sys.maxsize
             for widget in module.widgets():
                 if not widget.id in self.__content:
                     self.__content[widget.id] = { "minimized": False }
diff --git a/bumblebee_status/modules/core/ping.py b/bumblebee_status/modules/core/ping.py
index d43c027..7d650cd 100644
--- a/bumblebee_status/modules/core/ping.py
+++ b/bumblebee_status/modules/core/ping.py
@@ -24,8 +24,6 @@ import core.decorators
 import util.cli
 
 
-
-
 class Module(core.module.Module):
     @core.decorators.every(seconds=60)
     def __init__(self, config, theme):
diff --git a/bumblebee_status/modules/core/speedtest.py b/bumblebee_status/modules/core/speedtest.py
new file mode 100644
index 0000000..8f08bf9
--- /dev/null
+++ b/bumblebee_status/modules/core/speedtest.py
@@ -0,0 +1,52 @@
+# pylint: disable=C0111,R0903
+
+"""Performs a speedtest - only updates when the "play" button is clicked
+
+Requires the following python module:
+    * speedtest-cli
+
+"""
+
+import core.module
+import core.widget
+import core.decorators
+
+import speedtest
+
+
+class Module(core.module.Module):
+    @core.decorators.never
+    def __init__(self, config, theme):
+        super().__init__(config, theme, [])
+
+        self.background = True
+        self.__result = "waiting"
+        self.__running = False
+
+        start = self.add_widget(name="start")
+        main = self.add_widget(name="main", full_text=self.result)
+
+    def result(self, _):
+        return self.__result
+
+    def update(self):
+        self.__running = True
+        s = speedtest.Speedtest()
+        s.get_best_server()
+        s.download(threads=None)
+        s.upload(threads=None)
+
+        self.__result = "ping: {:.2f}ms down: {:.2f}Mbps up: {:.2f}Mbps".format(
+            s.results.ping,
+            s.results.download / 1024 / 1024,
+            s.results.upload / 1024 / 1024,
+        )
+        self.__running = False
+
+    def state(self, widget):
+        if widget.name == "start":
+            return "running" if self.__running else "not-running"
+        return None
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 5a5269c..f524de3 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -281,5 +281,9 @@
   },
   "arandr": {
     "prefix": ""
+  },
+  "speedtest": {
+    "running": { "prefix": "\uf110" },
+	"not-running": { "prefix": "\uf144" }
   }
 }

From 7a6788dc1c32ef42c11706ad13cdc1224562f981 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 25 Jun 2020 20:35:00 +0200
Subject: [PATCH 021/506] [doc] add speedtest module

---
 docs/modules.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/modules.rst b/docs/modules.rst
index 41366aa..7e28095 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -221,6 +221,14 @@ Parameters:
 
 .. image:: ../screenshots/spacer.png
 
+speedtest
+~~~~~~~~~
+
+Performs a speedtest - only updates when the "play" button is clicked
+
+Requires the following python module:
+    * speedtest-cli
+
 test
 ~~~~
 

From 44b3df58271f5af3c001bcc2ccaf734a48c650d0 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 25 Jun 2020 20:44:55 +0200
Subject: [PATCH 022/506] [modules/speedtest] make speedtest re-triggerable

---
 bumblebee_status/modules/core/speedtest.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bumblebee_status/modules/core/speedtest.py b/bumblebee_status/modules/core/speedtest.py
index 8f08bf9..2b39cff 100644
--- a/bumblebee_status/modules/core/speedtest.py
+++ b/bumblebee_status/modules/core/speedtest.py
@@ -9,6 +9,7 @@ Requires the following python module:
 
 import core.module
 import core.widget
+import core.input
 import core.decorators
 
 import speedtest
@@ -26,9 +27,14 @@ class Module(core.module.Module):
         start = self.add_widget(name="start")
         main = self.add_widget(name="main", full_text=self.result)
 
+        core.input.register(start, button=core.input.LEFT_MOUSE, cmd=self.update_event)
+
     def result(self, _):
         return self.__result
 
+    def update_event(self, _):
+        self.update()
+
     def update(self):
         self.__running = True
         s = speedtest.Speedtest()

From 4ac8c2ef7a5166326978e61210c6e128c44c4e8f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 25 Jun 2020 20:46:13 +0200
Subject: [PATCH 023/506] [modules/speedtest] small fix for retrigger

---
 bumblebee_status/modules/core/speedtest.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee_status/modules/core/speedtest.py b/bumblebee_status/modules/core/speedtest.py
index 2b39cff..aa07a16 100644
--- a/bumblebee_status/modules/core/speedtest.py
+++ b/bumblebee_status/modules/core/speedtest.py
@@ -10,6 +10,7 @@ Requires the following python module:
 import core.module
 import core.widget
 import core.input
+import core.event
 import core.decorators
 
 import speedtest
@@ -37,6 +38,7 @@ class Module(core.module.Module):
 
     def update(self):
         self.__running = True
+        core.event.trigger("update", [self.id], redraw_only=True)
         s = speedtest.Speedtest()
         s.get_best_server()
         s.download(threads=None)

From 4925e09995b6b65e603caf0c2c7e45ef24925d04 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 26 Jun 2020 09:40:35 +0200
Subject: [PATCH 024/506] [modules/speedtest] no autostart, improve icons

do not start a speedtest automatically during startup, and improve the
icons a bit.
---
 bumblebee_status/modules/core/speedtest.py | 9 +++++++--
 themes/icons/ascii.json                    | 4 ++++
 themes/icons/awesome-fonts.json            | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/speedtest.py b/bumblebee_status/modules/core/speedtest.py
index aa07a16..947666a 100644
--- a/bumblebee_status/modules/core/speedtest.py
+++ b/bumblebee_status/modules/core/speedtest.py
@@ -7,6 +7,8 @@ Requires the following python module:
 
 """
 
+import sys
+
 import core.module
 import core.widget
 import core.input
@@ -22,7 +24,7 @@ class Module(core.module.Module):
         super().__init__(config, theme, [])
 
         self.background = True
-        self.__result = "waiting"
+        self.__result = "<speedtest>"
         self.__running = False
 
         start = self.add_widget(name="start")
@@ -34,10 +36,12 @@ class Module(core.module.Module):
         return self.__result
 
     def update_event(self, _):
+        self.__running = True
         self.update()
 
     def update(self):
-        self.__running = True
+        if not self.__running:
+            return
         core.event.trigger("update", [self.id], redraw_only=True)
         s = speedtest.Speedtest()
         s.get_best_server()
@@ -50,6 +54,7 @@ class Module(core.module.Module):
             s.results.upload / 1024 / 1024,
         )
         self.__running = False
+        core.event.trigger("update", [self.id], redraw_only=True)
 
     def state(self, widget):
         if widget.name == "start":
diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index 1913752..ba2f414 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -362,5 +362,9 @@
   },
   "arandr": {
       "prefix": " displays "
+  },
+  "speedtest": {
+    "running": { "prefix": [".", "..", "...", ".."] },
+	"not-running": { "prefix": "[start]" }
   }
 }
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index f524de3..d6b2eb5 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -283,7 +283,7 @@
     "prefix": ""
   },
   "speedtest": {
-    "running": { "prefix": "\uf110" },
+    "running": { "prefix": ["\uf251", "\uf252", "\uf253"] },
 	"not-running": { "prefix": "\uf144" }
   }
 }

From 1484109fe07b78f605278bdac22921749e36e604 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 26 Jun 2020 09:43:04 +0200
Subject: [PATCH 025/506] [doc] removing user contributions

as somospocos decided to delete his github account, remove the broken
links.

again, somospocos, many thanks for the ways in which you improved
bumblebee-status!
---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index 9be6247..7c26ddd 100644
--- a/README.md
+++ b/README.md
@@ -133,14 +133,6 @@ bar {
 
 Restart i3wm and - that's it!
 
-# User contributions
-
-[@somospocos:bumblebee-status-contrib](https://github.com/somospocos/bumblebee-status-contrib): Collected resources and useful tricks by @somospocos
-
-[@somospocos:bumblebee-bridge-dwm](https://github.com/somospocos/bumblebee-bridge-dwm): Bridge bumblebee-status output into dwm status bar
-
-[@somospocos:bumblebee-bridge-dzen2](https://github.com/somospocos/bumblebee-bridge-dzen2): Bridge bumblebee-status output into dzen2
-
 # Examples
 
 [List of themes](https://bumblebee-status.readthedocs.io/en/main/themes.html)

From 954d7545e38394088a363d04cc98f234c0610087 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 27 Jun 2020 15:02:55 +0200
Subject: [PATCH 026/506] [util/format] make temperature metric case
 insensitive

see #664
---
 bumblebee_status/util/format.py | 2 +-
 tests/util/test_format.py       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/util/format.py b/bumblebee_status/util/format.py
index 198e995..65242a3 100644
--- a/bumblebee_status/util/format.py
+++ b/bumblebee_status/util/format.py
@@ -68,7 +68,7 @@ def astemperature(val, unit="metric"):
     :return: temperature representation of the input value
     :rtype: string
     """
-    return "{}°{}".format(int(val), __UNITS.get(unit, __UNITS["default"]))
+    return "{}°{}".format(int(val), __UNITS.get(unit.lower(), __UNITS["default"]))
 
 
 def byte(val, fmt="{:.2f}"):
diff --git a/tests/util/test_format.py b/tests/util/test_format.py
index 4dda6e9..1e34dec 100644
--- a/tests/util/test_format.py
+++ b/tests/util/test_format.py
@@ -110,4 +110,7 @@ def test_temperature():
     assert astemperature(-100, "kelvin") == "-100°K"
 
 
+def test_temperature_case():
+    assert astemperature(100, "ImPeRiAl") == "100°F"
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 350648b0cd9e3c3b980c6e72946ddfc8d14cb11f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 27 Jun 2020 15:05:57 +0200
Subject: [PATCH 027/506] [util/location] reverse location providers

seems that ipapi gives better results wrt. location
---
 bumblebee_status/util/location.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bumblebee_status/util/location.py b/bumblebee_status/util/location.py
index f8cb441..12242ea 100644
--- a/bumblebee_status/util/location.py
+++ b/bumblebee_status/util/location.py
@@ -16,15 +16,6 @@ __document = None
 __data = {}
 __next = 0
 __sources = [
-    {
-        "url": "http://free.ipwhois.io/json/",
-        "mapping": {
-            "latitude": "latitude",
-            "longitude": "longitude",
-            "country": "country",
-            "ip": "public_ip",
-        },
-    },
     {
         "url": "http://ipapi.co/json",
         "mapping": {
@@ -34,6 +25,15 @@ __sources = [
             "ip": "public_ip",
         },
     },
+    {
+        "url": "http://free.ipwhois.io/json/",
+        "mapping": {
+            "latitude": "latitude",
+            "longitude": "longitude",
+            "country": "country",
+            "ip": "public_ip",
+        },
+    }
 ]
 
 

From fc8783ee133dffafe7c8dfbf520dda2ce0ba5ae2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:44:30 +0200
Subject: [PATCH 028/506] [util/cli] fix CLI invokation for sway

in sway/wayland, make sure that the wayland socket is cleared, which
seems to cause issue for some unspecified reason.

also, while at it, improve code so that the environment dict that is
passed in is *not* modified.

fixes #628
---
 bumblebee_status/util/cli.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/util/cli.py b/bumblebee_status/util/cli.py
index 8b39aab..d14dc6a 100644
--- a/bumblebee_status/util/cli.py
+++ b/bumblebee_status/util/cli.py
@@ -33,14 +33,19 @@ def execute(
 
     if not env:
         env = os.environ.copy()
-    env["LC_ALL"] = "C"
+
+    myenv = env.copy()
+
+    myenv["LC_ALL"] = "C"
+    if "WAYLAND_SOCKET" in myenv:
+        del myenv["WAYLAND_SOCKET"]
 
     try:
         proc = subprocess.Popen(
             args,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT if include_stderr else subprocess.PIPE,
-            env=env,
+            env=myenv,
             shell=shell,
         )
     except FileNotFoundError as e:

From 81c5e75624d3d960f60f40ccb76d777827d43be2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:45:22 +0200
Subject: [PATCH 029/506] [tests] fix location tests

a previous commit that switched the primary and secondary location
provider broke the unit tests - fix that.
---
 tests/util/test_location.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/util/test_location.py b/tests/util/test_location.py
index 21dd2e2..e04e600 100644
--- a/tests/util/test_location.py
+++ b/tests/util/test_location.py
@@ -11,7 +11,7 @@ def urllib_req(mocker):
 
 
 @pytest.fixture
-def primaryLocation():
+def secondaryLocation():
     return {
         "country": "Middle Earth",
         "longitude": "10.0",
@@ -21,7 +21,7 @@ def primaryLocation():
 
 
 @pytest.fixture
-def secondaryLocation():
+def primaryLocation():
     return {
         "country_name": "Rivia",
         "longitude": "-10.0",
@@ -33,7 +33,7 @@ def secondaryLocation():
 def test_primary_provider(urllib_req, primaryLocation):
     urllib_req.urlopen.return_value.read.return_value = json.dumps(primaryLocation)
 
-    assert util.location.country() == primaryLocation["country"]
+    assert util.location.country() == primaryLocation["country_name"]
     assert util.location.coordinates() == (
         primaryLocation["latitude"],
         primaryLocation["longitude"],
@@ -46,7 +46,7 @@ def test_secondary_provider(mocker, urllib_req, secondaryLocation):
     urlopen.read.return_value = json.dumps(secondaryLocation)
     urllib_req.urlopen.side_effect = [RuntimeError(), urlopen]
 
-    assert util.location.country() == secondaryLocation["country_name"]
+    assert util.location.country() == secondaryLocation["country"]
     assert util.location.coordinates() == (
         secondaryLocation["latitude"],
         secondaryLocation["longitude"],

From 8f3d48c0e68773719cfa017dcb3e3f3384f12bcc Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:59:43 +0200
Subject: [PATCH 030/506] [modules/brightness] re-enable reading brightness
 from ACPI

to enable reading the brightness from ACPF, set the device path and -
other than previously - explicitly enable this by setting the parameter
"brightness.use_acpi" to "true".

fixes #665
---
 .../modules/contrib/brightness.py             | 32 +++++++++++++++++--
 docs/modules.rst                              |  2 ++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/brightness.py b/bumblebee_status/modules/contrib/brightness.py
index eb68a4f..28b94a8 100644
--- a/bumblebee_status/modules/contrib/brightness.py
+++ b/bumblebee_status/modules/contrib/brightness.py
@@ -4,6 +4,8 @@
 
 Parameters:
     * brightness.step: The amount of increase/decrease on scroll in % (defaults to 2)
+    * brightness.device_path: The device path (defaults to /sys/class/backlight/intel_backlight), can contain wildcards (in this case, the first matching path will be used); This is only used when brightness.use_acpi is set to true
+    * brightness.use_acpi: If set to true, read brightness directly from the sys ACPI interface, using the device specified in brightness.device_path (defaults to false)
 
 contributed by `TheEdgeOfRage <https://github.com/TheEdgeOfRage>`_ - many thanks!
 """
@@ -27,8 +29,12 @@ class Module(core.module.Module):
         self.__brightness = "n/a"
         self.__readcmd = None
         step = self.parameter("step", 2)
+        self.__device_path = self.find_device(self.parameter("device_path", "/sys/class/backlight/intel_backlight"))
 
-        if shutil.which("light"):
+        if util.format.asbool(self.parameter("use_acpi", False)):
+            self.__readcmd = self.__acpi
+            # TODO: add setting
+        elif shutil.which("light"):
             self.__readcmd = self.__light
             self.register_cmd("light -A {}%".format(step), "light -U {}%".format(step))
         elif shutil.which("brightnessctl"):
@@ -42,6 +48,12 @@ class Module(core.module.Module):
                 "xbacklight +{}%".format(step), "xbacklight -{}%".format(step)
             )
 
+    def find_device(self, device_path):
+        res = glob.glob(device_path)
+        if len(res) == 0:
+            return device_path
+        return res[0]
+
     def register_cmd(self, up_cmd, down_cmd):
         core.input.register(self, button=core.input.WHEEL_UP, cmd=up_cmd)
         core.input.register(self, button=core.input.WHEEL_DOWN, cmd=down_cmd)
@@ -49,6 +61,18 @@ class Module(core.module.Module):
     def brightness(self, widget):
         return self.__brightness
 
+    def __acpi(self):
+        try:
+            backlight = 1
+            max_brightness = 1
+            with open("{}/brightness".format(self.__device_path)) as f:
+                backlight = int(f.readline())
+            with open("{}/max_brightness".format(self.__device_path)) as f:
+                max_brightness = int(f.readline())
+                return float(backlight*100)/max_brightness
+        except:
+            return "unable to read brightness from {}".format(self.__device_path)
+
     def __light(self):
         return util.cli.execute("light").strip()
 
@@ -62,7 +86,11 @@ class Module(core.module.Module):
 
     def update(self):
         try:
-            self.__brightness = "{:3.0f}%".format(float(self.__readcmd()))
+            tmp = self.__readcmd()
+            if isinstance(tmp, str):
+                self.__brightness = tmp
+            else:
+                self.__brightness = "{:3.0f}%".format(float(tmp))
         except:
             self.__brightness = "n/a"
 
diff --git a/docs/modules.rst b/docs/modules.rst
index 7e28095..984abb9 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -404,6 +404,8 @@ Displays the brightness of a display
 
 Parameters:
     * brightness.step: The amount of increase/decrease on scroll in % (defaults to 2)
+    * brightness.device_path: The device path (defaults to /sys/class/backlight/intel_backlight), can contain wildcards (in this case, the first matching path will be used); This is only used when brightness.use_acpi is set to true
+    * brightness.use_acpi: If set to true, read brightness directly from the sys ACPI interface, using the device specified in brightness.device_path (defaults to false)
 
 contributed by `TheEdgeOfRage <https://github.com/TheEdgeOfRage>`_ - many thanks!
 

From 320bba97d059a59e253ca40aff92378492896027 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 28 Jun 2020 20:01:08 +0200
Subject: [PATCH 031/506] [core/theme] Make theme iconsets *not* override
 settings

Make sure that iconsets used as part of a theme do *not* override
anything already existing inside the theme.

Only iconsets that are manually specified can override settings in the
theme now (because those, you typically specify on the CLI).

TODO: Write unit test for this

fixes #666
---
 bumblebee_status/core/theme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index f50286a..8ed689d 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -53,7 +53,7 @@ class Theme(object):
         self.__data = raw_data if raw_data else self.load(name)
 
         for icons in self.__data.get("icons", []):
-            self.__data = util.algorithm.merge(self.load(icons, "icons"), self.__data)
+            util.algorithm.merge(self.load(icons, "icons"), self.__data)
         if iconset != "auto":
             self.__data = util.algorithm.merge(self.load(iconset, "icons"), self.__data)
         for colors in self.__data.get("colors", []):

From 6b09be1993751c56c24c5ffe55573d45f6bc88ec Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 28 Jun 2020 20:09:55 +0200
Subject: [PATCH 032/506] Revert "[core/theme] Make theme iconsets *not*
 override settings"

This reverts commit 320bba97d059a59e253ca40aff92378492896027.
---
 bumblebee_status/core/theme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index 8ed689d..f50286a 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -53,7 +53,7 @@ class Theme(object):
         self.__data = raw_data if raw_data else self.load(name)
 
         for icons in self.__data.get("icons", []):
-            util.algorithm.merge(self.load(icons, "icons"), self.__data)
+            self.__data = util.algorithm.merge(self.load(icons, "icons"), self.__data)
         if iconset != "auto":
             self.__data = util.algorithm.merge(self.load(iconset, "icons"), self.__data)
         for colors in self.__data.get("colors", []):

From 810daac16b5142353a8dabd96326ec29e2766bc4 Mon Sep 17 00:00:00 2001
From: gkeep <gkeep77@protonmail.com>
Date: Mon, 29 Jun 2020 00:48:09 +0300
Subject: [PATCH 033/506] Add icons for different states

---
 themes/icons/ascii.json         | 6 +++++-
 themes/icons/awesome-fonts.json | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index ba2f414..0482a3b 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -297,7 +297,11 @@
     "prefix": ""
   },
   "spotify": {
-    "prefix": ""
+    "song": { "prefix": "spotify" },
+    "prev": { "prefix": "|<" },
+    "playing": { "prefix": "|>" },
+    "paused": { "prefix": "||" },
+    "next": { "prefix": ">|" }
   },
   "uptime": {
     "prefix": "uptime"
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index d6b2eb5..07a11a8 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -219,7 +219,11 @@
     "prefix": "  "
   },
   "spotify": {
-    "prefix": "  "
+    "song": { "prefix": "" },
+    "prev": { "prefix": "" },
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
+    "next": { "prefix": "" }
   },
   "publicip": {
     "prefix": "  "

From 134bbbd74363929982e897f77cb9b8c7d470883b Mon Sep 17 00:00:00 2001
From: gkeep <gkeep77@protonmail.com>
Date: Mon, 29 Jun 2020 00:57:01 +0300
Subject: [PATCH 034/506] Use icons depending on widget state and icon set

---
 bumblebee_status/modules/contrib/spotify.py | 32 +++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index eab5573..f1e925c 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -50,25 +50,18 @@ class Module(core.module.Module):
         )
         spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties")
         props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata")
-        playback_status = str(
-            spotify_iface.Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
-        )
-        if playback_status == "Playing":
-            self.__pause = "\u258D\u258D"
-        else:
-            self.__pause = "\u25B6"
-            self.__song = self.__format.format(
+        self.__song = self.__format.format(
             album=str(props.get("xesam:album")),
             title=str(props.get("xesam:title")),
-                artist=",".join(props.get("xesam:artist")),
-                trackNumber=str(props.get("xesam:trackNumber")),
-            )
+            artist=",".join(props.get("xesam:artist")),
+            trackNumber=str(props.get("xesam:trackNumber")),
+        )
 
     def update(self):
         try:
             self.clear_widgets()
             self.__get_song()
-            
+
             widget_map = {}
             for widget_name in self.__layout:
                 widget = self.add_widget(name=widget_name)
@@ -77,20 +70,29 @@ class Module(core.module.Module):
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "Previous",
                     }
-                    widget.full_text("\u258F\u25C0")
+                    widget.set("state", "prev")
                 elif widget_name == "spotify.pause":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "PlayPause",
                     }
-                    widget.full_text(self.__pause)
+                    playback_status = str(
+                        dbus.Interface(dbus.SessionBus().get_object(
+                            "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"), "org.freedesktop.DBus.Properties")
+                                .Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
+                    )
+                    if playback_status == "Playing":
+                        widget.set("state", "playing")
+                    else:
+                        widget.set("state", "paused")
                 elif widget_name == "spotify.next":
                     widget_map[widget] = {
                         "button": core.input.LEFT_MOUSE,
                         "cmd": self.__cmd + "Next",
                     }
-                    widget.full_text("\u25B6\u2595")
+                    widget.set("state", "next")
                 elif widget_name == "spotify.song":
+                    widget.set("state", "song")
                     widget.full_text(self.__song)
                 else:
                     raise KeyError(

From 9136ebd3211d7b68ce5d4052e616ef4d1d165eb5 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 29 Jun 2020 07:44:22 +0200
Subject: [PATCH 035/506] [core/input] clear previous input registrations

make sure that for a given event (widget/object/module, whatever), only
a *single* input event per button can be registered at one time.

the problem otherwise is with modules that re-register their widgets
with the same IDs (cmus, spotify, etc.): Each time the widget is
re-created (each intervall, typically), it re-registers an input event,
creating an always longer list of callbacks being executed when the
button is clicked (not speaking of the memory leak this introduces).

fixes #668
---
 bumblebee_status/core/event.py | 3 +++
 bumblebee_status/core/input.py | 1 +
 tests/core/test_input.py       | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/event.py b/bumblebee_status/core/event.py
index 88096a5..8e969f0 100644
--- a/bumblebee_status/core/event.py
+++ b/bumblebee_status/core/event.py
@@ -8,6 +8,9 @@ def register(event, callback, *args, **kwargs):
 
     __callbacks.setdefault(event, []).append(cb)
 
+def unregister(event):
+    if event in __callbacks:
+        del __callbacks[event]
 
 def clear():
     __callbacks.clear()
diff --git a/bumblebee_status/core/input.py b/bumblebee_status/core/input.py
index a2ebaa8..9dbc2a6 100644
--- a/bumblebee_status/core/input.py
+++ b/bumblebee_status/core/input.py
@@ -50,6 +50,7 @@ def __execute(event, cmd, wait=False):
 def register(obj, button=None, cmd=None, wait=False):
     event_id = __event_id(obj.id if obj is not None else "", button)
     logging.debug("registering callback {}".format(event_id))
+    core.event.unregister(event_id) # make sure there's always only one input event
     if callable(cmd):
         core.event.register(event_id, cmd)
     else:
diff --git a/tests/core/test_input.py b/tests/core/test_input.py
index 962b5b2..a12deb2 100644
--- a/tests/core/test_input.py
+++ b/tests/core/test_input.py
@@ -59,14 +59,14 @@ def test_different_events(obj, obj2, cb, cb2):
     cb2.assert_not_called()
 
 
-def test_multiple_registrations(obj, cb, cb2):
+def test_multiple_registrations_on_same_button(obj, cb, cb2):
     core.input.register(obj, event(obj)["button"], cb)
     core.input.register(obj, event(obj)["button"], cb2)
 
     core.input.trigger(event(obj))
 
-    cb.assert_called_once_with(event(obj))
     cb2.assert_called_once_with(event(obj))
+    cb.assert_not_called()
 
 
 def test_event_names():

From e006344dccc3becbedf96ef53d4d8bddb15e5000 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 29 Jun 2020 07:51:35 +0200
Subject: [PATCH 036/506] [doc] add how to create icon-only widgets

fixes #669
---
 docs/development/theme.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/development/theme.rst b/docs/development/theme.rst
index 7ea8af6..24e7cbe 100644
--- a/docs/development/theme.rst
+++ b/docs/development/theme.rst
@@ -52,6 +52,21 @@ JSON file located in ``$(THEME_DIRECTORY)/icons/``. The format of the
 icon file is identical to the theme itself (as the two are essentially
 just merged into a single JSON.
 
+To create an "icon-only" widget (e.g. the play/pause/forward/rewind buttons
+of a media player), you need to do the following:
+
+1. In the module, create a widget, and set its state to a descriptive value
+   (for example `widget.set("state", "next")`
+2. In the theme's icon definition JSON, define a `prefix` for that state:
+
+.. code:: json
+
+    {
+      "spotify": {
+        "next": { "prefix": "<next icon>" }
+      },
+    }
+
 Color definitions and pyWAL support
 -----------------------------------
 

From 227a23fdb539ff4170e747add2d594e860c0c801 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 29 Jun 2020 20:07:24 +0200
Subject: [PATCH 037/506] [core/theme] fix mergeing of iconsets

iconsets should only overwrite parameters that are *not* set in the main
theme file.

fixes #666
---
 bumblebee_status/core/theme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index f50286a..b52c465 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -53,7 +53,7 @@ class Theme(object):
         self.__data = raw_data if raw_data else self.load(name)
 
         for icons in self.__data.get("icons", []):
-            self.__data = util.algorithm.merge(self.load(icons, "icons"), self.__data)
+            self.__data = util.algorithm.merge(self.__data, self.load(icons, "icons"))
         if iconset != "auto":
             self.__data = util.algorithm.merge(self.load(iconset, "icons"), self.__data)
         for colors in self.__data.get("colors", []):

From f75f1a9f26c6a4b96251f076cfd369e7fc276cab Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 30 Jun 2020 07:20:54 +0200
Subject: [PATCH 038/506] [modules/spotify] fix layout parameter

---
 bumblebee_status/modules/contrib/spotify.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index f1e925c..85b8c31 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -12,6 +12,8 @@ Parameters:
 contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 
 added controls by `LtPeriwinkle <https://github.com/LtPeriwinkle>`_ - many thanks!
+
+fixed icons and layout parameter by `gkeep <https://github.com/gkeep>`_ - many thanks!
 """
 
 import sys
@@ -28,9 +30,10 @@ class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
 
-        self.__layout = self.parameter(
-            "layout",
-            util.format.aslist("spotify.song,spotify.prev,spotify.pause,spotify.next"),
+        self.__layout = util.format.aslist(
+            self.parameter(
+                "layout", "spotify.song,spotify.prev,spotify.pause,spotify.next",
+            )
         )
 
         self.__song = ""
@@ -77,9 +80,13 @@ class Module(core.module.Module):
                         "cmd": self.__cmd + "PlayPause",
                     }
                     playback_status = str(
-                        dbus.Interface(dbus.SessionBus().get_object(
-                            "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"), "org.freedesktop.DBus.Properties")
-                                .Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
+                        dbus.Interface(
+                            dbus.SessionBus().get_object(
+                                "org.mpris.MediaPlayer2.spotify",
+                                "/org/mpris/MediaPlayer2",
+                            ),
+                            "org.freedesktop.DBus.Properties",
+                        ).Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
                     )
                     if playback_status == "Playing":
                         widget.set("state", "playing")

From 7579a086153947fc99e2b61100da924baff25704 Mon Sep 17 00:00:00 2001
From: gkeep <gkeep77@protonmail.com>
Date: Tue, 30 Jun 2020 13:58:10 +0300
Subject: [PATCH 039/506] Use icon actions instead of states

---
 themes/icons/ascii.json         | 28 +++++++++++++++++++---------
 themes/icons/awesome-fonts.json | 22 +++++++++++-----------
 themes/icons/ionicons.json      | 24 ++++++++++++++----------
 3 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index 0482a3b..2580d32 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -29,10 +29,10 @@
   },
   "cmus": {
     "playing": {
-      "prefix": ">"
+      "prefix": "||"
     },
     "paused": {
-      "prefix": "||"
+      "prefix": "|>"
     },
     "stopped": {
       "prefix": "[]"
@@ -263,10 +263,10 @@
   },
   "mpd": {
     "playing": {
-      "prefix": ">"
+      "prefix": "||"
     },
     "paused": {
-      "prefix": "||"
+      "prefix": "|>"
     },
     "stopped": {
       "prefix": "[]"
@@ -297,11 +297,21 @@
     "prefix": ""
   },
   "spotify": {
-    "song": { "prefix": "spotify" },
-    "prev": { "prefix": "|<" },
-    "playing": { "prefix": "|>" },
-    "paused": { "prefix": "||" },
-    "next": { "prefix": ">|" }
+    "song": {
+      "prefix": "spotify"
+    },
+    "playing": {
+      "prefix": "||"
+    },
+    "paused": {
+      "prefix": "|>"
+    },
+    "prev": {
+      "prefix": "|<"
+    },
+    "next": {
+      "prefix": ">|"
+    }
   },
   "uptime": {
     "prefix": "uptime"
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 07a11a8..d0ac2bc 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -22,7 +22,7 @@
     "fan": { "prefix": "" }
   },
   "disk": { "prefix": "" },
-  "smartstatus": { "prefix": "" },  
+  "smartstatus": { "prefix": "" },
   "dnf": { "prefix": "" },
   "apt": { "prefix": "" },
   "pacman": { "prefix": "" },
@@ -48,8 +48,8 @@
     "DEGRADED": { "prefix": "!" }
   },
   "cmus": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
     "stopped": { "prefix": "" },
     "prev": { "prefix": "" },
     "next": { "prefix": "" },
@@ -59,15 +59,15 @@
     "repeat-off": { "prefix": "" }
   },
   "gpmdp": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
     "stopped": { "prefix": "" },
     "prev": { "prefix": "" },
     "next": { "prefix": "" }
   },
   "playerctl": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
     "stopped": { "prefix": "" },
     "prev": { "prefix": "" },
     "next": { "prefix": "" }
@@ -199,8 +199,8 @@
     "tx": { "prefix": "" }
   },
   "mpd": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
     "stopped": { "prefix": "" },
     "prev": { "prefix": "" },
     "next": { "prefix": "" },
@@ -220,9 +220,9 @@
   },
   "spotify": {
     "song": { "prefix": "" },
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
     "prev": { "prefix": "" },
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
     "next": { "prefix": "" }
   },
   "publicip": {
diff --git a/themes/icons/ionicons.json b/themes/icons/ionicons.json
index 3e577bf..b510cc1 100644
--- a/themes/icons/ionicons.json
+++ b/themes/icons/ionicons.json
@@ -30,8 +30,8 @@
     "DEGRADED": { "prefix": "\u26c1\uf3bc" }
   },
   "cmus": {
-    "playing": { "prefix": "\uf488" },
-    "paused": { "prefix": "\uf210" },
+    "playing": { "prefix": "\uf210" },
+    "paused": { "prefix": "\uf488" },
     "stopped": { "prefix": "\uf24f" },
     "prev": { "prefix": "\uf4ab" },
     "next": { "prefix": "\uf4ad" },
@@ -41,15 +41,15 @@
     "repeat-off": { "prefix": "\uf30f" }
   },
   "gpmdp": {
-    "playing": { "prefix": "\uf488" },
-    "paused": { "prefix": "\uf210" },
+    "playing": { "prefix": "\uf210" },
+    "paused": { "prefix": "\uf488" },
     "stopped": { "prefix": "\uf24f" },
     "prev": { "prefix": "\uf4ab" },
     "next": { "prefix": "\uf4ad" }
   },
   "playerctl": {
-    "playing": { "prefix": "\uf488" },
-    "paused": { "prefix": "\uf210" },
+    "playing": { "prefix": "\uf210" },
+    "paused": { "prefix": "\uf488" },
     "stopped": { "prefix": "\uf24f" },
     "prev": { "prefix": "\uf4ab" },
     "next": { "prefix": "\uf4ad" }
@@ -147,8 +147,8 @@
     "tx": { "prefix": "\uf35f" }
   },
   "mpd": {
-    "playing": { "prefix": "\uf488" },
-    "paused": { "prefix": "\uf210" },
+    "playing": { "prefix": "\uf210" },
+    "paused": { "prefix": "\uf488" },
     "stopped": { "prefix": "\uf24f" },
     "prev": { "prefix": "\uf4ab" },
     "next": { "prefix": "\uf4ad" },
@@ -164,7 +164,11 @@
     "prefix": "\uf305"
   },
   "spotify": {
-    "prefix": "\uf305"
+    "song": { "prefix": "\uf305" },
+    "playing": { "prefix": "\uf210" },
+    "paused": { "prefix": "\uf488" },
+    "prev": { "prefix": "\uf4ab" },
+    "next": { "prefix": "\uf4ad" }
   },
   "publicip": {
     "prefix": "\uf268"
@@ -202,6 +206,6 @@
       "on": { "prefix": "\uf488" }
   },
   "arandr": {
-    "prefix": "\uf465" 
+    "prefix": "\uf465"
   }
 }

From 6d9d325eca0c04c4ba2931f76a51bd34ed623686 Mon Sep 17 00:00:00 2001
From: Marvin Steadfast <marvin@xsteadfastx.org>
Date: Tue, 30 Jun 2020 14:49:43 +0200
Subject: [PATCH 040/506] [modules/nic] Using `iw` to find out whats the SSID
 name

---
 bumblebee_status/modules/core/nic.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 585c65f..75bcd77 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -12,6 +12,7 @@ Parameters:
     * nic.format: Format string (defaults to '{intf} {state} {ip} {ssid}')
 """
 
+import re
 import shutil
 import netifaces
 import subprocess
@@ -44,7 +45,7 @@ class Module(core.module.Module):
             else:
                 self._states["include"].append(state)
         self._format = self.parameter("format", "{intf} {state} {ip} {ssid}")
-        self.iwgetid = shutil.which("iwgetid")
+        self.iw = shutil.which("iw")
         self._update_widgets(widgets)
 
     def update(self):
@@ -125,10 +126,13 @@ class Module(core.module.Module):
             widget.set("state", state)
 
     def get_ssid(self, intf):
-        if self._iswlan(intf) and not self._istunnel(intf) and self.iwgetid:
-            return util.cli.execute(
-                "{} -r {}".format(self.iwgetid, intf), ignore_errors=True
-            )
+        if self._iswlan(intf) and not self._istunnel(intf) and self.iw:
+            ssid = util.cli.execute("{} dev {} link".format(self.iw, intf))
+            found_ssid = re.findall("SSID:\s(.+)", ssid)
+            if len(found_ssid) > 0:
+                return found_ssid[0]
+            else:
+                return ""
         return ""
 
 

From edb8eaf410b52ab2593a0c439bb316d6c85343f9 Mon Sep 17 00:00:00 2001
From: Andrew Reisner <areisne2@illinois.edu>
Date: Sun, 5 Jul 2020 12:35:44 -0600
Subject: [PATCH 041/506] Small fix to xrandr module.

---
 bumblebee_status/modules/core/xrandr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/core/xrandr.py b/bumblebee_status/modules/core/xrandr.py
index 04278ba..e1717e8 100644
--- a/bumblebee_status/modules/core/xrandr.py
+++ b/bumblebee_status/modules/core/xrandr.py
@@ -85,14 +85,14 @@ class Module(core.module.Module):
         self._needs_update = True
 
     def _toggle(self, event):
-        self._refresh(self, event)
+        self._refresh(event)
 
         if util.format.asbool(self.parameter("overwrite_i3config", False)) == True:
             toggle_cmd = utility("toggle-display.sh")
         else:
             toggle_cmd = "xrandr"
 
-        widget = self.widget_by_id(event["instance"])
+        widget = self.widget(widget_id=event["instance"])
 
         if widget.get("state") == "on":
             util.cli.execute("{} --output {} --off".format(toggle_cmd, widget.name))

From aac2316d746be42a1b34d67b002bee4d2796714a Mon Sep 17 00:00:00 2001
From: ColdFire <fanilgandhi@gmail.com>
Date: Mon, 6 Jul 2020 14:20:41 +0530
Subject: [PATCH 042/506] Updating config parser

---
 bumblebee_status/core/config.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index 67aba5f..bde212e 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -233,7 +233,10 @@ class Config(util.store.Store):
     """
 
     def modules(self):
-        return [item for sub in self.__args.modules for item in sub]
+        list_of_modules = self.get('modules', None)
+        if (list_of_modules is None) or (type(list_of_modules) != list):
+            list_of_modules  = [item for sub in self.__args.modules for item in sub]
+        return list_of_modules
 
     """Returns the global update interval
 
@@ -278,7 +281,7 @@ class Config(util.store.Store):
     """
 
     def theme(self):
-        return self.__args.theme
+        return self.get('theme', self.__args.theme)
 
     """Returns the configured iconset name
 

From 057f894d527c06e1b0ab521912f64b75f466a582 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 9 Jul 2020 06:56:43 +0200
Subject: [PATCH 043/506] [core/config] change preferred theme source

now, it works like this:

- if present, use what's on the CLI
- if not, use what's present in the config
- fallback is "default"

see #679
---
 bumblebee_status/core/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index bde212e..353d42d 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -153,7 +153,7 @@ class Config(util.store.Store):
             default=[],
             help=PARAMETER_HELP,
         )
-        parser.add_argument("-t", "--theme", default="default", help=THEME_HELP)
+        parser.add_argument("-t", "--theme", default=None, help=THEME_HELP)
         parser.add_argument(
             "-i",
             "--iconset",
@@ -281,7 +281,7 @@ class Config(util.store.Store):
     """
 
     def theme(self):
-        return self.get('theme', self.__args.theme)
+        return self.__args.theme or self.get("theme") or "default"
 
     """Returns the configured iconset name
 

From a9f50f1b513b2aed54ea87f13a8e5673a4449b87 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 9 Jul 2020 07:04:22 +0200
Subject: [PATCH 044/506] [core/config] add "core" config section

move theme and modules into a "core" config section
---
 bumblebee_status/core/config.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index 353d42d..0a47f93 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -225,6 +225,10 @@ class Config(util.store.Store):
             if tmp.has_section("module-parameters"):
                 for key, value in tmp.items("module-parameters"):
                     self.set(key, value)
+            if tmp.has_section("core"):
+                for key, value in tmp.items("core"):
+                    self.set(key, value)
+
 
     """Returns a list of configured modules
 

From 72045b2318280410e5191692866268bf4c823c33 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 9 Jul 2020 07:04:45 +0200
Subject: [PATCH 045/506] [core/config] make configurable module list work

configparser doesn't seem to have direct array support,
so use format.aslist() to get a list of modules

fixes #678
---
 bumblebee_status/core/config.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index 0a47f93..94a92e5 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -237,9 +237,10 @@ class Config(util.store.Store):
     """
 
     def modules(self):
-        list_of_modules = self.get('modules', None)
-        if (list_of_modules is None) or (type(list_of_modules) != list):
-            list_of_modules  = [item for sub in self.__args.modules for item in sub]
+        list_of_modules = [item for sub in self.__args.modules for item in sub]
+
+        if list_of_modules == []:
+            list_of_modules = util.format.aslist(self.get('modules', []))
         return list_of_modules
 
     """Returns the global update interval

From 0067ce83f07f4463b0c391c5bf658f815910b733 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Fri, 10 Jul 2020 17:11:50 +0200
Subject: [PATCH 046/506] added new module messagereceiver

* binds to unix sockets and listens for incoming messages. The message
  will then be displayed in the status bar.
---
 .../modules/contrib/messagereceiver.py        | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/messagereceiver.py

diff --git a/bumblebee_status/modules/contrib/messagereceiver.py b/bumblebee_status/modules/contrib/messagereceiver.py
new file mode 100644
index 0000000..1f643d6
--- /dev/null
+++ b/bumblebee_status/modules/contrib/messagereceiver.py
@@ -0,0 +1,85 @@
+# pylint: disable=C0111,R0903
+
+"""
+Displays the message that's received via unix socket.
+
+Parameteres:
+    * messagereceiver   : Unix socket address (e.g: /tmp/bumblebee_messagereceiver.sock)
+"""
+
+import core.module
+import core.widget
+import core.input
+
+import socket
+import threading
+import logging
+import os
+import queue
+import json
+
+
+class Worker(threading.Thread):
+    def __init__(self, unix_socket_address, queue):
+        threading.Thread.__init__(self)
+        self.__unix_socket_address = unix_socket_address
+        self.__queue = queue
+
+    def run(self):
+        while True:
+            try:
+                os.unlink(self.__unix_socket_address)
+            except OSError as e:
+                if os.path.exists(self.__unix_socket_address):
+                    logging.exception(
+                        "Couldn't bind to unix socket %s" % self.__unix_socket_address
+                    )
+                    raise
+
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s:
+                s.bind(self.__unix_socket_address)
+                s.listen()
+
+                conn, _ = s.accept()
+                with conn:
+                    while True:
+                        data = conn.recv(1024)
+                        if not data:
+                            break
+                        self.__queue.put(data.decode("utf-8"))
+
+
+class Module(core.module.Module):
+    @core.decorators.every(seconds=1)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.message))
+
+        self.__unix_socket_address = self.parameter("address", "")
+
+        self.__message = ""
+        self.__state = []
+
+        self.__queue = queue.Queue()
+        self.__worker = Worker(self.__unix_socket_address, self.__queue)
+        self.__worker.daemon = True
+        self.__worker.start()
+
+    def message(self, widget):
+        return self.__message
+
+    def update(self):
+        try:
+            received_data = self.__queue.get(block=False)
+            parsed_data = json.loads(received_data)
+            self.__message = parsed_data["message"]
+            self.__state = parsed_data["state"]
+        except json.JSONDecodeError as e:
+            logging.exception("Couldn't parse message")
+        except queue.Empty as e:
+            pass
+
+    def state(self, widget):
+        return self.__state
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From adbba9bf9a06461c9182e77f383a41a5d036203c Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Fri, 10 Jul 2020 17:17:16 +0200
Subject: [PATCH 047/506] fixed small bug in messagereceiver

* wrong logging syntax
---
 bumblebee_status/modules/contrib/messagereceiver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/messagereceiver.py b/bumblebee_status/modules/contrib/messagereceiver.py
index 1f643d6..a202b0b 100644
--- a/bumblebee_status/modules/contrib/messagereceiver.py
+++ b/bumblebee_status/modules/contrib/messagereceiver.py
@@ -32,7 +32,7 @@ class Worker(threading.Thread):
             except OSError as e:
                 if os.path.exists(self.__unix_socket_address):
                     logging.exception(
-                        "Couldn't bind to unix socket %s" % self.__unix_socket_address
+                        "Couldn't bind to unix socket %s", self.__unix_socket_address
                     )
                     raise
 

From 01cde70e14b9a873a2a02f44242328843e598075 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Fri, 10 Jul 2020 17:35:40 +0200
Subject: [PATCH 048/506] improved documentation of messagereceiver module

---
 bumblebee_status/modules/contrib/messagereceiver.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bumblebee_status/modules/contrib/messagereceiver.py b/bumblebee_status/modules/contrib/messagereceiver.py
index a202b0b..1fb8ca2 100644
--- a/bumblebee_status/modules/contrib/messagereceiver.py
+++ b/bumblebee_status/modules/contrib/messagereceiver.py
@@ -5,6 +5,17 @@ Displays the message that's received via unix socket.
 
 Parameteres:
     * messagereceiver   : Unix socket address (e.g: /tmp/bumblebee_messagereceiver.sock)
+
+Example:
+    The following examples assume that /tmp/bumblebee_messagereceiver.sock is used as unix socket address.
+    
+    In order to send the string "I  bumblebee-status" to your status bar, use the following command: 
+        echo -e '{"message":"I  bumblebee-status", "state": ""}' | socat unix-connect:/tmp/bumblebee_messagereceiver.sock STDIO
+
+    In order to highlight the text, the state variable can be used: 
+        echo -e '{"message":"I  bumblebee-status", "state": "warning"}' | socat unix-connect:/tmp/bumblebee_messagereceiver.sock STDIO
+
+
 """
 
 import core.module

From 2b888325a637bbc49bc941a3e8561ac351b25b4a Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 10 Jul 2020 20:19:43 +0200
Subject: [PATCH 049/506] [doc] add messagereceiver (+ attribution)

---
 .../modules/contrib/messagereceiver.py        |  2 +-
 docs/modules.rst                              | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/messagereceiver.py b/bumblebee_status/modules/contrib/messagereceiver.py
index 1fb8ca2..9f00c8c 100644
--- a/bumblebee_status/modules/contrib/messagereceiver.py
+++ b/bumblebee_status/modules/contrib/messagereceiver.py
@@ -15,7 +15,7 @@ Example:
     In order to highlight the text, the state variable can be used: 
         echo -e '{"message":"I  bumblebee-status", "state": "warning"}' | socat unix-connect:/tmp/bumblebee_messagereceiver.sock STDIO
 
-
+contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 """
 
 import core.module
diff --git a/docs/modules.rst b/docs/modules.rst
index 984abb9..1337cd2 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -760,6 +760,25 @@ Required the following python packages:
 
 contributed by `maxpivo <https://github.com/maxpivo>`_ - many thanks!
 
+messagereceiver
+~~~~~~~~~~~~~~~
+
+Displays the message that's received via unix socket.
+
+Parameteres:
+    * messagereceiver   : Unix socket address (e.g: /tmp/bumblebee_messagereceiver.sock)
+
+Example:
+    The following examples assume that /tmp/bumblebee_messagereceiver.sock is used as unix socket address.
+    
+    In order to send the string "I  bumblebee-status" to your status bar, use the following command: 
+        echo -e '{"message":"I  bumblebee-status", "state": ""}' | socat unix-connect:/tmp/bumblebee_messagereceiver.sock STDIO
+
+    In order to highlight the text, the state variable can be used: 
+        echo -e '{"message":"I  bumblebee-status", "state": "warning"}' | socat unix-connect:/tmp/bumblebee_messagereceiver.sock STDIO
+
+contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
+
 mocp
 ~~~~
 
@@ -1148,6 +1167,8 @@ contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 
 added controls by `LtPeriwinkle <https://github.com/LtPeriwinkle>`_ - many thanks!
 
+fixed icons and layout parameter by `gkeep <https://github.com/gkeep>`_ - many thanks!
+
 .. image:: ../screenshots/spotify.png
 
 stock

From a4a622252b08565265e8f0715d6a46ddbcc85bc0 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Sat, 11 Jul 2020 18:07:57 +0200
Subject: [PATCH 050/506] reworked messagereceiver module

* use bumblebee's internal threading capabilities
* various small code improvements (pylint)
---
 .../modules/contrib/messagereceiver.py        | 69 ++++++++-----------
 1 file changed, 29 insertions(+), 40 deletions(-)

diff --git a/bumblebee_status/modules/contrib/messagereceiver.py b/bumblebee_status/modules/contrib/messagereceiver.py
index 1fb8ca2..869ec82 100644
--- a/bumblebee_status/modules/contrib/messagereceiver.py
+++ b/bumblebee_status/modules/contrib/messagereceiver.py
@@ -18,29 +18,36 @@ Example:
 
 """
 
+import socket
+import logging
+import os
+import json
+
 import core.module
 import core.widget
 import core.input
 
-import socket
-import threading
-import logging
-import os
-import queue
-import json
 
+class Module(core.module.Module):
+    @core.decorators.never
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.message))
 
-class Worker(threading.Thread):
-    def __init__(self, unix_socket_address, queue):
-        threading.Thread.__init__(self)
-        self.__unix_socket_address = unix_socket_address
-        self.__queue = queue
+        self.background = True
 
-    def run(self):
+        self.__unix_socket_address = self.parameter("address", "")
+
+        self.__message = ""
+        self.__state = []
+
+    def message(self, widget):
+        return self.__message
+
+    def __read_data_from_socket(self):
         while True:
             try:
                 os.unlink(self.__unix_socket_address)
-            except OSError as e:
+            except OSError:
                 if os.path.exists(self.__unix_socket_address):
                     logging.exception(
                         "Couldn't bind to unix socket %s", self.__unix_socket_address
@@ -57,37 +64,19 @@ class Worker(threading.Thread):
                         data = conn.recv(1024)
                         if not data:
                             break
-                        self.__queue.put(data.decode("utf-8"))
-
-
-class Module(core.module.Module):
-    @core.decorators.every(seconds=1)
-    def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.message))
-
-        self.__unix_socket_address = self.parameter("address", "")
-
-        self.__message = ""
-        self.__state = []
-
-        self.__queue = queue.Queue()
-        self.__worker = Worker(self.__unix_socket_address, self.__queue)
-        self.__worker.daemon = True
-        self.__worker.start()
-
-    def message(self, widget):
-        return self.__message
+                        yield data.decode("utf-8")
 
     def update(self):
         try:
-            received_data = self.__queue.get(block=False)
-            parsed_data = json.loads(received_data)
-            self.__message = parsed_data["message"]
-            self.__state = parsed_data["state"]
-        except json.JSONDecodeError as e:
+            for received_data in self.__read_data_from_socket():
+                parsed_data = json.loads(received_data)
+                self.__message = parsed_data["message"]
+                self.__state = parsed_data["state"]
+                core.event.trigger("update", [self.id], redraw_only=True)
+        except json.JSONDecodeError:
             logging.exception("Couldn't parse message")
-        except queue.Empty as e:
-            pass
+        except Exception:
+            logging.exception("Unexpected exception while reading from socket")
 
     def state(self, widget):
         return self.__state

From 0785202860630dfc121bcd0fc24b86dd77ac841c Mon Sep 17 00:00:00 2001
From: Andrew Reisner <areisne2@illinois.edu>
Date: Sun, 12 Jul 2020 10:52:05 -0600
Subject: [PATCH 051/506] Add simple portage status module.

This adds a simple module to display the status of Gentoo portage
operations by reading its logfile.
---
 .../modules/contrib/portage_status.py         | 64 +++++++++++++++++++
 themes/icons/awesome-fonts.json               |  4 ++
 2 files changed, 68 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/portage_status.py

diff --git a/bumblebee_status/modules/contrib/portage_status.py b/bumblebee_status/modules/contrib/portage_status.py
new file mode 100644
index 0000000..507eda3
--- /dev/null
+++ b/bumblebee_status/modules/contrib/portage_status.py
@@ -0,0 +1,64 @@
+"""Displays the status of Gentoo portage operations.
+
+Parameters:
+    * portage_status.logfile: logfile for portage (default is /var/log/emerge.log)
+"""
+
+import os
+
+import core.module
+import core.widget
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.output))
+        self.__logfile = self.parameter(
+            "logfile", "/var/log/emerge.log")
+        self.clear()
+
+
+    def clear(self):
+        self.__action = ""
+        self.__package = ""
+        self.__status = ""
+
+
+    def output(self, widget):
+        return " ".join([atom for atom in
+                         (self.__action, self.__package, self.__status) if atom != ""])
+
+
+    def state(self, widgets):
+        if self.__action == "":
+            return "idle"
+        return "active"
+
+
+    def update(self):
+        try:
+            with open(self.__logfile, "rb") as f:
+                f.seek(-2, os.SEEK_END)
+                while f.read(1) != b"\n":
+                    f.seek(-2, os.SEEK_CUR)
+                last_line = f.readline().decode()
+                if "===" in last_line:
+                    if "Unmerging..." in last_line:
+                        self.__action = "Unmerging"
+                        package_beg = last_line.find("(") + 1
+                        package_end = last_line.find("-", last_line.find("/")) - 1
+                        self.__package = last_line[package_beg:package_end+1]
+                    else: # merging
+                        status_beg = last_line.find("(")
+                        status_end = last_line.find(")")
+                        self.__status = last_line[status_beg:status_end+1]
+                        package_beg = last_line.find('(', status_end) + 1
+                        package_end = package_beg + last_line[package_beg:].find("-", last_line[package_beg:].find("/")) - 1
+                        self.__package = last_line[package_beg:package_end+1]
+                        action_beg = status_end + 2
+                        action_end = package_beg - 3
+                        self.__action = last_line[action_beg:action_end+1]
+                else:
+                    self.clear()
+        except Exception:
+            self.clear()
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index d0ac2bc..ca8d38f 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -35,6 +35,10 @@
     "empty": { "prefix": "\uf0e0" },
     "items": { "prefix": "\uf0e0" }
   },
+  "portage_status": {
+    "idle": { "prefix": "" },
+    "active": { "prefix": "" }
+  },
   "todo": {
     "empty": { "prefix": "" },
     "items": { "prefix": "" },

From b1bb0fe69064bb9ed741975120bc16d46edba11a Mon Sep 17 00:00:00 2001
From: Andrew Reisner <areisne2@illinois.edu>
Date: Sun, 12 Jul 2020 11:01:00 -0600
Subject: [PATCH 052/506] Run formatter.

---
 .../modules/contrib/portage_status.py         | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/bumblebee_status/modules/contrib/portage_status.py b/bumblebee_status/modules/contrib/portage_status.py
index 507eda3..7b8c897 100644
--- a/bumblebee_status/modules/contrib/portage_status.py
+++ b/bumblebee_status/modules/contrib/portage_status.py
@@ -13,28 +13,28 @@ import core.widget
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.output))
-        self.__logfile = self.parameter(
-            "logfile", "/var/log/emerge.log")
+        self.__logfile = self.parameter("logfile", "/var/log/emerge.log")
         self.clear()
 
-
     def clear(self):
         self.__action = ""
         self.__package = ""
         self.__status = ""
 
-
     def output(self, widget):
-        return " ".join([atom for atom in
-                         (self.__action, self.__package, self.__status) if atom != ""])
-
+        return " ".join(
+            [
+                atom
+                for atom in (self.__action, self.__package, self.__status)
+                if atom != ""
+            ]
+        )
 
     def state(self, widgets):
         if self.__action == "":
             return "idle"
         return "active"
 
-
     def update(self):
         try:
             with open(self.__logfile, "rb") as f:
@@ -47,17 +47,23 @@ class Module(core.module.Module):
                         self.__action = "Unmerging"
                         package_beg = last_line.find("(") + 1
                         package_end = last_line.find("-", last_line.find("/")) - 1
-                        self.__package = last_line[package_beg:package_end+1]
-                    else: # merging
+                        self.__package = last_line[package_beg : package_end + 1]
+                    else:  # merging
                         status_beg = last_line.find("(")
                         status_end = last_line.find(")")
-                        self.__status = last_line[status_beg:status_end+1]
-                        package_beg = last_line.find('(', status_end) + 1
-                        package_end = package_beg + last_line[package_beg:].find("-", last_line[package_beg:].find("/")) - 1
-                        self.__package = last_line[package_beg:package_end+1]
+                        self.__status = last_line[status_beg : status_end + 1]
+                        package_beg = last_line.find("(", status_end) + 1
+                        package_end = (
+                            package_beg
+                            + last_line[package_beg:].find(
+                                "-", last_line[package_beg:].find("/")
+                            )
+                            - 1
+                        )
+                        self.__package = last_line[package_beg : package_end + 1]
                         action_beg = status_end + 2
                         action_end = package_beg - 3
-                        self.__action = last_line[action_beg:action_end+1]
+                        self.__action = last_line[action_beg : action_end + 1]
                 else:
                     self.clear()
         except Exception:

From 83a4be3bc0ce269a8560200aa76cc963763831ed Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 12 Jul 2020 19:31:28 +0200
Subject: [PATCH 053/506] [doc] add module portage_status (plus attribution)

---
 bumblebee_status/modules/contrib/portage_status.py |  2 ++
 docs/modules.rst                                   | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/bumblebee_status/modules/contrib/portage_status.py b/bumblebee_status/modules/contrib/portage_status.py
index 7b8c897..ab2a32e 100644
--- a/bumblebee_status/modules/contrib/portage_status.py
+++ b/bumblebee_status/modules/contrib/portage_status.py
@@ -2,6 +2,8 @@
 
 Parameters:
     * portage_status.logfile: logfile for portage (default is /var/log/emerge.log)
+
+contributed by `andrewreisner <https://github.com/andrewreisner>`_ - many thanks!
 """
 
 import os
diff --git a/docs/modules.rst b/docs/modules.rst
index 1337cd2..a258899 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -967,6 +967,16 @@ Parameters:
 
 contributed by `martindoublem <https://github.com/martindoublem>`_, inspired by `karthink <https://github.com/karthink>`_ - many thanks!
 
+portage_status
+~~~~~~~~~~~~~~
+
+Displays the status of Gentoo portage operations.
+
+Parameters:
+    * portage_status.logfile: logfile for portage (default is /var/log/emerge.log)
+
+contributed by `andrewreisner <https://github.com/andrewreisner>`_ - many thanks!
+
 prime
 ~~~~~
 

From df29627983fc6c8ce90c42afd59d3dbf4ef3c867 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 18 Jul 2020 08:14:23 +0200
Subject: [PATCH 054/506] [core/doc] add autogenerated warning to modules.rst

---
 bumblebee_status/core/config.py | 5 +++++
 docs/modules.rst                | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index 94a92e5..c84d10c 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -71,6 +71,11 @@ class print_usage(argparse.Action):
         )
 
         rst = {}
+
+        if self._format == "rst":
+            print(".. THIS DOCUMENT IS AUTO-GENERATED, DO NOT MODIFY")
+            print(".. To change this document, please update the docstrings in the individual modules")
+
         for m in all_modules():
             try:
                 module_type = "core"
diff --git a/docs/modules.rst b/docs/modules.rst
index a258899..048eeeb 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1,3 +1,5 @@
+.. THIS DOCUMENT IS AUTO-GENERATED, DO NOT MODIFY
+.. To change this document, please update the docstrings in the individual modules
 List of modules
 ===============
 

From 72966ee37dae3ca5f2884de054e76f79e79d6106 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 18 Jul 2020 08:16:57 +0200
Subject: [PATCH 055/506] [modules/{cpu,load,memory}] Add gnome-system-monitor
 dependency to doc

---
 bumblebee_status/modules/contrib/stock.py | 2 +-
 bumblebee_status/modules/core/cpu.py      | 3 +++
 bumblebee_status/modules/core/load.py     | 5 +++++
 bumblebee_status/modules/core/memory.py   | 5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/stock.py b/bumblebee_status/modules/contrib/stock.py
index 7c13488..c8bfb5e 100644
--- a/bumblebee_status/modules/contrib/stock.py
+++ b/bumblebee_status/modules/contrib/stock.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # pylint: disable=C0111,R0903
 
-"""Display a stock quote from worldtradingdata.com
+"""Display a stock quote from finance.yahoo.com
 
 Requires the following python packages:
     * requests
diff --git a/bumblebee_status/modules/core/cpu.py b/bumblebee_status/modules/core/cpu.py
index 1e8c9db..59c6e71 100644
--- a/bumblebee_status/modules/core/cpu.py
+++ b/bumblebee_status/modules/core/cpu.py
@@ -2,8 +2,11 @@
 
 """Displays CPU utilization across all CPUs.
 
+By default, opens `gnome-system-monitor` on left mouse click.
+
 Requirements:
     * the psutil Python module for the first three items from the list above
+    * gnome-system-monitor for default mouse click action
 
 Parameters:
     * cpu.warning : Warning threshold in % of CPU usage (defaults to 70%)
diff --git a/bumblebee_status/modules/core/load.py b/bumblebee_status/modules/core/load.py
index 7ca839b..7800c88 100644
--- a/bumblebee_status/modules/core/load.py
+++ b/bumblebee_status/modules/core/load.py
@@ -2,6 +2,11 @@
 
 """Displays system load.
 
+By default, opens `gnome-system-monitor` on left mouse click.
+
+Requirements:
+    * gnome-system-monitor for default mouse click action
+
 Parameters:
     * load.warning : Warning threshold for the one-minute load average (defaults to 70% of the number of CPUs)
     * load.critical: Critical threshold for the one-minute load average (defaults to 80% of the number of CPUs)
diff --git a/bumblebee_status/modules/core/memory.py b/bumblebee_status/modules/core/memory.py
index 7ce7545..82de769 100644
--- a/bumblebee_status/modules/core/memory.py
+++ b/bumblebee_status/modules/core/memory.py
@@ -2,6 +2,11 @@
 
 """Displays available RAM, total amount of RAM and percentage available.
 
+By default, opens `gnome-system-monitor` on left mouse click.
+
+Requirements:
+    * gnome-system-monitor for default mouse click action
+
 Parameters:
     * memory.warning : Warning threshold in % of memory used (defaults to 80%)
     * memory.critical: Critical threshold in % of memory used (defaults to 90%)

From 7c8ddc9c87d837c3de2238b7021bc9f5bbca0c66 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 18 Jul 2020 08:23:28 +0200
Subject: [PATCH 056/506] [doc] update docstrings as per PR #683

---
 bumblebee_status/modules/contrib/amixer.py      | 3 +++
 bumblebee_status/modules/contrib/bluetooth.py   | 2 +-
 bumblebee_status/modules/contrib/bluetooth2.py  | 2 +-
 bumblebee_status/modules/contrib/brightness.py  | 5 +++++
 bumblebee_status/modules/contrib/datetimetz.py  | 4 ++++
 bumblebee_status/modules/contrib/github.py      | 2 ++
 bumblebee_status/modules/contrib/indicator.py   | 3 +++
 bumblebee_status/modules/contrib/octoprint.py   | 5 ++++-
 bumblebee_status/modules/contrib/prime.py       | 3 ++-
 bumblebee_status/modules/contrib/smartstatus.py | 4 ++++
 bumblebee_status/modules/contrib/sun.py         | 1 +
 bumblebee_status/modules/contrib/twmn.py        | 3 +++
 bumblebee_status/modules/contrib/zpool.py       | 3 +++
 bumblebee_status/modules/core/nic.py            | 3 +++
 bumblebee_status/modules/core/vault.py          | 3 +++
 15 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/amixer.py b/bumblebee_status/modules/contrib/amixer.py
index 4ab30f9..b0fda92 100644
--- a/bumblebee_status/modules/contrib/amixer.py
+++ b/bumblebee_status/modules/contrib/amixer.py
@@ -1,5 +1,8 @@
 """get volume level or control it
 
+Requires the following executable:
+    * amixer
+
 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%)
diff --git a/bumblebee_status/modules/contrib/bluetooth.py b/bumblebee_status/modules/contrib/bluetooth.py
index 64fcc0b..b565494 100644
--- a/bumblebee_status/modules/contrib/bluetooth.py
+++ b/bumblebee_status/modules/contrib/bluetooth.py
@@ -1,4 +1,4 @@
-"""Displays bluetooth status (Bluez). Left mouse click launches manager app,
+"""Displays bluetooth status (Bluez). Left mouse click launches manager app `blueman-manager`,
 right click toggles bluetooth. Needs dbus-send to toggle bluetooth state.
 
 Parameters:
diff --git a/bumblebee_status/modules/contrib/bluetooth2.py b/bumblebee_status/modules/contrib/bluetooth2.py
index 2bcdc32..b8fac09 100644
--- a/bumblebee_status/modules/contrib/bluetooth2.py
+++ b/bumblebee_status/modules/contrib/bluetooth2.py
@@ -1,4 +1,4 @@
-"""Displays bluetooth status. Left mouse click launches manager app,
+"""Displays bluetooth status. Left mouse click launches manager app `blueman-manager`,
 right click toggles bluetooth. Needs dbus-send to toggle bluetooth state and
 python-dbus to count the number of connections
 
diff --git a/bumblebee_status/modules/contrib/brightness.py b/bumblebee_status/modules/contrib/brightness.py
index 28b94a8..dc1691a 100644
--- a/bumblebee_status/modules/contrib/brightness.py
+++ b/bumblebee_status/modules/contrib/brightness.py
@@ -2,6 +2,11 @@
 
 """Displays the brightness of a display
 
+The following executables can be used if `use_acpi` is not enabled:
+    * brightnessctl
+    * light
+    * xbacklight
+
 Parameters:
     * brightness.step: The amount of increase/decrease on scroll in % (defaults to 2)
     * brightness.device_path: The device path (defaults to /sys/class/backlight/intel_backlight), can contain wildcards (in this case, the first matching path will be used); This is only used when brightness.use_acpi is set to true
diff --git a/bumblebee_status/modules/contrib/datetimetz.py b/bumblebee_status/modules/contrib/datetimetz.py
index e4baa4c..df4507f 100644
--- a/bumblebee_status/modules/contrib/datetimetz.py
+++ b/bumblebee_status/modules/contrib/datetimetz.py
@@ -2,6 +2,10 @@
 
 """Displays the current date and time with timezone options.
 
+Requires the following python packages:
+    * tzlocal
+    * pytz
+
 Parameters:
     * datetimetz.format   : strftime()-compatible formatting string
     * datetimetz.timezone : IANA timezone name
diff --git a/bumblebee_status/modules/contrib/github.py b/bumblebee_status/modules/contrib/github.py
index fc16df0..abcdfa5 100644
--- a/bumblebee_status/modules/contrib/github.py
+++ b/bumblebee_status/modules/contrib/github.py
@@ -5,6 +5,8 @@ Displays the unread GitHub notifications count for a GitHub user using the follo
 
     * https://developer.github.com/v3/activity/notifications/#notification-reasons
 
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
 Requires the following library:
     * requests
 
diff --git a/bumblebee_status/modules/contrib/indicator.py b/bumblebee_status/modules/contrib/indicator.py
index 6b01c41..63445f2 100644
--- a/bumblebee_status/modules/contrib/indicator.py
+++ b/bumblebee_status/modules/contrib/indicator.py
@@ -2,6 +2,9 @@
 
 """Displays the indicator status, for numlock, scrolllock and capslock 
 
+Requires the following executable:
+    * xset
+
 Parameters:
     * indicator.include: Comma-separated list of interface prefixes to include (defaults to 'numlock,capslock')
     * indicator.signalstype: If you want the signali type color to be 'critical' or 'warning' (defaults to 'warning')
diff --git a/bumblebee_status/modules/contrib/octoprint.py b/bumblebee_status/modules/contrib/octoprint.py
index ce1aa89..a324af2 100644
--- a/bumblebee_status/modules/contrib/octoprint.py
+++ b/bumblebee_status/modules/contrib/octoprint.py
@@ -1,9 +1,12 @@
 # pylint: disable=C0111,R0903
 
-"""Displays the Octorpint status and the printer's bed/tools temperature in the status bar.
+"""Displays the Octorrint status and the printer's bed/tools temperature in the status bar.
 
    Left click opens a popup which shows the bed & tools temperatures and additionally a livestream of the webcam (if enabled).
 
+Prerequisites:
+    * tk python library (usually python-tk or python3-tk, depending on your distribution)
+
 Parameters:
     * octoprint.address     : Octoprint address (e.q: http://192.168.1.3)
     * octoprint.apitoken    : Octorpint API Token (can be obtained from the Octoprint Webinterface)
diff --git a/bumblebee_status/modules/contrib/prime.py b/bumblebee_status/modules/contrib/prime.py
index 8a096cb..3fbd049 100644
--- a/bumblebee_status/modules/contrib/prime.py
+++ b/bumblebee_status/modules/contrib/prime.py
@@ -20,7 +20,8 @@ Parameters:
     * prime.nvidiastring: String to use when nvidia is selected (defaults to 'intel')
     * prime.intelstring: String to use when intel is selected (defaults to 'intel')
 
-Requires the following executable:
+Requires the following executables:
+    * sudo
     * prime-select
 
 contributed by `jeffeb3 <https://github.com/jeffeb3>`_ - many thanks!
diff --git a/bumblebee_status/modules/contrib/smartstatus.py b/bumblebee_status/modules/contrib/smartstatus.py
index 2b886e3..b5f3037 100644
--- a/bumblebee_status/modules/contrib/smartstatus.py
+++ b/bumblebee_status/modules/contrib/smartstatus.py
@@ -5,6 +5,10 @@
 
 """Displays HDD smart status of different drives or all drives
 
+Requires the following executables:
+    * sudo
+    * smartctl
+
 Parameters:
     * smartstatus.display: how to display (defaults to 'combined', other choices: 'seperate' or 'singles')
     * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
diff --git a/bumblebee_status/modules/contrib/sun.py b/bumblebee_status/modules/contrib/sun.py
index dddc10d..6b0734d 100644
--- a/bumblebee_status/modules/contrib/sun.py
+++ b/bumblebee_status/modules/contrib/sun.py
@@ -5,6 +5,7 @@
 Requires the following python packages:
     * requests
     * suntime
+    * python-dateutil
 
 Parameters:
     * cpu.lat : Latitude of your location
diff --git a/bumblebee_status/modules/contrib/twmn.py b/bumblebee_status/modules/contrib/twmn.py
index 58b2ba1..0fc46b3 100644
--- a/bumblebee_status/modules/contrib/twmn.py
+++ b/bumblebee_status/modules/contrib/twmn.py
@@ -2,6 +2,9 @@
 
 """Toggle twmn notifications.
 
+Requires the following executable:
+    * systemctl
+
 contributed by `Pseudonick47 <https://github.com/Pseudonick47>`_ - many thanks!
 """
 
diff --git a/bumblebee_status/modules/contrib/zpool.py b/bumblebee_status/modules/contrib/zpool.py
index 78cc26a..9863793 100644
--- a/bumblebee_status/modules/contrib/zpool.py
+++ b/bumblebee_status/modules/contrib/zpool.py
@@ -1,5 +1,8 @@
 """Displays info about zpools present on the system
 
+Requires the following executable:
+    * sudo (if `zpool.sudo` is explicitly set to `true`)
+
 Parameters:
    * zpool.list: Comma-separated list of zpools to display info for. If empty, info for all zpools
      is displayed. (Default: '')
diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 75bcd77..d64a14f 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -5,6 +5,9 @@
 Requires the following python module:
     * netifaces
 
+Requires the following executable:
+    * iw
+
 Parameters:
     * nic.exclude: Comma-separated list of interface prefixes to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br')
     * nic.include: Comma-separated list of interfaces to include
diff --git a/bumblebee_status/modules/core/vault.py b/bumblebee_status/modules/core/vault.py
index 0ec4257..28f37f4 100644
--- a/bumblebee_status/modules/core/vault.py
+++ b/bumblebee_status/modules/core/vault.py
@@ -4,6 +4,9 @@
 
 Many thanks to [@bbernhard](https://github.com/bbernhard) for the idea!
 
+Requires the following executable:
+    * pass (aka password-store)
+
 Parameters:
     * vault.duration: Duration until password is cleared from clipboard (defaults to 30)
     * vault.location: Location of the password store (defaults to ~/.password-store)

From 6025fcd2dafe63cf694ddc5da42f853d2e868b04 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 18 Jul 2020 08:23:44 +0200
Subject: [PATCH 057/506] [doc] update as per PR #683

---
 docs/modules.rst | 61 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index 048eeeb..09879f7 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -12,8 +12,11 @@ cpu
 
 Displays CPU utilization across all CPUs.
 
+By default, opens `gnome-system-monitor` on left mouse click.
+
 Requirements:
     * the psutil Python module for the first three items from the list above
+    * gnome-system-monitor for default mouse click action
 
 Parameters:
     * cpu.warning : Warning threshold in % of CPU usage (defaults to 70%)
@@ -99,6 +102,11 @@ load
 
 Displays system load.
 
+By default, opens `gnome-system-monitor` on left mouse click.
+
+Requirements:
+    * gnome-system-monitor for default mouse click action
+
 Parameters:
     * load.warning : Warning threshold for the one-minute load average (defaults to 70% of the number of CPUs)
     * load.critical: Critical threshold for the one-minute load average (defaults to 80% of the number of CPUs)
@@ -110,6 +118,11 @@ memory
 
 Displays available RAM, total amount of RAM and percentage available.
 
+By default, opens `gnome-system-monitor` on left mouse click.
+
+Requirements:
+    * gnome-system-monitor for default mouse click action
+
 Parameters:
     * memory.warning : Warning threshold in % of memory used (defaults to 80%)
     * memory.critical: Critical threshold in % of memory used (defaults to 90%)
@@ -126,6 +139,9 @@ Displays the name, IP address(es) and status of each available network interface
 Requires the following python module:
     * netifaces
 
+Requires the following executable:
+    * iw
+
 Parameters:
     * nic.exclude: Comma-separated list of interface prefixes to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br')
     * nic.include: Comma-separated list of interfaces to include
@@ -254,6 +270,9 @@ Copy passwords from a password store into the clipboard (currently supports only
 
 Many thanks to [@bbernhard](https://github.com/bbernhard) for the idea!
 
+Requires the following executable:
+    * pass (aka password-store)
+
 Parameters:
     * vault.duration: Duration until password is cleared from clipboard (defaults to 30)
     * vault.location: Location of the password store (defaults to ~/.password-store)
@@ -293,6 +312,9 @@ amixer
 
 get volume level or control it
 
+Requires the following executable:
+    * amixer
+
 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%)
@@ -373,7 +395,7 @@ contributed by `martindoublem <https://github.com/martindoublem>`_ - many thanks
 bluetooth
 ~~~~~~~~~
 
-Displays bluetooth status (Bluez). Left mouse click launches manager app,
+Displays bluetooth status (Bluez). Left mouse click launches manager app `blueman-manager`,
 right click toggles bluetooth. Needs dbus-send to toggle bluetooth state.
 
 Parameters:
@@ -390,7 +412,7 @@ contributed by `brunosmmm <https://github.com/brunosmmm>`_ - many thanks!
 bluetooth2
 ~~~~~~~~~~
 
-Displays bluetooth status. Left mouse click launches manager app,
+Displays bluetooth status. Left mouse click launches manager app `blueman-manager`,
 right click toggles bluetooth. Needs dbus-send to toggle bluetooth state and
 python-dbus to count the number of connections
 
@@ -404,6 +426,11 @@ brightness
 
 Displays the brightness of a display
 
+The following executables can be used if `use_acpi` is not enabled:
+    * brightnessctl
+    * light
+    * xbacklight
+
 Parameters:
     * brightness.step: The amount of increase/decrease on scroll in % (defaults to 2)
     * brightness.device_path: The device path (defaults to /sys/class/backlight/intel_backlight), can contain wildcards (in this case, the first matching path will be used); This is only used when brightness.use_acpi is set to true
@@ -518,6 +545,10 @@ datetimetz
 
 Displays the current date and time with timezone options.
 
+Requires the following python packages:
+    * tzlocal
+    * pytz
+
 Parameters:
     * datetimetz.format   : strftime()-compatible formatting string
     * datetimetz.timezone : IANA timezone name
@@ -655,6 +686,8 @@ Displays the unread GitHub notifications count for a GitHub user using the follo
 
     * https://developer.github.com/v3/activity/notifications/#notification-reasons
 
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
 Requires the following library:
     * requests
 
@@ -713,6 +746,9 @@ indicator
 
 Displays the indicator status, for numlock, scrolllock and capslock 
 
+Requires the following executable:
+    * xset
+
 Parameters:
     * indicator.include: Comma-separated list of interface prefixes to include (defaults to 'numlock,capslock')
     * indicator.signalstype: If you want the signali type color to be 'critical' or 'warning' (defaults to 'warning')
@@ -899,10 +935,13 @@ contributed by `RileyRedpath <https://github.com/RileyRedpath>`_ - many thanks!
 octoprint
 ~~~~~~~~~
 
-Displays the Octorpint status and the printer's bed/tools temperature in the status bar.
+Displays the Octorrint status and the printer's bed/tools temperature in the status bar.
 
    Left click opens a popup which shows the bed & tools temperatures and additionally a livestream of the webcam (if enabled).
 
+Prerequisites:
+    * tk python library (usually python-tk or python3-tk, depending on your distribution)
+
 Parameters:
     * octoprint.address     : Octoprint address (e.q: http://192.168.1.3)
     * octoprint.apitoken    : Octorpint API Token (can be obtained from the Octoprint Webinterface)
@@ -1002,7 +1041,8 @@ Parameters:
     * prime.nvidiastring: String to use when nvidia is selected (defaults to 'intel')
     * prime.intelstring: String to use when intel is selected (defaults to 'intel')
 
-Requires the following executable:
+Requires the following executables:
+    * sudo
     * prime-select
 
 contributed by `jeffeb3 <https://github.com/jeffeb3>`_ - many thanks!
@@ -1129,6 +1169,10 @@ smartstatus
 
 Displays HDD smart status of different drives or all drives
 
+Requires the following executables:
+    * sudo
+    * smartctl
+
 Parameters:
     * smartstatus.display: how to display (defaults to 'combined', other choices: 'seperate' or 'singles')
     * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
@@ -1186,7 +1230,7 @@ fixed icons and layout parameter by `gkeep <https://github.com/gkeep>`_ - many t
 stock
 ~~~~~
 
-Display a stock quote from worldtradingdata.com
+Display a stock quote from finance.yahoo.com
 
 Requires the following python packages:
     * requests
@@ -1208,6 +1252,7 @@ Displays sunrise and sunset times
 Requires the following python packages:
     * requests
     * suntime
+    * python-dateutil
 
 Parameters:
     * cpu.lat : Latitude of your location
@@ -1322,6 +1367,9 @@ twmn
 
 Toggle twmn notifications.
 
+Requires the following executable:
+    * systemctl
+
 contributed by `Pseudonick47 <https://github.com/Pseudonick47>`_ - many thanks!
 
 uptime
@@ -1409,6 +1457,9 @@ zpool
 
 Displays info about zpools present on the system
 
+Requires the following executable:
+    * sudo (if `zpool.sudo` is explicitly set to `true`)
+
 Parameters:
    * zpool.list: Comma-separated list of zpools to display info for. If empty, info for all zpools
      is displayed. (Default: '')

From dc70527797a84c568559c5ef4759a19f975fe9bc Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 20 Jul 2020 13:16:37 +0200
Subject: [PATCH 058/506] [util] add a script to generate basic autotests

Add a small utility that can generate a basic "import this unless you
are missing dependencies" test for all modules.
---
 generate-base-tests.py | 82 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100755 generate-base-tests.py

diff --git a/generate-base-tests.py b/generate-base-tests.py
new file mode 100755
index 0000000..2c08165
--- /dev/null
+++ b/generate-base-tests.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+
+import os
+import re
+import sys
+import glob
+
+def is_psl(module):
+    lib_path = os.path.dirname(os.__file__)
+    old_sys = sys.path
+    sys.path = [lib_path]
+    is_psl = True
+    try:
+        __import__(module)
+    except Exception as e:
+        is_psl = False
+    sys.path = old_sys
+
+    return is_psl
+
+
+def is_internal(module):
+    if module.startswith("core.") or module == "core": return True
+    if module.startswith("util.") or module == "util": return True
+    if module.startswith("."): return True
+
+    return is_psl(module)
+
+def dependencies(filename):
+    deps = []
+    with open(filename) as f:
+        for line in f:
+            if "import" in line:
+                match = re.match("\s*(from (\S+) )?import (\S+)", line)
+                if not match: continue
+                dep = match.group(2) or match.group(3)
+                if "util.popup" in dep or ("util" in line and "popup" in line):
+                    deps.append("tkinter")
+                elif not is_internal(dep):
+                    deps.append(dep)
+    return deps
+
+def write_test(testname, modname, deps):
+    if not os.path.exists(testname):
+        with open(testname, "w") as f:
+            f.writelines([
+                "import pytest\n\n",
+                "import core.module\n\n",
+            ])
+            for dep in deps:
+                f.write("pytest.importorskip(\"{}\")\n\n".format(dep))
+
+    with open(testname) as f:
+        for line in f:
+            if "def test_load_module(" in line:
+                print("skipping {}, already contains test".format(modname))
+                return
+
+    print("writing base test for {}".format(modname))
+    with open(testname, "a+") as f:
+        f.writelines([
+            "def test_load_module():\n",
+            "    core.module.load(\"{}\")\n\n".format(modname),
+        ])
+
+def main():
+    for f in glob.glob("bumblebee_status/modules/*/*.py"):
+        if os.path.basename(f) == "__init__.py": continue
+
+        modname = os.path.splitext(os.path.basename(f))[0]
+
+        modpath = os.path.dirname(f)
+        deps = dependencies(f)
+        testname = os.path.join("tests", "modules", modpath.split(os.sep)[2], "test_{}.py".format(modname))
+
+        write_test(testname, modname, deps)
+        
+
+if __name__ == "__main__":
+    main()
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 9be1331e1bdd570be822de282447dd1349edf72e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 20 Jul 2020 13:17:35 +0200
Subject: [PATCH 059/506] [tests] add placeholder for core tests

---
 tests/modules/core/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/modules/core/__init__.py

diff --git a/tests/modules/core/__init__.py b/tests/modules/core/__init__.py
new file mode 100644
index 0000000..e69de29

From 548ccc5e94f94b404cfddba2febb482096a3d7d1 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 20 Jul 2020 13:56:18 +0200
Subject: [PATCH 060/506] [tests] add somewhat experimental import-time tests

add auto-generated tests that check that a given module can be imported,
if all prerequisites are followed.

see #641
---
 generate-base-tests.py                         |  6 ++++--
 tests/modules/contrib/test_amixer.py           |  5 +++++
 tests/modules/contrib/test_apt.py              |  5 +++++
 tests/modules/contrib/test_arandr.py           |  7 +++++++
 tests/modules/contrib/test_arch-update.py      |  5 +++++
 tests/modules/contrib/test_battery-upower.py   |  7 +++++++
 tests/modules/contrib/test_battery.py          |  7 +++++++
 tests/modules/contrib/test_bluetooth.py        |  7 +++++++
 tests/modules/contrib/test_bluetooth2.py       | 11 +++++++++++
 tests/modules/contrib/test_brightness.py       |  5 +++++
 tests/modules/contrib/test_caffeine.py         |  7 +++++++
 tests/modules/contrib/test_cmus.py             |  5 +++++
 tests/modules/contrib/test_cpu2.py             |  7 +++++++
 tests/modules/contrib/test_currency.py         |  9 +++++++++
 tests/modules/contrib/test_datetimetz.py       | 11 +++++++++++
 tests/modules/contrib/test_datetz.py           | 11 +++++++++++
 tests/modules/contrib/test_deadbeef.py         |  7 +++++++
 tests/modules/contrib/test_deezer.py           |  7 +++++++
 tests/modules/contrib/test_dnf.py              |  5 +++++
 tests/modules/contrib/test_docker_ps.py        |  9 +++++++++
 tests/modules/contrib/test_dunst.py            |  5 +++++
 tests/modules/contrib/test_getcrypto.py        |  9 +++++++++
 tests/modules/contrib/test_github.py           |  7 +++++++
 tests/modules/contrib/test_gpmdp.py            |  5 +++++
 tests/modules/contrib/test_hddtemp.py          |  7 +++++++
 tests/modules/contrib/test_hostname.py         |  5 +++++
 tests/modules/contrib/test_http_status.py      |  9 +++++++++
 tests/modules/contrib/test_indicator.py        |  5 +++++
 tests/modules/contrib/test_kernel.py           |  4 ++++
 tests/modules/contrib/test_layout-xkbswitch.py |  5 +++++
 tests/modules/contrib/test_layout.py           |  5 +++++
 tests/modules/contrib/test_libvirtvms.py       |  7 +++++++
 tests/modules/contrib/test_messagereceiver.py  |  7 +++++++
 tests/modules/contrib/test_mocp.py             |  5 +++++
 tests/modules/contrib/test_mpd.py              |  5 +++++
 tests/modules/contrib/test_network_traffic.py  |  9 +++++++++
 tests/modules/contrib/test_notmuch_count.py    |  5 +++++
 tests/modules/contrib/test_nvidiagpu.py        |  5 +++++
 tests/modules/contrib/test_octoprint.py        | 13 +++++++++++++
 tests/modules/contrib/test_pacman.py           |  7 +++++++
 tests/modules/contrib/test_pihole.py           |  7 +++++++
 tests/modules/contrib/test_playerctl.py        |  5 +++++
 tests/modules/contrib/test_pomodoro.py         |  9 +++++++++
 tests/modules/contrib/test_portage_status.py   |  5 +++++
 tests/modules/contrib/test_prime.py            |  5 +++++
 tests/modules/contrib/test_progress.py         |  5 +++++
 tests/modules/contrib/test_publicip.py         |  5 +++++
 tests/modules/contrib/test_rotation.py         |  5 +++++
 tests/modules/contrib/test_rss.py              | 13 +++++++++++++
 tests/modules/contrib/test_sensors.py          |  5 +++++
 tests/modules/contrib/test_shell.py            |  7 +++++++
 tests/modules/contrib/test_shortcut.py         |  5 +++++
 tests/modules/contrib/test_smartstatus.py      |  5 +++++
 tests/modules/contrib/test_spaceapi.py         |  7 +++++++
 tests/modules/contrib/test_spotify.py          |  7 +++++++
 tests/modules/contrib/test_stock.py            |  7 +++++++
 tests/modules/contrib/test_sun.py              | 13 +++++++++++++
 tests/modules/contrib/test_system.py           | 11 +++++++++++
 tests/modules/contrib/test_taskwarrior.py      |  7 +++++++
 tests/modules/contrib/test_timetz.py           | 11 +++++++++++
 tests/modules/contrib/test_title.py            |  7 +++++++
 tests/modules/contrib/test_todo.py             |  5 +++++
 tests/modules/contrib/test_traffic.py          |  9 +++++++++
 tests/modules/contrib/test_twmn.py             |  5 +++++
 tests/modules/contrib/test_uptime.py           |  7 +++++++
 tests/modules/contrib/test_vpn.py              |  7 +++++++
 tests/modules/contrib/test_watson.py           |  5 +++++
 tests/modules/contrib/test_weather.py          |  9 +++++++++
 tests/modules/contrib/test_xkcd.py             |  5 +++++
 tests/modules/contrib/test_yubikey.py          |  7 +++++++
 tests/modules/contrib/test_zpool.py            |  7 +++++++
 tests/modules/core/test_cpu.py                 |  7 +++++++
 tests/modules/core/test_date.py                |  5 +++++
 tests/modules/core/test_datetime.py            |  7 +++++++
 tests/modules/core/test_debug.py               |  5 +++++
 tests/modules/core/test_disk.py                |  5 +++++
 tests/modules/core/test_error.py               |  5 +++++
 tests/modules/core/test_git.py                 |  7 +++++++
 tests/modules/core/test_layout-xkb.py          |  7 +++++++
 tests/modules/core/test_load.py                |  7 +++++++
 tests/modules/core/test_memory.py              |  5 +++++
 tests/modules/core/test_nic.py                 |  9 +++++++++
 tests/modules/core/test_pasink.py              |  5 +++++
 tests/modules/core/test_pasource.py            |  5 +++++
 tests/modules/core/test_ping.py                |  5 +++++
 tests/modules/core/test_pulseaudio.py          |  5 +++++
 tests/modules/core/test_redshift.py            |  5 +++++
 tests/modules/core/test_sensors2.py            |  5 +++++
 tests/modules/core/test_spacer.py              |  5 +++++
 tests/modules/core/test_speedtest.py           |  7 +++++++
 tests/modules/core/test_test.py                |  5 +++++
 tests/modules/core/test_time.py                |  5 +++++
 tests/modules/core/test_vault.py               |  7 +++++++
 tests/modules/core/test_xrandr.py              |  9 +++++++++
 94 files changed, 624 insertions(+), 2 deletions(-)
 create mode 100644 tests/modules/contrib/test_amixer.py
 create mode 100644 tests/modules/contrib/test_apt.py
 create mode 100644 tests/modules/contrib/test_arandr.py
 create mode 100644 tests/modules/contrib/test_arch-update.py
 create mode 100644 tests/modules/contrib/test_battery-upower.py
 create mode 100644 tests/modules/contrib/test_battery.py
 create mode 100644 tests/modules/contrib/test_bluetooth.py
 create mode 100644 tests/modules/contrib/test_bluetooth2.py
 create mode 100644 tests/modules/contrib/test_brightness.py
 create mode 100644 tests/modules/contrib/test_caffeine.py
 create mode 100644 tests/modules/contrib/test_cmus.py
 create mode 100644 tests/modules/contrib/test_cpu2.py
 create mode 100644 tests/modules/contrib/test_currency.py
 create mode 100644 tests/modules/contrib/test_datetimetz.py
 create mode 100644 tests/modules/contrib/test_datetz.py
 create mode 100644 tests/modules/contrib/test_deadbeef.py
 create mode 100644 tests/modules/contrib/test_deezer.py
 create mode 100644 tests/modules/contrib/test_dnf.py
 create mode 100644 tests/modules/contrib/test_docker_ps.py
 create mode 100644 tests/modules/contrib/test_dunst.py
 create mode 100644 tests/modules/contrib/test_getcrypto.py
 create mode 100644 tests/modules/contrib/test_github.py
 create mode 100644 tests/modules/contrib/test_gpmdp.py
 create mode 100644 tests/modules/contrib/test_hddtemp.py
 create mode 100644 tests/modules/contrib/test_hostname.py
 create mode 100644 tests/modules/contrib/test_http_status.py
 create mode 100644 tests/modules/contrib/test_indicator.py
 create mode 100644 tests/modules/contrib/test_layout-xkbswitch.py
 create mode 100644 tests/modules/contrib/test_layout.py
 create mode 100644 tests/modules/contrib/test_libvirtvms.py
 create mode 100644 tests/modules/contrib/test_messagereceiver.py
 create mode 100644 tests/modules/contrib/test_mocp.py
 create mode 100644 tests/modules/contrib/test_network_traffic.py
 create mode 100644 tests/modules/contrib/test_notmuch_count.py
 create mode 100644 tests/modules/contrib/test_nvidiagpu.py
 create mode 100644 tests/modules/contrib/test_octoprint.py
 create mode 100644 tests/modules/contrib/test_pacman.py
 create mode 100644 tests/modules/contrib/test_pihole.py
 create mode 100644 tests/modules/contrib/test_playerctl.py
 create mode 100644 tests/modules/contrib/test_pomodoro.py
 create mode 100644 tests/modules/contrib/test_portage_status.py
 create mode 100644 tests/modules/contrib/test_prime.py
 create mode 100644 tests/modules/contrib/test_progress.py
 create mode 100644 tests/modules/contrib/test_publicip.py
 create mode 100644 tests/modules/contrib/test_rotation.py
 create mode 100644 tests/modules/contrib/test_rss.py
 create mode 100644 tests/modules/contrib/test_sensors.py
 create mode 100644 tests/modules/contrib/test_shell.py
 create mode 100644 tests/modules/contrib/test_shortcut.py
 create mode 100644 tests/modules/contrib/test_smartstatus.py
 create mode 100644 tests/modules/contrib/test_spaceapi.py
 create mode 100644 tests/modules/contrib/test_spotify.py
 create mode 100644 tests/modules/contrib/test_stock.py
 create mode 100644 tests/modules/contrib/test_sun.py
 create mode 100644 tests/modules/contrib/test_system.py
 create mode 100644 tests/modules/contrib/test_taskwarrior.py
 create mode 100644 tests/modules/contrib/test_timetz.py
 create mode 100644 tests/modules/contrib/test_title.py
 create mode 100644 tests/modules/contrib/test_todo.py
 create mode 100644 tests/modules/contrib/test_traffic.py
 create mode 100644 tests/modules/contrib/test_twmn.py
 create mode 100644 tests/modules/contrib/test_uptime.py
 create mode 100644 tests/modules/contrib/test_vpn.py
 create mode 100644 tests/modules/contrib/test_watson.py
 create mode 100644 tests/modules/contrib/test_weather.py
 create mode 100644 tests/modules/contrib/test_xkcd.py
 create mode 100644 tests/modules/contrib/test_yubikey.py
 create mode 100644 tests/modules/contrib/test_zpool.py
 create mode 100644 tests/modules/core/test_cpu.py
 create mode 100644 tests/modules/core/test_date.py
 create mode 100644 tests/modules/core/test_datetime.py
 create mode 100644 tests/modules/core/test_debug.py
 create mode 100644 tests/modules/core/test_disk.py
 create mode 100644 tests/modules/core/test_error.py
 create mode 100644 tests/modules/core/test_git.py
 create mode 100644 tests/modules/core/test_layout-xkb.py
 create mode 100644 tests/modules/core/test_load.py
 create mode 100644 tests/modules/core/test_memory.py
 create mode 100644 tests/modules/core/test_nic.py
 create mode 100644 tests/modules/core/test_pasink.py
 create mode 100644 tests/modules/core/test_pasource.py
 create mode 100644 tests/modules/core/test_ping.py
 create mode 100644 tests/modules/core/test_pulseaudio.py
 create mode 100644 tests/modules/core/test_redshift.py
 create mode 100644 tests/modules/core/test_sensors2.py
 create mode 100644 tests/modules/core/test_spacer.py
 create mode 100644 tests/modules/core/test_speedtest.py
 create mode 100644 tests/modules/core/test_test.py
 create mode 100644 tests/modules/core/test_time.py
 create mode 100644 tests/modules/core/test_vault.py
 create mode 100644 tests/modules/core/test_xrandr.py

diff --git a/generate-base-tests.py b/generate-base-tests.py
index 2c08165..03efc37 100755
--- a/generate-base-tests.py
+++ b/generate-base-tests.py
@@ -36,16 +36,18 @@ def dependencies(filename):
                 dep = match.group(2) or match.group(3)
                 if "util.popup" in dep or ("util" in line and "popup" in line):
                     deps.append("tkinter")
+                if ".datetimetz" in line:
+                    deps.extend(dependencies("bumblebee_status/modules/contrib/datetimetz.py"))
                 elif not is_internal(dep):
                     deps.append(dep)
     return deps
 
 def write_test(testname, modname, deps):
+    fqmn = ".".join(["modules", testname.split(os.sep)[2], modname])
     if not os.path.exists(testname):
         with open(testname, "w") as f:
             f.writelines([
                 "import pytest\n\n",
-                "import core.module\n\n",
             ])
             for dep in deps:
                 f.write("pytest.importorskip(\"{}\")\n\n".format(dep))
@@ -60,7 +62,7 @@ def write_test(testname, modname, deps):
     with open(testname, "a+") as f:
         f.writelines([
             "def test_load_module():\n",
-            "    core.module.load(\"{}\")\n\n".format(modname),
+            "    __import__(\"{}\")\n\n".format(fqmn),
         ])
 
 def main():
diff --git a/tests/modules/contrib/test_amixer.py b/tests/modules/contrib/test_amixer.py
new file mode 100644
index 0000000..b1cfbf0
--- /dev/null
+++ b/tests/modules/contrib/test_amixer.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.amixer")
+
diff --git a/tests/modules/contrib/test_apt.py b/tests/modules/contrib/test_apt.py
new file mode 100644
index 0000000..7b151bb
--- /dev/null
+++ b/tests/modules/contrib/test_apt.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.apt")
+
diff --git a/tests/modules/contrib/test_arandr.py b/tests/modules/contrib/test_arandr.py
new file mode 100644
index 0000000..130d858
--- /dev/null
+++ b/tests/modules/contrib/test_arandr.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("tkinter")
+
+def test_load_module():
+    __import__("modules.contrib.arandr")
+
diff --git a/tests/modules/contrib/test_arch-update.py b/tests/modules/contrib/test_arch-update.py
new file mode 100644
index 0000000..6a1c172
--- /dev/null
+++ b/tests/modules/contrib/test_arch-update.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.arch-update")
+
diff --git a/tests/modules/contrib/test_battery-upower.py b/tests/modules/contrib/test_battery-upower.py
new file mode 100644
index 0000000..cb62a16
--- /dev/null
+++ b/tests/modules/contrib/test_battery-upower.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("dbus")
+
+def test_load_module():
+    __import__("modules.contrib.battery-upower")
+
diff --git a/tests/modules/contrib/test_battery.py b/tests/modules/contrib/test_battery.py
new file mode 100644
index 0000000..41c865c
--- /dev/null
+++ b/tests/modules/contrib/test_battery.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("power")
+
+def test_load_module():
+    __import__("modules.contrib.battery")
+
diff --git a/tests/modules/contrib/test_bluetooth.py b/tests/modules/contrib/test_bluetooth.py
new file mode 100644
index 0000000..b069bb1
--- /dev/null
+++ b/tests/modules/contrib/test_bluetooth.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("tkinter")
+
+def test_load_module():
+    __import__("modules.contrib.bluetooth")
+
diff --git a/tests/modules/contrib/test_bluetooth2.py b/tests/modules/contrib/test_bluetooth2.py
new file mode 100644
index 0000000..0ebcdf8
--- /dev/null
+++ b/tests/modules/contrib/test_bluetooth2.py
@@ -0,0 +1,11 @@
+import pytest
+
+pytest.importorskip("subprocess")
+
+pytest.importorskip("dbus")
+
+pytest.importorskip("dbus.mainloop.glib")
+
+def test_load_module():
+    __import__("modules.contrib.bluetooth2")
+
diff --git a/tests/modules/contrib/test_brightness.py b/tests/modules/contrib/test_brightness.py
new file mode 100644
index 0000000..023682e
--- /dev/null
+++ b/tests/modules/contrib/test_brightness.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.brightness")
+
diff --git a/tests/modules/contrib/test_caffeine.py b/tests/modules/contrib/test_caffeine.py
new file mode 100644
index 0000000..cc13ab4
--- /dev/null
+++ b/tests/modules/contrib/test_caffeine.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("psutil")
+
+def test_load_module():
+    __import__("modules.contrib.caffeine")
+
diff --git a/tests/modules/contrib/test_cmus.py b/tests/modules/contrib/test_cmus.py
new file mode 100644
index 0000000..03458b0
--- /dev/null
+++ b/tests/modules/contrib/test_cmus.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.cmus")
+
diff --git a/tests/modules/contrib/test_cpu2.py b/tests/modules/contrib/test_cpu2.py
new file mode 100644
index 0000000..bbb2756
--- /dev/null
+++ b/tests/modules/contrib/test_cpu2.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("psutil")
+
+def test_load_module():
+    __import__("modules.contrib.cpu2")
+
diff --git a/tests/modules/contrib/test_currency.py b/tests/modules/contrib/test_currency.py
new file mode 100644
index 0000000..0762ea3
--- /dev/null
+++ b/tests/modules/contrib/test_currency.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("requests")
+
+pytest.importorskip("babel.numbers")
+
+def test_load_module():
+    __import__("modules.contrib.currency")
+
diff --git a/tests/modules/contrib/test_datetimetz.py b/tests/modules/contrib/test_datetimetz.py
new file mode 100644
index 0000000..315d35b
--- /dev/null
+++ b/tests/modules/contrib/test_datetimetz.py
@@ -0,0 +1,11 @@
+import pytest
+
+pytest.importorskip("datetime")
+
+pytest.importorskip("pytz")
+
+pytest.importorskip("tzlocal")
+
+def test_load_module():
+    __import__("modules.contrib.datetimetz")
+
diff --git a/tests/modules/contrib/test_datetz.py b/tests/modules/contrib/test_datetz.py
new file mode 100644
index 0000000..ae15f67
--- /dev/null
+++ b/tests/modules/contrib/test_datetz.py
@@ -0,0 +1,11 @@
+import pytest
+
+pytest.importorskip("datetime")
+
+pytest.importorskip("pytz")
+
+pytest.importorskip("tzlocal")
+
+def test_load_module():
+    __import__("modules.contrib.datetz")
+
diff --git a/tests/modules/contrib/test_deadbeef.py b/tests/modules/contrib/test_deadbeef.py
new file mode 100644
index 0000000..5d98401
--- /dev/null
+++ b/tests/modules/contrib/test_deadbeef.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("subprocess")
+
+def test_load_module():
+    __import__("modules.contrib.deadbeef")
+
diff --git a/tests/modules/contrib/test_deezer.py b/tests/modules/contrib/test_deezer.py
new file mode 100644
index 0000000..6bb507e
--- /dev/null
+++ b/tests/modules/contrib/test_deezer.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("dbus")
+
+def test_load_module():
+    __import__("modules.contrib.deezer")
+
diff --git a/tests/modules/contrib/test_dnf.py b/tests/modules/contrib/test_dnf.py
new file mode 100644
index 0000000..858fb5b
--- /dev/null
+++ b/tests/modules/contrib/test_dnf.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.dnf")
+
diff --git a/tests/modules/contrib/test_docker_ps.py b/tests/modules/contrib/test_docker_ps.py
new file mode 100644
index 0000000..fcae290
--- /dev/null
+++ b/tests/modules/contrib/test_docker_ps.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("docker")
+
+pytest.importorskip("requests.exceptions")
+
+def test_load_module():
+    __import__("modules.contrib.docker_ps")
+
diff --git a/tests/modules/contrib/test_dunst.py b/tests/modules/contrib/test_dunst.py
new file mode 100644
index 0000000..2ca2d40
--- /dev/null
+++ b/tests/modules/contrib/test_dunst.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.dunst")
+
diff --git a/tests/modules/contrib/test_getcrypto.py b/tests/modules/contrib/test_getcrypto.py
new file mode 100644
index 0000000..07a7ada
--- /dev/null
+++ b/tests/modules/contrib/test_getcrypto.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("requests")
+
+pytest.importorskip("requests.exceptions")
+
+def test_load_module():
+    __import__("modules.contrib.getcrypto")
+
diff --git a/tests/modules/contrib/test_github.py b/tests/modules/contrib/test_github.py
new file mode 100644
index 0000000..57e19d8
--- /dev/null
+++ b/tests/modules/contrib/test_github.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("requests")
+
+def test_load_module():
+    __import__("modules.contrib.github")
+
diff --git a/tests/modules/contrib/test_gpmdp.py b/tests/modules/contrib/test_gpmdp.py
new file mode 100644
index 0000000..3ae9aa9
--- /dev/null
+++ b/tests/modules/contrib/test_gpmdp.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.gpmdp")
+
diff --git a/tests/modules/contrib/test_hddtemp.py b/tests/modules/contrib/test_hddtemp.py
new file mode 100644
index 0000000..20f2343
--- /dev/null
+++ b/tests/modules/contrib/test_hddtemp.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("socket")
+
+def test_load_module():
+    __import__("modules.contrib.hddtemp")
+
diff --git a/tests/modules/contrib/test_hostname.py b/tests/modules/contrib/test_hostname.py
new file mode 100644
index 0000000..e76adb7
--- /dev/null
+++ b/tests/modules/contrib/test_hostname.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.hostname")
+
diff --git a/tests/modules/contrib/test_http_status.py b/tests/modules/contrib/test_http_status.py
new file mode 100644
index 0000000..9d9338b
--- /dev/null
+++ b/tests/modules/contrib/test_http_status.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("requests")
+
+pytest.importorskip("psutil")
+
+def test_load_module():
+    __import__("modules.contrib.http_status")
+
diff --git a/tests/modules/contrib/test_indicator.py b/tests/modules/contrib/test_indicator.py
new file mode 100644
index 0000000..f94fc53
--- /dev/null
+++ b/tests/modules/contrib/test_indicator.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.indicator")
+
diff --git a/tests/modules/contrib/test_kernel.py b/tests/modules/contrib/test_kernel.py
index 9953132..f74021d 100644
--- a/tests/modules/contrib/test_kernel.py
+++ b/tests/modules/contrib/test_kernel.py
@@ -21,4 +21,8 @@ def test_full_text(mocker, kernel_module):
     assert some_kernel == kernel_module.widget().full_text()
 
 
+def test_load_module():
+    __import__("modules.contrib.kernel")
+
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/modules/contrib/test_layout-xkbswitch.py b/tests/modules/contrib/test_layout-xkbswitch.py
new file mode 100644
index 0000000..08cfd96
--- /dev/null
+++ b/tests/modules/contrib/test_layout-xkbswitch.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.layout-xkbswitch")
+
diff --git a/tests/modules/contrib/test_layout.py b/tests/modules/contrib/test_layout.py
new file mode 100644
index 0000000..61895ab
--- /dev/null
+++ b/tests/modules/contrib/test_layout.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.layout")
+
diff --git a/tests/modules/contrib/test_libvirtvms.py b/tests/modules/contrib/test_libvirtvms.py
new file mode 100644
index 0000000..efa5880
--- /dev/null
+++ b/tests/modules/contrib/test_libvirtvms.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("libvirt")
+
+def test_load_module():
+    __import__("modules.contrib.libvirtvms")
+
diff --git a/tests/modules/contrib/test_messagereceiver.py b/tests/modules/contrib/test_messagereceiver.py
new file mode 100644
index 0000000..a4fbcca
--- /dev/null
+++ b/tests/modules/contrib/test_messagereceiver.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("socket")
+
+def test_load_module():
+    __import__("modules.contrib.messagereceiver")
+
diff --git a/tests/modules/contrib/test_mocp.py b/tests/modules/contrib/test_mocp.py
new file mode 100644
index 0000000..8f2ffcc
--- /dev/null
+++ b/tests/modules/contrib/test_mocp.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.mocp")
+
diff --git a/tests/modules/contrib/test_mpd.py b/tests/modules/contrib/test_mpd.py
index 1fb48da..8664b43 100644
--- a/tests/modules/contrib/test_mpd.py
+++ b/tests/modules/contrib/test_mpd.py
@@ -65,3 +65,8 @@ def test_update_calls_load_song(mocker, mpd_module):
 
 def test_default_layout(mpd_module):
     assert mpd_module._layout == "mpd.prev mpd.main mpd.next mpd.shuffle mpd.repeat"
+
+
+def test_load_module():
+    __import__("modules.contrib.mpd")
+
diff --git a/tests/modules/contrib/test_network_traffic.py b/tests/modules/contrib/test_network_traffic.py
new file mode 100644
index 0000000..0dd52a9
--- /dev/null
+++ b/tests/modules/contrib/test_network_traffic.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("psutil")
+
+pytest.importorskip("netifaces")
+
+def test_load_module():
+    __import__("modules.contrib.network_traffic")
+
diff --git a/tests/modules/contrib/test_notmuch_count.py b/tests/modules/contrib/test_notmuch_count.py
new file mode 100644
index 0000000..37ca1cc
--- /dev/null
+++ b/tests/modules/contrib/test_notmuch_count.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.notmuch_count")
+
diff --git a/tests/modules/contrib/test_nvidiagpu.py b/tests/modules/contrib/test_nvidiagpu.py
new file mode 100644
index 0000000..69cdc09
--- /dev/null
+++ b/tests/modules/contrib/test_nvidiagpu.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.nvidiagpu")
+
diff --git a/tests/modules/contrib/test_octoprint.py b/tests/modules/contrib/test_octoprint.py
new file mode 100644
index 0000000..8b8264b
--- /dev/null
+++ b/tests/modules/contrib/test_octoprint.py
@@ -0,0 +1,13 @@
+import pytest
+
+pytest.importorskip("tkinter")
+
+pytest.importorskip("PIL")
+
+pytest.importorskip("requests")
+
+pytest.importorskip("simplejson")
+
+def test_load_module():
+    __import__("modules.contrib.octoprint")
+
diff --git a/tests/modules/contrib/test_pacman.py b/tests/modules/contrib/test_pacman.py
new file mode 100644
index 0000000..1bd656e
--- /dev/null
+++ b/tests/modules/contrib/test_pacman.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("bumblebee_status.discover")
+
+def test_load_module():
+    __import__("modules.contrib.pacman")
+
diff --git a/tests/modules/contrib/test_pihole.py b/tests/modules/contrib/test_pihole.py
new file mode 100644
index 0000000..6d1849d
--- /dev/null
+++ b/tests/modules/contrib/test_pihole.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("requests")
+
+def test_load_module():
+    __import__("modules.contrib.pihole")
+
diff --git a/tests/modules/contrib/test_playerctl.py b/tests/modules/contrib/test_playerctl.py
new file mode 100644
index 0000000..f5e15a6
--- /dev/null
+++ b/tests/modules/contrib/test_playerctl.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.playerctl")
+
diff --git a/tests/modules/contrib/test_pomodoro.py b/tests/modules/contrib/test_pomodoro.py
new file mode 100644
index 0000000..d8557ca
--- /dev/null
+++ b/tests/modules/contrib/test_pomodoro.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("datetime")
+
+pytest.importorskip("math")
+
+def test_load_module():
+    __import__("modules.contrib.pomodoro")
+
diff --git a/tests/modules/contrib/test_portage_status.py b/tests/modules/contrib/test_portage_status.py
new file mode 100644
index 0000000..05fdd0f
--- /dev/null
+++ b/tests/modules/contrib/test_portage_status.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.portage_status")
+
diff --git a/tests/modules/contrib/test_prime.py b/tests/modules/contrib/test_prime.py
new file mode 100644
index 0000000..8ccb0e3
--- /dev/null
+++ b/tests/modules/contrib/test_prime.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.prime")
+
diff --git a/tests/modules/contrib/test_progress.py b/tests/modules/contrib/test_progress.py
new file mode 100644
index 0000000..4d99931
--- /dev/null
+++ b/tests/modules/contrib/test_progress.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.progress")
+
diff --git a/tests/modules/contrib/test_publicip.py b/tests/modules/contrib/test_publicip.py
new file mode 100644
index 0000000..6c5a31a
--- /dev/null
+++ b/tests/modules/contrib/test_publicip.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.publicip")
+
diff --git a/tests/modules/contrib/test_rotation.py b/tests/modules/contrib/test_rotation.py
new file mode 100644
index 0000000..7495828
--- /dev/null
+++ b/tests/modules/contrib/test_rotation.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.rotation")
+
diff --git a/tests/modules/contrib/test_rss.py b/tests/modules/contrib/test_rss.py
new file mode 100644
index 0000000..3a99569
--- /dev/null
+++ b/tests/modules/contrib/test_rss.py
@@ -0,0 +1,13 @@
+import pytest
+
+pytest.importorskip("feedparser")
+
+pytest.importorskip("webbrowser")
+
+pytest.importorskip("tempfile")
+
+pytest.importorskip("random")
+
+def test_load_module():
+    __import__("modules.contrib.rss")
+
diff --git a/tests/modules/contrib/test_sensors.py b/tests/modules/contrib/test_sensors.py
new file mode 100644
index 0000000..d32a30f
--- /dev/null
+++ b/tests/modules/contrib/test_sensors.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.sensors")
+
diff --git a/tests/modules/contrib/test_shell.py b/tests/modules/contrib/test_shell.py
new file mode 100644
index 0000000..56ba0e8
--- /dev/null
+++ b/tests/modules/contrib/test_shell.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("subprocess")
+
+def test_load_module():
+    __import__("modules.contrib.shell")
+
diff --git a/tests/modules/contrib/test_shortcut.py b/tests/modules/contrib/test_shortcut.py
new file mode 100644
index 0000000..52cc474
--- /dev/null
+++ b/tests/modules/contrib/test_shortcut.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.shortcut")
+
diff --git a/tests/modules/contrib/test_smartstatus.py b/tests/modules/contrib/test_smartstatus.py
new file mode 100644
index 0000000..04a84f9
--- /dev/null
+++ b/tests/modules/contrib/test_smartstatus.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.smartstatus")
+
diff --git a/tests/modules/contrib/test_spaceapi.py b/tests/modules/contrib/test_spaceapi.py
new file mode 100644
index 0000000..bedcb1c
--- /dev/null
+++ b/tests/modules/contrib/test_spaceapi.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("requests")
+
+def test_load_module():
+    __import__("modules.contrib.spaceapi")
+
diff --git a/tests/modules/contrib/test_spotify.py b/tests/modules/contrib/test_spotify.py
new file mode 100644
index 0000000..cf6a66b
--- /dev/null
+++ b/tests/modules/contrib/test_spotify.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("dbus")
+
+def test_load_module():
+    __import__("modules.contrib.spotify")
+
diff --git a/tests/modules/contrib/test_stock.py b/tests/modules/contrib/test_stock.py
new file mode 100644
index 0000000..3c4adb1
--- /dev/null
+++ b/tests/modules/contrib/test_stock.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("urllib.request")
+
+def test_load_module():
+    __import__("modules.contrib.stock")
+
diff --git a/tests/modules/contrib/test_sun.py b/tests/modules/contrib/test_sun.py
new file mode 100644
index 0000000..3830ea6
--- /dev/null
+++ b/tests/modules/contrib/test_sun.py
@@ -0,0 +1,13 @@
+import pytest
+
+pytest.importorskip("suntime")
+
+pytest.importorskip("requests")
+
+pytest.importorskip("dateutil.tz")
+
+pytest.importorskip("datetime")
+
+def test_load_module():
+    __import__("modules.contrib.sun")
+
diff --git a/tests/modules/contrib/test_system.py b/tests/modules/contrib/test_system.py
new file mode 100644
index 0000000..6f107a0
--- /dev/null
+++ b/tests/modules/contrib/test_system.py
@@ -0,0 +1,11 @@
+import pytest
+
+pytest.importorskip("tkinter")
+
+pytest.importorskip("tkinter")
+
+pytest.importorskip("tkinter")
+
+def test_load_module():
+    __import__("modules.contrib.system")
+
diff --git a/tests/modules/contrib/test_taskwarrior.py b/tests/modules/contrib/test_taskwarrior.py
new file mode 100644
index 0000000..ab6f08f
--- /dev/null
+++ b/tests/modules/contrib/test_taskwarrior.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("taskw")
+
+def test_load_module():
+    __import__("modules.contrib.taskwarrior")
+
diff --git a/tests/modules/contrib/test_timetz.py b/tests/modules/contrib/test_timetz.py
new file mode 100644
index 0000000..01e5879
--- /dev/null
+++ b/tests/modules/contrib/test_timetz.py
@@ -0,0 +1,11 @@
+import pytest
+
+pytest.importorskip("datetime")
+
+pytest.importorskip("pytz")
+
+pytest.importorskip("tzlocal")
+
+def test_load_module():
+    __import__("modules.contrib.timetz")
+
diff --git a/tests/modules/contrib/test_title.py b/tests/modules/contrib/test_title.py
new file mode 100644
index 0000000..089102b
--- /dev/null
+++ b/tests/modules/contrib/test_title.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("i3ipc")
+
+def test_load_module():
+    __import__("modules.contrib.title")
+
diff --git a/tests/modules/contrib/test_todo.py b/tests/modules/contrib/test_todo.py
new file mode 100644
index 0000000..203b30a
--- /dev/null
+++ b/tests/modules/contrib/test_todo.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.todo")
+
diff --git a/tests/modules/contrib/test_traffic.py b/tests/modules/contrib/test_traffic.py
new file mode 100644
index 0000000..8711414
--- /dev/null
+++ b/tests/modules/contrib/test_traffic.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("psutil")
+
+pytest.importorskip("netifaces")
+
+def test_load_module():
+    __import__("modules.contrib.traffic")
+
diff --git a/tests/modules/contrib/test_twmn.py b/tests/modules/contrib/test_twmn.py
new file mode 100644
index 0000000..11e3421
--- /dev/null
+++ b/tests/modules/contrib/test_twmn.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.twmn")
+
diff --git a/tests/modules/contrib/test_uptime.py b/tests/modules/contrib/test_uptime.py
new file mode 100644
index 0000000..67c791f
--- /dev/null
+++ b/tests/modules/contrib/test_uptime.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("datetime")
+
+def test_load_module():
+    __import__("modules.contrib.uptime")
+
diff --git a/tests/modules/contrib/test_vpn.py b/tests/modules/contrib/test_vpn.py
new file mode 100644
index 0000000..ef46640
--- /dev/null
+++ b/tests/modules/contrib/test_vpn.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("tkinter")
+
+def test_load_module():
+    __import__("modules.contrib.vpn")
+
diff --git a/tests/modules/contrib/test_watson.py b/tests/modules/contrib/test_watson.py
new file mode 100644
index 0000000..6786f38
--- /dev/null
+++ b/tests/modules/contrib/test_watson.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.watson")
+
diff --git a/tests/modules/contrib/test_weather.py b/tests/modules/contrib/test_weather.py
new file mode 100644
index 0000000..ef4dc70
--- /dev/null
+++ b/tests/modules/contrib/test_weather.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("requests")
+
+pytest.importorskip("requests.exceptions")
+
+def test_load_module():
+    __import__("modules.contrib.weather")
+
diff --git a/tests/modules/contrib/test_xkcd.py b/tests/modules/contrib/test_xkcd.py
new file mode 100644
index 0000000..35e00be
--- /dev/null
+++ b/tests/modules/contrib/test_xkcd.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.contrib.xkcd")
+
diff --git a/tests/modules/contrib/test_yubikey.py b/tests/modules/contrib/test_yubikey.py
new file mode 100644
index 0000000..6b9d36a
--- /dev/null
+++ b/tests/modules/contrib/test_yubikey.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("yubico")
+
+def test_load_module():
+    __import__("modules.contrib.yubikey")
+
diff --git a/tests/modules/contrib/test_zpool.py b/tests/modules/contrib/test_zpool.py
new file mode 100644
index 0000000..5577e00
--- /dev/null
+++ b/tests/modules/contrib/test_zpool.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("pkg_resources")
+
+def test_load_module():
+    __import__("modules.contrib.zpool")
+
diff --git a/tests/modules/core/test_cpu.py b/tests/modules/core/test_cpu.py
new file mode 100644
index 0000000..9ea85ed
--- /dev/null
+++ b/tests/modules/core/test_cpu.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("psutil")
+
+def test_load_module():
+    __import__("modules.core.cpu")
+
diff --git a/tests/modules/core/test_date.py b/tests/modules/core/test_date.py
new file mode 100644
index 0000000..b87e64b
--- /dev/null
+++ b/tests/modules/core/test_date.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.date")
+
diff --git a/tests/modules/core/test_datetime.py b/tests/modules/core/test_datetime.py
new file mode 100644
index 0000000..b8384d9
--- /dev/null
+++ b/tests/modules/core/test_datetime.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("datetime")
+
+def test_load_module():
+    __import__("modules.core.datetime")
+
diff --git a/tests/modules/core/test_debug.py b/tests/modules/core/test_debug.py
new file mode 100644
index 0000000..04305b2
--- /dev/null
+++ b/tests/modules/core/test_debug.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.debug")
+
diff --git a/tests/modules/core/test_disk.py b/tests/modules/core/test_disk.py
new file mode 100644
index 0000000..791ba48
--- /dev/null
+++ b/tests/modules/core/test_disk.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.disk")
+
diff --git a/tests/modules/core/test_error.py b/tests/modules/core/test_error.py
new file mode 100644
index 0000000..296fbd7
--- /dev/null
+++ b/tests/modules/core/test_error.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.error")
+
diff --git a/tests/modules/core/test_git.py b/tests/modules/core/test_git.py
new file mode 100644
index 0000000..62f67ad
--- /dev/null
+++ b/tests/modules/core/test_git.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("pygit2")
+
+def test_load_module():
+    __import__("modules.core.git")
+
diff --git a/tests/modules/core/test_layout-xkb.py b/tests/modules/core/test_layout-xkb.py
new file mode 100644
index 0000000..8eacfad
--- /dev/null
+++ b/tests/modules/core/test_layout-xkb.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("xkbgroup")
+
+def test_load_module():
+    __import__("modules.core.layout-xkb")
+
diff --git a/tests/modules/core/test_load.py b/tests/modules/core/test_load.py
new file mode 100644
index 0000000..2210f9e
--- /dev/null
+++ b/tests/modules/core/test_load.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("multiprocessing")
+
+def test_load_module():
+    __import__("modules.core.load")
+
diff --git a/tests/modules/core/test_memory.py b/tests/modules/core/test_memory.py
new file mode 100644
index 0000000..2b87b8a
--- /dev/null
+++ b/tests/modules/core/test_memory.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.memory")
+
diff --git a/tests/modules/core/test_nic.py b/tests/modules/core/test_nic.py
new file mode 100644
index 0000000..e827eb3
--- /dev/null
+++ b/tests/modules/core/test_nic.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("netifaces")
+
+pytest.importorskip("subprocess")
+
+def test_load_module():
+    __import__("modules.core.nic")
+
diff --git a/tests/modules/core/test_pasink.py b/tests/modules/core/test_pasink.py
new file mode 100644
index 0000000..2319e63
--- /dev/null
+++ b/tests/modules/core/test_pasink.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.pasink")
+
diff --git a/tests/modules/core/test_pasource.py b/tests/modules/core/test_pasource.py
new file mode 100644
index 0000000..88ef465
--- /dev/null
+++ b/tests/modules/core/test_pasource.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.pasource")
+
diff --git a/tests/modules/core/test_ping.py b/tests/modules/core/test_ping.py
new file mode 100644
index 0000000..269321a
--- /dev/null
+++ b/tests/modules/core/test_ping.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.ping")
+
diff --git a/tests/modules/core/test_pulseaudio.py b/tests/modules/core/test_pulseaudio.py
new file mode 100644
index 0000000..66b69e3
--- /dev/null
+++ b/tests/modules/core/test_pulseaudio.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.pulseaudio")
+
diff --git a/tests/modules/core/test_redshift.py b/tests/modules/core/test_redshift.py
new file mode 100644
index 0000000..3f6f72f
--- /dev/null
+++ b/tests/modules/core/test_redshift.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.redshift")
+
diff --git a/tests/modules/core/test_sensors2.py b/tests/modules/core/test_sensors2.py
new file mode 100644
index 0000000..59bd6e4
--- /dev/null
+++ b/tests/modules/core/test_sensors2.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.sensors2")
+
diff --git a/tests/modules/core/test_spacer.py b/tests/modules/core/test_spacer.py
new file mode 100644
index 0000000..b592e22
--- /dev/null
+++ b/tests/modules/core/test_spacer.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.spacer")
+
diff --git a/tests/modules/core/test_speedtest.py b/tests/modules/core/test_speedtest.py
new file mode 100644
index 0000000..51cc775
--- /dev/null
+++ b/tests/modules/core/test_speedtest.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("speedtest")
+
+def test_load_module():
+    __import__("modules.core.speedtest")
+
diff --git a/tests/modules/core/test_test.py b/tests/modules/core/test_test.py
new file mode 100644
index 0000000..ede1244
--- /dev/null
+++ b/tests/modules/core/test_test.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.test")
+
diff --git a/tests/modules/core/test_time.py b/tests/modules/core/test_time.py
new file mode 100644
index 0000000..603a50d
--- /dev/null
+++ b/tests/modules/core/test_time.py
@@ -0,0 +1,5 @@
+import pytest
+
+def test_load_module():
+    __import__("modules.core.time")
+
diff --git a/tests/modules/core/test_vault.py b/tests/modules/core/test_vault.py
new file mode 100644
index 0000000..eed6cc0
--- /dev/null
+++ b/tests/modules/core/test_vault.py
@@ -0,0 +1,7 @@
+import pytest
+
+pytest.importorskip("tkinter")
+
+def test_load_module():
+    __import__("modules.core.vault")
+
diff --git a/tests/modules/core/test_xrandr.py b/tests/modules/core/test_xrandr.py
new file mode 100644
index 0000000..b2d7120
--- /dev/null
+++ b/tests/modules/core/test_xrandr.py
@@ -0,0 +1,9 @@
+import pytest
+
+pytest.importorskip("bumblebee_status.discover")
+
+pytest.importorskip("i3")
+
+def test_load_module():
+    __import__("modules.core.xrandr")
+

From 54a2fc3a419ac73700fc2bcd85c777508d52363d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 20 Jul 2020 13:58:46 +0200
Subject: [PATCH 061/506] [generate-tests] black

---
 generate-base-tests.py | 44 +++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/generate-base-tests.py b/generate-base-tests.py
index 03efc37..281dc45 100755
--- a/generate-base-tests.py
+++ b/generate-base-tests.py
@@ -5,6 +5,7 @@ import re
 import sys
 import glob
 
+
 def is_psl(module):
     lib_path = os.path.dirname(os.__file__)
     old_sys = sys.path
@@ -20,37 +21,45 @@ def is_psl(module):
 
 
 def is_internal(module):
-    if module.startswith("core.") or module == "core": return True
-    if module.startswith("util.") or module == "util": return True
-    if module.startswith("."): return True
+    if module.startswith("core.") or module == "core":
+        return True
+    if module.startswith("util.") or module == "util":
+        return True
+    if module.startswith("."):
+        return True
 
     return is_psl(module)
 
+
 def dependencies(filename):
     deps = []
     with open(filename) as f:
         for line in f:
             if "import" in line:
                 match = re.match("\s*(from (\S+) )?import (\S+)", line)
-                if not match: continue
+                if not match:
+                    continue
                 dep = match.group(2) or match.group(3)
                 if "util.popup" in dep or ("util" in line and "popup" in line):
                     deps.append("tkinter")
                 if ".datetimetz" in line:
-                    deps.extend(dependencies("bumblebee_status/modules/contrib/datetimetz.py"))
+                    deps.extend(
+                        dependencies("bumblebee_status/modules/contrib/datetimetz.py")
+                    )
                 elif not is_internal(dep):
                     deps.append(dep)
     return deps
 
+
 def write_test(testname, modname, deps):
     fqmn = ".".join(["modules", testname.split(os.sep)[2], modname])
     if not os.path.exists(testname):
         with open(testname, "w") as f:
-            f.writelines([
-                "import pytest\n\n",
-            ])
+            f.writelines(
+                ["import pytest\n\n",]
+            )
             for dep in deps:
-                f.write("pytest.importorskip(\"{}\")\n\n".format(dep))
+                f.write('pytest.importorskip("{}")\n\n'.format(dep))
 
     with open(testname) as f:
         for line in f:
@@ -60,23 +69,26 @@ def write_test(testname, modname, deps):
 
     print("writing base test for {}".format(modname))
     with open(testname, "a+") as f:
-        f.writelines([
-            "def test_load_module():\n",
-            "    __import__(\"{}\")\n\n".format(fqmn),
-        ])
+        f.writelines(
+            ["def test_load_module():\n", '    __import__("{}")\n\n'.format(fqmn),]
+        )
+
 
 def main():
     for f in glob.glob("bumblebee_status/modules/*/*.py"):
-        if os.path.basename(f) == "__init__.py": continue
+        if os.path.basename(f) == "__init__.py":
+            continue
 
         modname = os.path.splitext(os.path.basename(f))[0]
 
         modpath = os.path.dirname(f)
         deps = dependencies(f)
-        testname = os.path.join("tests", "modules", modpath.split(os.sep)[2], "test_{}.py".format(modname))
+        testname = os.path.join(
+            "tests", "modules", modpath.split(os.sep)[2], "test_{}.py".format(modname)
+        )
 
         write_test(testname, modname, deps)
-        
+
 
 if __name__ == "__main__":
     main()

From a008ce3e58c19096be9c93b43481b617cb9c7470 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:08:22 +0200
Subject: [PATCH 062/506] [travis] add all dependencies

to make all unit tests run, and none skipped (hopefully), add a list of
dependencies
---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b730e3e..d7d46d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,15 @@ before_install:
 install:
   - pip install -U coverage==4.3 pytest pytest-mock
   - pip install codeclimate-test-reporter
+  - pip install i3-py Pillow Babel DateTime python-dateutil
+  - pip install dbus-python docker feedparser i3ipc
+  - pip install libvirt-python math-utils
+  - pip install multiprocessing netifaces power
+  - pip install psutil pygit2 pytz random
+  - pip install requests simplejson
+  - pip install socket speedtest suntime
+  - pip install tempfile tkinter tzlocal
+  - pip install taskw webbrowser xkbgroup yubico
 script:
   - coverage run --source=. -m pytest tests -v
   - CODECLIMATE_REPO_TOKEN=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf codeclimate-test-reporter

From 463bc9665bd8e5a26d291a654c25daa0d13141ca Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:14:21 +0200
Subject: [PATCH 063/506] [travis] fix python-dbus

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d7d46d2..c996ea8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,11 @@ python:
 before_install:
   - sudo apt-get -qq update
 install:
+  - apt-get install dbus-python
   - pip install -U coverage==4.3 pytest pytest-mock
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil
-  - pip install dbus-python docker feedparser i3ipc
+  - pip install docker feedparser i3ipc
   - pip install libvirt-python math-utils
   - pip install multiprocessing netifaces power
   - pip install psutil pygit2 pytz random

From bf1cae23992fd282d60a40c5624e9dbc0d2e5715 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:15:47 +0200
Subject: [PATCH 064/506] [travis] forgot sudo

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c996ea8..3b6a516 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
 before_install:
   - sudo apt-get -qq update
 install:
-  - apt-get install dbus-python
+  - sudo apt-get install dbus-python
   - pip install -U coverage==4.3 pytest pytest-mock
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil

From 6c9e89627a35a1de85159334f92ddd6e7bb51d0f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:17:25 +0200
Subject: [PATCH 065/506] [travis] fix package name

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3b6a516..1346cd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
 before_install:
   - sudo apt-get -qq update
 install:
-  - sudo apt-get install dbus-python
+  - sudo apt-get install python-dbus
   - pip install -U coverage==4.3 pytest pytest-mock
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil

From 4fe56fc00d6ff0bebdc1443d76c1a6046ff5ed92 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:19:51 +0200
Subject: [PATCH 066/506] [travis] remove math module

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1346cd3..b6d8f42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser i3ipc
-  - pip install libvirt-python math-utils
+  - pip install libvirt-python
   - pip install multiprocessing netifaces power
   - pip install psutil pygit2 pytz random
   - pip install requests simplejson

From 550b594c864e76cf0f26aab09a4dff971bd3e4a1 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:20:55 +0200
Subject: [PATCH 067/506] [tests] fix some test prerequisites

---
 generate-base-tests.py               | 2 ++
 tests/modules/contrib/test_pacman.py | 2 --
 tests/modules/core/test_xrandr.py    | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/generate-base-tests.py b/generate-base-tests.py
index 281dc45..3f94905 100755
--- a/generate-base-tests.py
+++ b/generate-base-tests.py
@@ -25,6 +25,8 @@ def is_internal(module):
         return True
     if module.startswith("util.") or module == "util":
         return True
+    if module.startswith("bumblebee_status."):
+        return True
     if module.startswith("."):
         return True
 
diff --git a/tests/modules/contrib/test_pacman.py b/tests/modules/contrib/test_pacman.py
index 1bd656e..01db8c6 100644
--- a/tests/modules/contrib/test_pacman.py
+++ b/tests/modules/contrib/test_pacman.py
@@ -1,7 +1,5 @@
 import pytest
 
-pytest.importorskip("bumblebee_status.discover")
-
 def test_load_module():
     __import__("modules.contrib.pacman")
 
diff --git a/tests/modules/core/test_xrandr.py b/tests/modules/core/test_xrandr.py
index b2d7120..720d96a 100644
--- a/tests/modules/core/test_xrandr.py
+++ b/tests/modules/core/test_xrandr.py
@@ -1,7 +1,5 @@
 import pytest
 
-pytest.importorskip("bumblebee_status.discover")
-
 pytest.importorskip("i3")
 
 def test_load_module():

From 6c7737cdd51c564516761f5e33399b729763ca08 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:23:17 +0200
Subject: [PATCH 068/506] [travis] remove libvirt-python

requires at least python3.5
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b6d8f42..4018eb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ install:
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser i3ipc
-  - pip install libvirt-python
   - pip install multiprocessing netifaces power
   - pip install psutil pygit2 pytz random
   - pip install requests simplejson

From b7083aacce3eb8a6ed4fa5d97bd8b83446cf0f71 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:25:18 +0200
Subject: [PATCH 069/506] [travis] remove multiprocessing

doesn't install :(
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4018eb3..e763746 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser i3ipc
-  - pip install multiprocessing netifaces power
+  - pip install netifaces power
   - pip install psutil pygit2 pytz random
   - pip install requests simplejson
   - pip install socket speedtest suntime

From 84f2fdd419a0eb985fc9be46d7e4e254cfb1227e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:27:23 +0200
Subject: [PATCH 070/506] [travis] removed random

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e763746..8d731c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser i3ipc
   - pip install netifaces power
-  - pip install psutil pygit2 pytz random
+  - pip install psutil pygit2 pytz
   - pip install requests simplejson
   - pip install socket speedtest suntime
   - pip install tempfile tkinter tzlocal

From 993be61eec3669a3d4b49723a1386b7d747da153 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:43:08 +0200
Subject: [PATCH 071/506] [travis] remove pygit2

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8d731c9..27da83f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser i3ipc
   - pip install netifaces power
-  - pip install psutil pygit2 pytz
+  - pip install psutil pytz
   - pip install requests simplejson
   - pip install socket speedtest suntime
   - pip install tempfile tkinter tzlocal

From 6870c3ba84be1f438f544375ab9dec71da7c66e6 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:53:41 +0200
Subject: [PATCH 072/506] [travis] removed a couple more modules

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 27da83f..7f79b21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ install:
   - pip install netifaces power
   - pip install psutil pytz
   - pip install requests simplejson
-  - pip install socket speedtest suntime
+  - pip install speedtest suntime
   - pip install tempfile tkinter tzlocal
-  - pip install taskw webbrowser xkbgroup yubico
+  - pip install taskw webbrowser
 script:
   - coverage run --source=. -m pytest tests -v
   - CODECLIMATE_REPO_TOKEN=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf codeclimate-test-reporter

From 632eb0c4509b5624fb362c656d41c7c0dc515492 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:55:54 +0200
Subject: [PATCH 073/506] [travis] remove speedtest

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7f79b21..f78af0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ install:
   - pip install netifaces power
   - pip install psutil pytz
   - pip install requests simplejson
-  - pip install speedtest suntime
+  - pip install suntime
   - pip install tempfile tkinter tzlocal
   - pip install taskw webbrowser
 script:

From bee2586ed4b59f96a83cadc3fc312c0791a09dea Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 08:58:36 +0200
Subject: [PATCH 074/506] [travis] remove tempfile

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f78af0a..b42cb34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - pip install psutil pytz
   - pip install requests simplejson
   - pip install suntime
-  - pip install tempfile tkinter tzlocal
+  - pip install tkinter tzlocal
   - pip install taskw webbrowser
 script:
   - coverage run --source=. -m pytest tests -v

From c692a776b66077835d44b101c6f1b4e4bb47d4e0 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 09:00:59 +0200
Subject: [PATCH 075/506] [travis] remove tkinter

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b42cb34..799dc03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - pip install psutil pytz
   - pip install requests simplejson
   - pip install suntime
-  - pip install tkinter tzlocal
+  - pip install tzlocal
   - pip install taskw webbrowser
 script:
   - coverage run --source=. -m pytest tests -v

From b39dba8867312405b3d1dcadef57be99354d9b06 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 09:02:51 +0200
Subject: [PATCH 076/506] [travis] remove webbrowser

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 799dc03..59061c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ install:
   - pip install requests simplejson
   - pip install suntime
   - pip install tzlocal
-  - pip install taskw webbrowser
+  - pip install taskw
 script:
   - coverage run --source=. -m pytest tests -v
   - CODECLIMATE_REPO_TOKEN=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf codeclimate-test-reporter

From d358790c6a20e571e10d2ab359836059fff43446 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 21 Jul 2020 09:04:50 +0200
Subject: [PATCH 077/506] [travis] make unit tests work again

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 59061c6..400bd81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ install:
   - pip install requests simplejson
   - pip install suntime
   - pip install tzlocal
-  - pip install taskw
 script:
   - coverage run --source=. -m pytest tests -v
   - CODECLIMATE_REPO_TOKEN=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf codeclimate-test-reporter

From 4aff0499f02c3d2deb5ae595f8ac456094da0eea Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 08:43:26 -0700
Subject: [PATCH 078/506] [util.popup] Deduplicate code, "close" button only if
 leave=False

---
 bumblebee_status/util/popup.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/bumblebee_status/util/popup.py b/bumblebee_status/util/popup.py
index f162846..bbabe66 100644
--- a/bumblebee_status/util/popup.py
+++ b/bumblebee_status/util/popup.py
@@ -16,23 +16,19 @@ class menu(object):
 
     def __init__(self, parent=None, leave=True):
         self.running = True
-        self.parent = None
-        if not parent:
-            self._root = tk.Tk()
-            self._root.withdraw()
-            self._menu = tk.Menu(self._root, tearoff=0)
-            self._menu.bind("<FocusOut>", self.__on_focus_out)
 
-            self.add_menuitem("close", self.__on_focus_out)
-            self.add_separator()
-        else:
-            self._root = parent.root()
-            self._root.withdraw()
-            self._menu = tk.Menu(self._root, tearoff=0)
-            self._menu.bind("<FocusOut>", self.__on_focus_out)
-            self.parent = parent
+        self.parent = parent
+
+        self._root = parent.root() if parent else tk.Tk()
+        self._root.withdraw()
+        self._menu = tk.Menu(self._root, tearoff=0)
+        self._menu.bind("<FocusOut>", self.__on_focus_out)
+
         if leave:
             self._menu.bind("<Leave>", self.__on_focus_out)
+        elif not parent:
+            self.add_menuitem("close", self.__on_focus_out)
+            self.add_separator()
 
         self._menu.bind("<ButtonRelease-1>", self.release)
 

From 5f2857ad9aa3d090b6894be0b3d9a1cde96dee60 Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 08:46:57 -0700
Subject: [PATCH 079/506] [vault] add leave_menu parameter to auto-close the
 menu

---
 bumblebee_status/modules/core/vault.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/vault.py b/bumblebee_status/modules/core/vault.py
index 28f37f4..ee4fc7f 100644
--- a/bumblebee_status/modules/core/vault.py
+++ b/bumblebee_status/modules/core/vault.py
@@ -12,6 +12,8 @@ Parameters:
     * vault.location: Location of the password store (defaults to ~/.password-store)
     * vault.offx: x-axis offset of popup menu (defaults to 0)
     * vault.offy: y-axis offset of popup menu (defaults to 0)
+    * vault.leave_menu: Boolean flag to close menu when the mouse leaves (defaults to False)
+    * vault.text: Text to display on the widget (defaults to <click-for-password>)
 
 Many thanks to `bbernhard <https://github.com/bbernhard>`_ for the idea!
 """
@@ -72,7 +74,7 @@ class Module(core.module.Module):
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.popup)
 
     def popup(self, widget):
-        menu = util.popup.menu(leave=False)
+        menu = util.popup.menu(leave=util.format.asbool(self.parameter("leave_menu", False)))
 
         build_menu(menu, self.__path, self.__callback)
         menu.show(widget, offset_x=self.__offx, offset_y=self.__offy)

From 8f57bb952de03cb6e297abcbb3ba15471268d473 Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 08:47:31 -0700
Subject: [PATCH 080/506] [xrandr] add exclude parameter to ignore certain
 display prefixes

---
 bumblebee_status/modules/core/xrandr.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/xrandr.py b/bumblebee_status/modules/core/xrandr.py
index e1717e8..f088fb5 100644
--- a/bumblebee_status/modules/core/xrandr.py
+++ b/bumblebee_status/modules/core/xrandr.py
@@ -8,6 +8,7 @@ Parameters:
       and appending a file '~/.config/i3/config.<screen name>' for every screen.
     * xrandr.autoupdate: If set to 'false', does *not* invoke xrandr automatically. Instead, the
       module will only refresh when displays are enabled or disabled (defaults to true)
+    * xrandr.exclude: Comma-separated list of display name prefixes to exclude
 
 Requires the following python module:
     * (optional) i3 - if present, the need for updating the widget list is auto-detected
@@ -40,6 +41,7 @@ class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
 
+        self._exclude = tuple(filter(len, self.parameter("exclude", "").split(",")))
         self._autoupdate = util.format.asbool(self.parameter("autoupdate", True))
         self._needs_update = True
 
@@ -62,16 +64,20 @@ class Module(core.module.Module):
         for line in util.cli.execute("xrandr -q").split("\n"):
             if not " connected" in line:
                 continue
+
             display = line.split(" ", 2)[0]
-            m = re.search(r"\d+x\d+\+(\d+)\+\d+", line)
+            if display.startswith(self._exclude):
+                continue
+
+            resolution = re.search(r"\d+x\d+\+(\d+)\+\d+", line)
 
             widget = self.widget(display)
             if not widget:
                 widget = self.add_widget(full_text=display, name=display)
                 core.input.register(widget, button=1, cmd=self._toggle)
                 core.input.register(widget, button=3, cmd=self._toggle)
-            widget.set("state", "on" if m else "off")
-            widget.set("pos", int(m.group(1)) if m else sys.maxsize)
+            widget.set("state", "on" if resolution else "off")
+            widget.set("pos", int(resolution.group(1)) if resolution else sys.maxsize)
 
         if self._autoupdate == False:
             widget = self.add_widget(full_text="")

From 5874850bd5360ceb1039615cf65af02b8fa400cc Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 10:52:10 -0700
Subject: [PATCH 081/506] [xrandr] Fix neighbor functionality when some
 displays are excluded

---
 bumblebee_status/modules/core/xrandr.py | 73 +++++++++----------------
 1 file changed, 27 insertions(+), 46 deletions(-)

diff --git a/bumblebee_status/modules/core/xrandr.py b/bumblebee_status/modules/core/xrandr.py
index f088fb5..eee6be4 100644
--- a/bumblebee_status/modules/core/xrandr.py
+++ b/bumblebee_status/modules/core/xrandr.py
@@ -17,7 +17,6 @@ Requires the following executable:
     * xrandr
 """
 
-import os
 import re
 import sys
 
@@ -32,7 +31,7 @@ import util.format
 
 try:
     import i3
-except:
+except ModuleNotFoundError:
     pass
 
 
@@ -42,35 +41,40 @@ class Module(core.module.Module):
         super().__init__(config, theme, [])
 
         self._exclude = tuple(filter(len, self.parameter("exclude", "").split(",")))
+        self._active_displays = []
         self._autoupdate = util.format.asbool(self.parameter("autoupdate", True))
         self._needs_update = True
 
         try:
             i3.Subscription(self._output_update, "output")
-        except:
+        except NameError:
             pass
 
     def _output_update(self, event, data, _):
         self._needs_update = True
 
     def update(self):
-        self.clear_widgets()
-
-        if self._autoupdate == False and self._needs_update == False:
+        if not self._autoupdate and not self._needs_update:
             return
 
+        self.clear_widgets()
+        self._active_displays.clear()
+
         self._needs_update = False
 
         for line in util.cli.execute("xrandr -q").split("\n"):
-            if not " connected" in line:
+            if " connected" not in line:
                 continue
 
             display = line.split(" ", 2)[0]
+            resolution = re.search(r"\d+x\d+\+(\d+)\+\d+", line)
+
+            if resolution:
+                self._active_displays.append(display)
+
             if display.startswith(self._exclude):
                 continue
 
-            resolution = re.search(r"\d+x\d+\+(\d+)\+\d+", line)
-
             widget = self.widget(display)
             if not widget:
                 widget = self.add_widget(full_text=display, name=display)
@@ -79,7 +83,7 @@ class Module(core.module.Module):
             widget.set("state", "on" if resolution else "off")
             widget.set("pos", int(resolution.group(1)) if resolution else sys.maxsize)
 
-        if self._autoupdate == False:
+        if not self._autoupdate:
             widget = self.add_widget(full_text="")
             widget.set("state", "refresh")
             core.input.register(widget, button=1, cmd=self._refresh)
@@ -91,9 +95,7 @@ class Module(core.module.Module):
         self._needs_update = True
 
     def _toggle(self, event):
-        self._refresh(event)
-
-        if util.format.asbool(self.parameter("overwrite_i3config", False)) == True:
+        if util.format.asbool(self.parameter("overwrite_i3config", False)):
             toggle_cmd = utility("toggle-display.sh")
         else:
             toggle_cmd = "xrandr"
@@ -102,41 +104,20 @@ class Module(core.module.Module):
 
         if widget.get("state") == "on":
             util.cli.execute("{} --output {} --off".format(toggle_cmd, widget.name))
+        elif not self._active_displays:
+            util.cli.execute("{} --output {} --auto".format(toggle_cmd, widget.name))
         else:
-            first_neighbor = next(
-                (widget for widget in self.widgets() if widget.get("state") == "on"),
-                None,
-            )
-            last_neighbor = next(
-                (
-                    widget
-                    for widget in reversed(self.widgets())
-                    if widget.get("state") == "on"
-                ),
-                None,
-            )
-
-            neighbor = (
-                first_neighbor
-                if event["button"] == core.input.LEFT_MOUSE
-                else last_neighbor
-            )
-
-            if neighbor is None:
-                util.cli.execute(
-                    "{} --output {} --auto".format(toggle_cmd, widget.name)
-                )
+            if event["button"] == core.input.LEFT_MOUSE:
+                side, neighbor = "left", self._active_displays[0]
             else:
-                util.cli.execute(
-                    "{} --output {} --auto --{}-of {}".format(
-                        toggle_cmd,
-                        widget.name,
-                        "left"
-                        if event.get("button") == core.input.LEFT_MOUSE
-                        else "right",
-                        neighbor.name,
-                    )
-                )
+                side, neighbor = "right", self._active_displays[-1]
 
+            util.cli.execute(
+                "{} --output {} --auto --{}-of {}".format(
+                    toggle_cmd, widget.name, side, neighbor,
+                )
+            )
+
+        self._refresh(event)
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From b14eae4d6c3344d2d4c5cd2c243fdf315e419032 Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 10:52:57 -0700
Subject: [PATCH 082/506] [xrandr] add safeguard to prevent turning off the
 only display

---
 bumblebee_status/modules/core/xrandr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/xrandr.py b/bumblebee_status/modules/core/xrandr.py
index eee6be4..a3fe1b7 100644
--- a/bumblebee_status/modules/core/xrandr.py
+++ b/bumblebee_status/modules/core/xrandr.py
@@ -103,7 +103,8 @@ class Module(core.module.Module):
         widget = self.widget(widget_id=event["instance"])
 
         if widget.get("state") == "on":
-            util.cli.execute("{} --output {} --off".format(toggle_cmd, widget.name))
+            if len(self._active_displays) > 1:
+                util.cli.execute("{} --output {} --off".format(toggle_cmd, widget.name))
         elif not self._active_displays:
             util.cli.execute("{} --output {} --auto".format(toggle_cmd, widget.name))
         else:

From d05ff39f027a8156f6d23d821064c89f4eb64b31 Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 10:53:44 -0700
Subject: [PATCH 083/506] [xrandr] Add unit tests

---
 tests/modules/core/test_xrandr.py | 158 +++++++++++++++++++++++++++++-
 1 file changed, 154 insertions(+), 4 deletions(-)

diff --git a/tests/modules/core/test_xrandr.py b/tests/modules/core/test_xrandr.py
index 720d96a..b4e6156 100644
--- a/tests/modules/core/test_xrandr.py
+++ b/tests/modules/core/test_xrandr.py
@@ -1,7 +1,157 @@
-import pytest
+import sys
 
-pytest.importorskip("i3")
+from core.input import trigger, LEFT_MOUSE, RIGHT_MOUSE
+from core.config import Config
+from modules.core.xrandr import Module
 
-def test_load_module():
-    __import__("modules.core.xrandr")
 
+MOCK_EXECUTE = "modules.core.xrandr.util.cli.execute"
+
+
+def mock_xrandr(mocker, xrandr_output):
+    return mocker.patch(MOCK_EXECUTE, return_value=xrandr_output)
+
+
+def assert_widgets(module, *expected_widgets):
+    assert len(module.widgets()) == len(expected_widgets)
+
+    for widget, (name, state, pos) in zip(module.widgets(), expected_widgets):
+        assert widget.name == name
+        assert widget.get("state") == state
+        assert widget.get("pos") == pos
+
+
+def assert_trigger(mocker, module, widget_index, button, expected_command):
+    xrandr_cli = mock_xrandr(mocker, "")
+    widget = module.widgets()[widget_index]
+    trigger({"button": button, "instance": widget.id, "name": module.id})
+
+    if expected_command is None:
+        xrandr_cli.assert_not_called()
+    else:
+        xrandr_cli.assert_called_once_with(expected_command)
+
+
+def test_autoupdate(mocker):
+    xrandr_cli = mock_xrandr(mocker, FULL_OUTPUT_TWO_DISPLAYS)
+    module = Module(Config([]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "on", 1920))
+
+    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(mocker, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(mocker, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
+
+
+def test_display_off(mocker):
+    xrandr_cli = mock_xrandr(mocker, TRUNCATED_OUTPUT_DISPLAY_OFF)
+    module = Module(Config([]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "off", sys.maxsize))
+
+    assert_trigger(mocker, module, 0, LEFT_MOUSE, None)
+    assert_trigger(mocker, module, 0, RIGHT_MOUSE, None)
+    assert_trigger(mocker, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --auto --left-of eDP-1-1")
+    assert_trigger(mocker, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
+
+
+def test_no_autoupdate(mocker):
+    xrandr_cli = mock_xrandr(mocker, FULL_OUTPUT_TWO_DISPLAYS)
+    module = Module(Config(["-p", "xrandr.autoupdate=false"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(
+        module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "on", 1920), (None, "refresh", None)
+    )
+
+    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(mocker, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(mocker, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
+
+
+def test_exclude(mocker):
+    xrandr_cli = mock_xrandr(mocker, FULL_OUTPUT_TWO_DISPLAYS)
+    module = Module(Config(["-p", "xrandr.exclude=eDP"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("HDMI-1-1", "on", 1920))
+
+    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
+
+
+def test_exclude_off(mocker):
+    xrandr_cli = mock_xrandr(mocker, TRUNCATED_OUTPUT_DISPLAY_OFF)
+    module = Module(Config(["-p", "xrandr.exclude=eDP"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("HDMI-1-1", "off", sys.maxsize))
+
+    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output HDMI-1-1 --auto --left-of eDP-1-1")
+    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
+
+
+# xrandr sample data
+
+FULL_OUTPUT_TWO_DISPLAYS = """Screen 0: minimum 8 x 8, current 4480 x 1440, maximum 32767 x 32767
+eDP-1-1 connected primary 1920x1080+0+0 344mm x 193mm
+   1920x1080     60.00*+  59.93    48.00
+   1680x1050     59.95    59.88
+   1600x1024     60.17
+   1400x1050     59.98
+   1280x1024     60.02
+   1440x900      59.89
+   1280x960      60.00
+   1360x768      59.80    59.96
+   1152x864      60.00
+   1024x768      60.04    60.00
+   960x720       60.00
+   928x696       60.05
+   896x672       60.01
+   960x600       60.00
+   960x540       59.99
+   800x600       60.00    60.32    56.25
+   840x525       60.01    59.88
+   800x512       60.17
+   700x525       59.98
+   640x512       60.02
+   720x450       59.89
+   640x480       60.00    59.94
+   680x384       59.80    59.96
+   576x432       60.06
+   512x384       60.00
+   400x300       60.32    56.34
+   320x240       60.05
+HDMI-1-1 connected 2560x1440+1920+0 596mm x 335mm
+   2560x1440     59.95*+
+   1920x1080     60.00    50.00    59.94
+   1920x1080i    60.00    50.00    59.94
+   1680x1050     59.88
+   1600x900      60.00
+   1280x1024     60.02
+   1280x800      59.91
+   1280x720      60.00    50.00    59.94
+   1024x768      60.00
+   800x600       60.32
+   720x576       50.00
+   720x576i      50.00
+   720x480       60.00    59.94
+   720x480i      60.00    59.94
+   640x480       60.00    59.94
+"""
+
+
+TRUNCATED_OUTPUT_DISPLAY_OFF = """eDP-1-1 connected primary 1920x1080+0+0 344mm x 193mm
+   1920x1080     60.00*+  59.93    48.00
+HDMI-1-1 connected
+   2560x1440     59.95 +
+"""

From 22d85d6d1d1a4942bbb1001eba76c1ccaeb9fadc Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 11:33:42 -0700
Subject: [PATCH 084/506] [xrandr-test] Catch all exceptions if i3 Subscription
 fails

---
 bumblebee_status/modules/core/xrandr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/xrandr.py b/bumblebee_status/modules/core/xrandr.py
index a3fe1b7..7060cf1 100644
--- a/bumblebee_status/modules/core/xrandr.py
+++ b/bumblebee_status/modules/core/xrandr.py
@@ -47,7 +47,7 @@ class Module(core.module.Module):
 
         try:
             i3.Subscription(self._output_update, "output")
-        except NameError:
+        except Exception:
             pass
 
     def _output_update(self, event, data, _):
@@ -121,4 +121,5 @@ class Module(core.module.Module):
 
         self._refresh(event)
 
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 647ad44b31111391ea60ca997dfa174b484f4b67 Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 11:50:13 -0700
Subject: [PATCH 085/506] ModuleNotFoundError incompatible with python 3.4, 3.5

---
 bumblebee_status/modules/core/xrandr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/xrandr.py b/bumblebee_status/modules/core/xrandr.py
index 7060cf1..59d37f0 100644
--- a/bumblebee_status/modules/core/xrandr.py
+++ b/bumblebee_status/modules/core/xrandr.py
@@ -31,7 +31,7 @@ import util.format
 
 try:
     import i3
-except ModuleNotFoundError:
+except Exception:
     pass
 
 

From b1adc382aa6e4465cd8341cf1457d07380c2a01d Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sat, 25 Jul 2020 12:38:28 -0700
Subject: [PATCH 086/506] [vault] Turns out, <Leave> is triggered when going
 into a submenu

---
 bumblebee_status/modules/core/vault.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/core/vault.py b/bumblebee_status/modules/core/vault.py
index ee4fc7f..7f3fb75 100644
--- a/bumblebee_status/modules/core/vault.py
+++ b/bumblebee_status/modules/core/vault.py
@@ -12,7 +12,6 @@ Parameters:
     * vault.location: Location of the password store (defaults to ~/.password-store)
     * vault.offx: x-axis offset of popup menu (defaults to 0)
     * vault.offy: y-axis offset of popup menu (defaults to 0)
-    * vault.leave_menu: Boolean flag to close menu when the mouse leaves (defaults to False)
     * vault.text: Text to display on the widget (defaults to <click-for-password>)
 
 Many thanks to `bbernhard <https://github.com/bbernhard>`_ for the idea!
@@ -74,7 +73,7 @@ class Module(core.module.Module):
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.popup)
 
     def popup(self, widget):
-        menu = util.popup.menu(leave=util.format.asbool(self.parameter("leave_menu", False)))
+        menu = util.popup.menu(leave=False)
 
         build_menu(menu, self.__path, self.__callback)
         menu.show(widget, offset_x=self.__offx, offset_y=self.__offy)

From 06d6739da42c964f17f25e54c4986cabd03a554c Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sun, 26 Jul 2020 13:21:49 -0700
Subject: [PATCH 087/506] [xrandr] Add autotoggle behavior to xrandr

Also makes i3 subscription events and widget click live-update
---
 bumblebee_status/modules/core/xrandr.py | 154 ++++++++++++++------
 tests/modules/core/test_xrandr.py       | 185 ++++++++++++++++++++----
 2 files changed, 264 insertions(+), 75 deletions(-)

diff --git a/bumblebee_status/modules/core/xrandr.py b/bumblebee_status/modules/core/xrandr.py
index 59d37f0..699599f 100644
--- a/bumblebee_status/modules/core/xrandr.py
+++ b/bumblebee_status/modules/core/xrandr.py
@@ -9,6 +9,8 @@ Parameters:
     * xrandr.autoupdate: If set to 'false', does *not* invoke xrandr automatically. Instead, the
       module will only refresh when displays are enabled or disabled (defaults to true)
     * xrandr.exclude: Comma-separated list of display name prefixes to exclude
+    * xrandr.autotoggle: Boolean flag to automatically enable new displays (defaults to false)
+    * xrandr.autotoggle_side: Which side to put autotoggled displays on ('right' or 'left', defaults to 'right')
 
 Requires the following python module:
     * (optional) i3 - if present, the need for updating the widget list is auto-detected
@@ -35,91 +37,147 @@ except Exception:
     pass
 
 
+RESOLUTION_REGEX = re.compile(r"\d+x\d+\+(\d+)\+\d+")
+
+
+class DisplayInfo:
+    def __init__(self, name, resolution, connected, added, removed):
+        self.name = name
+        self.active = resolution is not None
+        self.connected = connected
+        self.added = added
+        self.removed = removed
+
+        self.position = int(resolution.group(1)) if self.active else sys.maxsize
+        self.state = "on" if self.active else "off"
+
+    def __str__(self):
+        return "DisplayInfo(name={}, active={}, connected={}, added={}, removed={}, position={}, state={})".format(
+            self.name,
+            self.active,
+            self.connected,
+            self.added,
+            self.removed,
+            self.position,
+            self.state,
+        )
+
+    def __repr__(self):
+        return str(self)
+
+
 class Module(core.module.Module):
     @core.decorators.every(seconds=5)  # takes up to 5s to detect a new screen
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
 
-        self._exclude = tuple(filter(len, self.parameter("exclude", "").split(",")))
-        self._active_displays = []
+        self._exclude = tuple(util.format.aslist(self.parameter("exclude")))
         self._autoupdate = util.format.asbool(self.parameter("autoupdate", True))
-        self._needs_update = True
+        self._autotoggle = util.format.asbool(self.parameter("autotoggle", False))
+        self._autotoggle_side = self.parameter("autotoggle_side", "right")
+
+        self._connected_displays = []
+        self._active_displays = []
+        self._initialized = False
 
         try:
             i3.Subscription(self._output_update, "output")
         except Exception:
             pass
 
-    def _output_update(self, event, data, _):
-        self._needs_update = True
+    def _output_update(self, *_):
+        self.update(force=True)
 
-    def update(self):
-        if not self._autoupdate and not self._needs_update:
+    def _query_displays(self):
+        displays = []
+
+        for line in util.cli.execute("xrandr -q").split("\n"):
+            # disconnected or connected
+            if "connected" not in line:
+                continue
+
+            name = line.split(" ", 2)[0]
+            resolution = RESOLUTION_REGEX.search(line)
+            active = resolution is not None
+
+            connected = "disconnected" not in line
+            added = connected and not active and name not in self._connected_displays
+            removed = not connected and active and name in self._active_displays
+
+            displays.append(DisplayInfo(name, resolution, connected, added, removed))
+
+        self._connected_displays = [
+            display.name for display in displays if display.connected
+        ]
+        self._active_displays = [display.name for display in displays if display.active]
+
+        return displays
+
+    def update(self, force=False):
+        if not (self._autoupdate or force or not self._initialized):
             return
 
         self.clear_widgets()
-        self._active_displays.clear()
 
-        self._needs_update = False
-
-        for line in util.cli.execute("xrandr -q").split("\n"):
-            if " connected" not in line:
+        for display in self._query_displays():
+            if display.name.startswith(self._exclude):
                 continue
 
-            display = line.split(" ", 2)[0]
-            resolution = re.search(r"\d+x\d+\+(\d+)\+\d+", line)
+            if self._initialized and self._autotoggle:
+                if display.added:
+                    self._enable_display(display.name, self._autotoggle_side)
+                elif display.removed:
+                    self._disable_display(display.name)
 
-            if resolution:
-                self._active_displays.append(display)
-
-            if display.startswith(self._exclude):
+            if not display.connected:
                 continue
 
-            widget = self.widget(display)
-            if not widget:
-                widget = self.add_widget(full_text=display, name=display)
-                core.input.register(widget, button=1, cmd=self._toggle)
-                core.input.register(widget, button=3, cmd=self._toggle)
-            widget.set("state", "on" if resolution else "off")
-            widget.set("pos", int(resolution.group(1)) if resolution else sys.maxsize)
+            widget = self.add_widget(full_text=display.name, name=display.name)
+            core.input.register(widget, button=1, cmd=self._toggle)
+            core.input.register(widget, button=3, cmd=self._toggle)
+
+            widget.set("state", display.state)
+            widget.set("pos", display.position)
 
         if not self._autoupdate:
             widget = self.add_widget(full_text="")
             widget.set("state", "refresh")
-            core.input.register(widget, button=1, cmd=self._refresh)
+            core.input.register(widget, button=1, cmd=self.update)
+
+        self._initialized = True
 
     def state(self, widget):
         return widget.get("state", "off")
 
-    def _refresh(self, event):
-        self._needs_update = True
+    def _toggle_cmd(self):
+        if util.format.asbool(self.parameter("overwrite_i3config", False)):
+            return utility("toggle-display.sh")
+        else:
+            return "xrandr"
+
+    def _disable_display(self, name):
+        if len(self._active_displays) > 1:
+            util.cli.execute("{} --output {} --off".format(self._toggle_cmd(), name))
+
+    def _enable_display(self, name, side=None):
+        # TODO: is there ever a case when there isn't a neighbor?
+        command = "{} --output {} --auto".format(self._toggle_cmd(), name)
+        if side and self._active_displays:
+            neighbor_index = 0 if side == "left" else -1
+            command += " --{}-of {}".format(side, self._active_displays[neighbor_index])
+
+        util.cli.execute(command)
 
     def _toggle(self, event):
-        if util.format.asbool(self.parameter("overwrite_i3config", False)):
-            toggle_cmd = utility("toggle-display.sh")
-        else:
-            toggle_cmd = "xrandr"
-
         widget = self.widget(widget_id=event["instance"])
 
         if widget.get("state") == "on":
-            if len(self._active_displays) > 1:
-                util.cli.execute("{} --output {} --off".format(toggle_cmd, widget.name))
-        elif not self._active_displays:
-            util.cli.execute("{} --output {} --auto".format(toggle_cmd, widget.name))
+            self._disable_display(widget.name)
         else:
-            if event["button"] == core.input.LEFT_MOUSE:
-                side, neighbor = "left", self._active_displays[0]
-            else:
-                side, neighbor = "right", self._active_displays[-1]
+            side = "left" if event["button"] == core.input.LEFT_MOUSE else "right"
+            self._enable_display(widget.name, side)
 
-            util.cli.execute(
-                "{} --output {} --auto --{}-of {}".format(
-                    toggle_cmd, widget.name, side, neighbor,
-                )
-            )
-
-        self._refresh(event)
+        self.update(force=True)
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/modules/core/test_xrandr.py b/tests/modules/core/test_xrandr.py
index b4e6156..c2d5dca 100644
--- a/tests/modules/core/test_xrandr.py
+++ b/tests/modules/core/test_xrandr.py
@@ -21,47 +21,50 @@ def assert_widgets(module, *expected_widgets):
         assert widget.get("pos") == pos
 
 
-def assert_trigger(mocker, module, widget_index, button, expected_command):
-    xrandr_cli = mock_xrandr(mocker, "")
+def assert_trigger(xrandr_cli, module, widget_index, button, expected_command):
+    xrandr_cli.reset_mock()
+
     widget = module.widgets()[widget_index]
     trigger({"button": button, "instance": widget.id, "name": module.id})
 
     if expected_command is None:
-        xrandr_cli.assert_not_called()
+        xrandr_cli.assert_called_once_with("xrandr -q")
     else:
-        xrandr_cli.assert_called_once_with(expected_command)
+        assert xrandr_cli.call_count == 2
+        xrandr_cli.assert_any_call(expected_command)
+        xrandr_cli.assert_called_with("xrandr -q")
 
 
 def test_autoupdate(mocker):
-    xrandr_cli = mock_xrandr(mocker, FULL_OUTPUT_TWO_DISPLAYS)
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
     module = Module(Config([]), theme=None)
     module.update()
     xrandr_cli.assert_called_once_with("xrandr -q")
 
     assert_widgets(module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "on", 1920))
 
-    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output eDP-1-1 --off")
-    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output eDP-1-1 --off")
-    assert_trigger(mocker, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
-    assert_trigger(mocker, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(xrandr_cli, module, 0, LEFT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(xrandr_cli, module, 0, RIGHT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(xrandr_cli, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(xrandr_cli, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
 
 
 def test_display_off(mocker):
-    xrandr_cli = mock_xrandr(mocker, TRUNCATED_OUTPUT_DISPLAY_OFF)
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_INACTIVE)
     module = Module(Config([]), theme=None)
     module.update()
     xrandr_cli.assert_called_once_with("xrandr -q")
 
     assert_widgets(module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "off", sys.maxsize))
 
-    assert_trigger(mocker, module, 0, LEFT_MOUSE, None)
-    assert_trigger(mocker, module, 0, RIGHT_MOUSE, None)
-    assert_trigger(mocker, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --auto --left-of eDP-1-1")
-    assert_trigger(mocker, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
+    assert_trigger(xrandr_cli, module, 0, LEFT_MOUSE, None)
+    assert_trigger(xrandr_cli, module, 0, RIGHT_MOUSE, None)
+    assert_trigger(xrandr_cli, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --auto --left-of eDP-1-1")
+    assert_trigger(xrandr_cli, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
 
 
 def test_no_autoupdate(mocker):
-    xrandr_cli = mock_xrandr(mocker, FULL_OUTPUT_TWO_DISPLAYS)
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
     module = Module(Config(["-p", "xrandr.autoupdate=false"]), theme=None)
     module.update()
     xrandr_cli.assert_called_once_with("xrandr -q")
@@ -70,39 +73,151 @@ def test_no_autoupdate(mocker):
         module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "on", 1920), (None, "refresh", None)
     )
 
-    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output eDP-1-1 --off")
-    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output eDP-1-1 --off")
-    assert_trigger(mocker, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
-    assert_trigger(mocker, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(xrandr_cli, module, 0, LEFT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(xrandr_cli, module, 0, RIGHT_MOUSE, "xrandr --output eDP-1-1 --off")
+    assert_trigger(xrandr_cli, module, 1, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(xrandr_cli, module, 1, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
 
 
 def test_exclude(mocker):
-    xrandr_cli = mock_xrandr(mocker, FULL_OUTPUT_TWO_DISPLAYS)
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
     module = Module(Config(["-p", "xrandr.exclude=eDP"]), theme=None)
     module.update()
     xrandr_cli.assert_called_once_with("xrandr -q")
 
     assert_widgets(module, ("HDMI-1-1", "on", 1920))
 
-    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
-    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(xrandr_cli, module, 0, LEFT_MOUSE, "xrandr --output HDMI-1-1 --off")
+    assert_trigger(xrandr_cli, module, 0, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --off")
 
 
 def test_exclude_off(mocker):
-    xrandr_cli = mock_xrandr(mocker, TRUNCATED_OUTPUT_DISPLAY_OFF)
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_INACTIVE)
     module = Module(Config(["-p", "xrandr.exclude=eDP"]), theme=None)
     module.update()
     xrandr_cli.assert_called_once_with("xrandr -q")
 
     assert_widgets(module, ("HDMI-1-1", "off", sys.maxsize))
 
-    assert_trigger(mocker, module, 0, LEFT_MOUSE, "xrandr --output HDMI-1-1 --auto --left-of eDP-1-1")
-    assert_trigger(mocker, module, 0, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
+    assert_trigger(xrandr_cli, module, 0, LEFT_MOUSE, "xrandr --output HDMI-1-1 --auto --left-of eDP-1-1")
+    assert_trigger(xrandr_cli, module, 0, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
+
+
+def test_autotoggle_excluded_active_disconnected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true", "xrandr.exclude=HDMI"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0))
+
+    xrandr_cli.return_value = HDMI_DISCONNECTED_ACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+
+def test_autotoggle_excluded_inactive_connected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_DISCONNECTED_INACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true", "xrandr.exclude=HDMI"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0))
+
+    xrandr_cli.return_value = HDMI_CONNECTED_INACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+
+def test_autotoggle_active_disconnected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "on", 1920))
+
+    xrandr_cli.return_value = HDMI_DISCONNECTED_ACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    assert xrandr_cli.call_count == 2
+    xrandr_cli.assert_any_call("xrandr -q")
+    xrandr_cli.assert_called_with("xrandr --output HDMI-1-1 --off")
+
+
+def test_autotoggle_inactive_disconnected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_INACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "off", sys.maxsize))
+
+    xrandr_cli.return_value = HDMI_DISCONNECTED_INACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+
+def test_autotoggle_active_connected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_DISCONNECTED_ACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0))
+
+    xrandr_cli.return_value = HDMI_CONNECTED_ACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+
+def test_autotoggle_inactive_connected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_DISCONNECTED_INACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0))
+
+    xrandr_cli.return_value = HDMI_CONNECTED_INACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    assert xrandr_cli.call_count == 2
+    xrandr_cli.assert_any_call("xrandr -q")
+    xrandr_cli.assert_called_with("xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
+
+
+def test_autotoggle_left(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_DISCONNECTED_INACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true", "xrandr.autotoggle_side=left"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0))
+
+    xrandr_cli.return_value = HDMI_CONNECTED_INACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    assert xrandr_cli.call_count == 2
+    xrandr_cli.assert_any_call("xrandr -q")
+    xrandr_cli.assert_called_with("xrandr --output HDMI-1-1 --auto --left-of eDP-1-1")
 
 
 # xrandr sample data
 
-FULL_OUTPUT_TWO_DISPLAYS = """Screen 0: minimum 8 x 8, current 4480 x 1440, maximum 32767 x 32767
+HDMI_CONNECTED_ACTIVE = """
+Screen 0: minimum 8 x 8, current 4480 x 1440, maximum 32767 x 32767
 eDP-1-1 connected primary 1920x1080+0+0 344mm x 193mm
    1920x1080     60.00*+  59.93    48.00
    1680x1050     59.95    59.88
@@ -150,8 +265,24 @@ HDMI-1-1 connected 2560x1440+1920+0 596mm x 335mm
 """
 
 
-TRUNCATED_OUTPUT_DISPLAY_OFF = """eDP-1-1 connected primary 1920x1080+0+0 344mm x 193mm
+HDMI_CONNECTED_INACTIVE = """
+eDP-1-1 connected primary 1920x1080+0+0 344mm x 193mm
    1920x1080     60.00*+  59.93    48.00
 HDMI-1-1 connected
    2560x1440     59.95 +
 """
+
+HDMI_DISCONNECTED_ACTIVE = """
+eDP-1-1 connected primary 1920x1080+0+0 344mm x 193mm
+   1920x1080     60.00*+  59.93    48.00
+HDMI-1-1 disconnected 2560x1440+1920+0 0mm x 0mm
+  2560x1440 (0x6b) 241.500MHz +HSync +VSync
+        h: width  2560 start 2608 end 2640 total 2720 skew    0 clock  88.79KHz
+        v: height 1440 start 1442 end 1447 total 1481           clock  59.95Hz
+"""
+
+HDMI_DISCONNECTED_INACTIVE = """
+eDP-1-1 connected primary 1920x1080+0+0 344mm x 193mm
+   1920x1080     60.00*+  59.93    48.00
+HDMI-1-1 disconnected
+"""

From 06afb03807b1b3d376cb182b9b9ae01ee834010d Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sun, 26 Jul 2020 13:29:14 -0700
Subject: [PATCH 088/506] [xrandr] add tests for dis/connecting without
 autotoggle

---
 tests/modules/core/test_xrandr.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/tests/modules/core/test_xrandr.py b/tests/modules/core/test_xrandr.py
index c2d5dca..fb1acb4 100644
--- a/tests/modules/core/test_xrandr.py
+++ b/tests/modules/core/test_xrandr.py
@@ -103,14 +103,29 @@ def test_exclude_off(mocker):
     assert_trigger(xrandr_cli, module, 0, RIGHT_MOUSE, "xrandr --output HDMI-1-1 --auto --right-of eDP-1-1")
 
 
-def test_autotoggle_excluded_active_disconnected(mocker):
-    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
-    module = Module(Config(["-p", "xrandr.autotoggle=true", "xrandr.exclude=HDMI"]), theme=None)
+def test_no_autotoggle_inactive_connected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_DISCONNECTED_INACTIVE)
+    module = Module(Config([]), theme=None)
     module.update()
     xrandr_cli.assert_called_once_with("xrandr -q")
 
     assert_widgets(module, ("eDP-1-1", "on", 0))
 
+    xrandr_cli.return_value = HDMI_CONNECTED_INACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+
+def test_no_autotoggle_active_disconnected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
+    module = Module(Config([]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0), ("HDMI-1-1", "on", 1920))
+
     xrandr_cli.return_value = HDMI_DISCONNECTED_ACTIVE
     xrandr_cli.reset_mock()
 

From 13a851a6360b45049867f97fc517238d35d94515 Mon Sep 17 00:00:00 2001
From: Naya Verdier <nayaverdier@users.noreply.github.com>
Date: Sun, 26 Jul 2020 15:52:47 -0700
Subject: [PATCH 089/506] [xrandr-tests] Test disconnecting excluded active
 display

---
 tests/modules/core/test_xrandr.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/modules/core/test_xrandr.py b/tests/modules/core/test_xrandr.py
index fb1acb4..d005baa 100644
--- a/tests/modules/core/test_xrandr.py
+++ b/tests/modules/core/test_xrandr.py
@@ -148,6 +148,21 @@ def test_autotoggle_excluded_inactive_connected(mocker):
     xrandr_cli.assert_called_once_with("xrandr -q")
 
 
+def test_autotoggle_excluded_active_disconnected(mocker):
+    xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
+    module = Module(Config(["-p", "xrandr.autotoggle=true", "xrandr.exclude=HDMI"]), theme=None)
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+    assert_widgets(module, ("eDP-1-1", "on", 0))
+
+    xrandr_cli.return_value = HDMI_DISCONNECTED_ACTIVE
+    xrandr_cli.reset_mock()
+
+    module.update()
+    xrandr_cli.assert_called_once_with("xrandr -q")
+
+
 def test_autotoggle_active_disconnected(mocker):
     xrandr_cli = mock_xrandr(mocker, HDMI_CONNECTED_ACTIVE)
     module = Module(Config(["-p", "xrandr.autotoggle=true"]), theme=None)

From 72d255f0ae4ad50da15a6d07687f4ffc19617dad Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 27 Jul 2020 07:04:47 +0200
Subject: [PATCH 090/506] [doc] document additional config file parameters

see #678
---
 docs/features.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/features.rst b/docs/features.rst
index 162f3c3..f050a2b 100644
--- a/docs/features.rst
+++ b/docs/features.rst
@@ -110,6 +110,10 @@ An example:
 Configuration files
 -------------------
 
+Using a configuration file, it is possible to define a list of modules
+that will be loaded if no modules are specified on the CLI, as well as
+defining a default theme to use.
+
 Any parameter that can be specified using ``-p <name>=<value>`` on the
 commandline, can alternatively be specified in one of the following
 configuration files: - ~/.bumblebee-status.conf -
@@ -122,6 +126,10 @@ Configuration files have the following format:
 
 ::
 
+   [core]
+   modules = <comma-separated list of modules to load>
+   theme = <theme to use by default>
+
    [module-parameters]
    <key> = <value>
 
@@ -131,3 +139,5 @@ For example:
 
    [module-parameters]
    github.token=abcdefabcdef12345
+
+

From 5de616ff893b92823d207723d3154a176eaa5c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Lindahl=20Fl=C3=A5ten?=
 <Andreas.LindahlFlaten@flir.com>
Date: Fri, 31 Jul 2020 15:26:49 +0200
Subject: [PATCH 091/506] [modules/contrib/stock] handle urllib request
 exception

Handle exception that is raised when e.g. your network connection is
down.
---
 bumblebee_status/modules/contrib/stock.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/stock.py b/bumblebee_status/modules/contrib/stock.py
index c8bfb5e..36afe17 100644
--- a/bumblebee_status/modules/contrib/stock.py
+++ b/bumblebee_status/modules/contrib/stock.py
@@ -56,7 +56,11 @@ class Module(core.module.Module):
                 self.__symbols
                 + "&fields=regularMarketPrice,currency,regularMarketChange"
             )
-            return urllib.request.urlopen(url).read().strip()
+            try:
+                return urllib.request.urlopen(url).read().strip()
+            except urllib.request.URLError:
+                logging.error("unable to open stock exchange url")
+                return None
         else:
             logging.error("unable to retrieve stock exchange rate")
             return None

From 5959d73cde8f8533577c7d4ecd5a4910e109f57a Mon Sep 17 00:00:00 2001
From: Alexander Scheid-Rehder <alexander.scheid-rehder@vision-robotics.de>
Date: Thu, 6 Aug 2020 14:49:41 +0200
Subject: [PATCH 092/506] Fix wrong usage of asbool in layout-xkb

---
 bumblebee_status/modules/core/layout-xkb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/layout-xkb.py b/bumblebee_status/modules/core/layout-xkb.py
index 4d1dc7a..909017d 100644
--- a/bumblebee_status/modules/core/layout-xkb.py
+++ b/bumblebee_status/modules/core/layout-xkb.py
@@ -53,7 +53,7 @@ class Module(core.module.Module):
             log.debug("group num: {}".format(xkb.group_num))
             name = (
                 xkb.group_name
-                if util.format.asbool(self.parameter("showname"), False)
+                if util.format.asbool(self.parameter("showname", False))
                 else xkb.group_symbol
             )
             if self.__show_variant:

From c77f3aa3bc806828c2aeaabfeffa72943cf44af7 Mon Sep 17 00:00:00 2001
From: Joshua Barrass <josh.barrass.work@gmail.com>
Date: Tue, 11 Aug 2020 00:45:13 +0100
Subject: [PATCH 093/506] Force update using USR1 signal

---
 bumblebee-status                | 8 ++++++++
 bumblebee_status/core/output.py | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bumblebee-status b/bumblebee-status
index e4f5982..e02dfee 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -4,6 +4,7 @@ import os
 import sys
 import json
 import time
+import signal
 import socket
 import select
 import logging
@@ -103,6 +104,12 @@ def main():
     input_thread.daemon = True
     input_thread.start()
 
+    def sig_USR1_handler(signum,stack):
+        if update_lock.acquire(blocking=False) == True:
+            core.event.trigger("update", redraw_only=False)
+            core.event.trigger("draw")
+            update_lock.release()
+
     if config.debug():
         modules.append(core.module.load("debug", config, theme))
 
@@ -120,6 +127,7 @@ def main():
 
     core.event.trigger("start")
     started = True
+    signal.signal(10, sig_USR1_handler)
     while True:
         if update_lock.acquire(blocking=False) == True:
             core.event.trigger("update")
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 088678d..ed36fcd 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -222,13 +222,14 @@ class i3(object):
         return blocks
 
     # TODO: only updates full text, not the state!?
+    # can this TODO be removed now? Will update the state if not redraw_only
     def update(self, affected_modules=None, redraw_only=False):
         now = time.time()
         for module in self.__modules:
             if affected_modules and not module.id in affected_modules:
                 continue
             if not affected_modules and module.next_update:
-                if now < module.next_update:
+                if now < module.next_update and redraw_only:
                     continue
 
             if not redraw_only:

From 9e04e0a27b60a35f62d751d0c8c1a2b6f16c26c6 Mon Sep 17 00:00:00 2001
From: Joshua Barrass <josh.barrass.work@gmail.com>
Date: Tue, 11 Aug 2020 00:54:35 +0100
Subject: [PATCH 094/506] Quotes around the deadbeef string to prevent parsing
 errors by deadbeef

---
 bumblebee_status/modules/contrib/deadbeef.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/deadbeef.py b/bumblebee_status/modules/contrib/deadbeef.py
index 327972d..948fdc5 100644
--- a/bumblebee_status/modules/contrib/deadbeef.py
+++ b/bumblebee_status/modules/contrib/deadbeef.py
@@ -114,7 +114,7 @@ class Module(core.module.Module):
             self._song = ""
             return
         ## perform the actual query -- these can be much more sophisticated
-        data = util.cli.execute(self.now_playing_tf + self._tf_format)
+        data = util.cli.execute(self.now_playing_tf + '"'+self._tf_format+'"')
         self._song = data
 
     def update_standard(self, widgets):

From 9b5477675cf1e344881f01d6c45490e566d359a4 Mon Sep 17 00:00:00 2001
From: Cristian Miranda <crism60@gmail.com>
Date: Thu, 20 Aug 2020 10:47:56 -0300
Subject: [PATCH 095/506] [github]: Remove error printing if exception caught

I experienced that when an exception is caught and we print it
I get an ugly error on the whole bar making it unusable. This
fixes that problem.
---
 bumblebee_status/modules/contrib/github.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/github.py b/bumblebee_status/modules/contrib/github.py
index abcdfa5..07b8ea0 100644
--- a/bumblebee_status/modules/contrib/github.py
+++ b/bumblebee_status/modules/contrib/github.py
@@ -83,7 +83,6 @@ class Module(core.module.Module):
                 self.__label += "/".join(counts)
 
         except Exception as err:
-            print(err)
             self.__label = "n/a"
 
     def __getUnreadNotificationsCountByReason(self, notifications, reason):

From db41792afb43583ef129871f361b0ba5c4b7fa87 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 27 Aug 2020 20:06:33 +0200
Subject: [PATCH 096/506] [dnf] simplify threading

use framework threading to simplify the dnf module

see #692
---
 bumblebee_status/modules/contrib/dnf.py | 75 +++++++++++--------------
 1 file changed, 33 insertions(+), 42 deletions(-)

diff --git a/bumblebee_status/modules/contrib/dnf.py b/bumblebee_status/modules/contrib/dnf.py
index 3f5e484..21c9245 100644
--- a/bumblebee_status/modules/contrib/dnf.py
+++ b/bumblebee_status/modules/contrib/dnf.py
@@ -5,13 +5,8 @@
 Requires the following executable:
     * dnf
 
-Parameters:
-    * dnf.interval: Time in minutes between two consecutive update checks (defaults to 30 minutes)
-
 """
 
-import threading
-
 import core.event
 import core.module
 import core.widget
@@ -20,46 +15,13 @@ import core.decorators
 import util.cli
 
 
-def get_dnf_info(widget):
-    res = util.cli.execute("dnf updateinfo", ignore_errors=True)
-
-    security = 0
-    bugfixes = 0
-    enhancements = 0
-    other = 0
-    for line in res.split("\n"):
-        if not line.startswith(" "):
-            continue
-        elif "ecurity" in line:
-            for s in line.split():
-                if s.isdigit():
-                    security += int(s)
-        elif "ugfix" in line:
-            for s in line.split():
-                if s.isdigit():
-                    bugfixes += int(s)
-        elif "hancement" in line:
-            for s in line.split():
-                if s.isdigit():
-                    enhancements += int(s)
-        else:
-            for s in line.split():
-                if s.isdigit():
-                    other += int(s)
-
-    widget.set("security", security)
-    widget.set("bugfixes", bugfixes)
-    widget.set("enhancements", enhancements)
-    widget.set("other", other)
-
-    core.event.trigger("update", [widget.module.id], redraw_only=True)
-
-
 class Module(core.module.Module):
     @core.decorators.every(minutes=30)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.updates))
 
+        self.background = True
+
     def updates(self, widget):
         result = []
         for t in ["security", "bugfixes", "enhancements", "other"]:
@@ -67,8 +29,37 @@ class Module(core.module.Module):
         return "/".join(result)
 
     def update(self):
-        thread = threading.Thread(target=get_dnf_info, args=(self.widget(),))
-        thread.start()
+        res = util.cli.execute("dnf updateinfo", ignore_errors=True)
+
+        security = 0
+        bugfixes = 0
+        enhancements = 0
+        other = 0
+        for line in res.split("\n"):
+            if not line.startswith(" "):
+                continue
+            elif "ecurity" in line:
+                for s in line.split():
+                    if s.isdigit():
+                        security += int(s)
+            elif "ugfix" in line:
+                for s in line.split():
+                    if s.isdigit():
+                        bugfixes += int(s)
+            elif "hancement" in line:
+                for s in line.split():
+                    if s.isdigit():
+                        enhancements += int(s)
+            else:
+                for s in line.split():
+                    if s.isdigit():
+                        other += int(s)
+
+        widget.set("security", security)
+        widget.set("bugfixes", bugfixes)
+        widget.set("enhancements", enhancements)
+        widget.set("other", other)
+
 
     def state(self, widget):
         cnt = 0

From 362d1a5f6f8229e3cd5a849cc474c48bbf52551f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 28 Aug 2020 14:03:34 +0200
Subject: [PATCH 097/506] [modules/contrib/dnf] fix undefined "widget" error

while refactoring, i overlooked that the variable "widget" doesn't exist
anymore.

see #692
---
 bumblebee_status/modules/contrib/dnf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee_status/modules/contrib/dnf.py b/bumblebee_status/modules/contrib/dnf.py
index 21c9245..f90ee84 100644
--- a/bumblebee_status/modules/contrib/dnf.py
+++ b/bumblebee_status/modules/contrib/dnf.py
@@ -29,6 +29,7 @@ class Module(core.module.Module):
         return "/".join(result)
 
     def update(self):
+        widget = self.widget()
         res = util.cli.execute("dnf updateinfo", ignore_errors=True)
 
         security = 0

From 905f71fa525c3e80b443c95f416adb874b95624c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 28 Aug 2020 17:14:05 +0200
Subject: [PATCH 098/506] [core] fix broken "sparse" updates

c77f3aa accidentially broke "sparse" updates (i.e. updates that do not
trigger during each update interval).

Introduce a new update parameter, "force", to model the use case "update
everything on SIGUSR1".

fixes #692
---
 bumblebee-status                | 2 +-
 bumblebee_status/core/output.py | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index e02dfee..dda14e4 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -106,7 +106,7 @@ def main():
 
     def sig_USR1_handler(signum,stack):
         if update_lock.acquire(blocking=False) == True:
-            core.event.trigger("update", redraw_only=False)
+            core.event.trigger("update", force=True)
             core.event.trigger("draw")
             update_lock.release()
 
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index ed36fcd..687cafd 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -221,15 +221,13 @@ class i3(object):
             core.event.trigger("next-widget")
         return blocks
 
-    # TODO: only updates full text, not the state!?
-    # can this TODO be removed now? Will update the state if not redraw_only
-    def update(self, affected_modules=None, redraw_only=False):
+    def update(self, affected_modules=None, redraw_only=False, force=False):
         now = time.time()
         for module in self.__modules:
             if affected_modules and not module.id in affected_modules:
                 continue
             if not affected_modules and module.next_update:
-                if now < module.next_update and redraw_only:
+                if now < module.next_update and not force:
                     continue
 
             if not redraw_only:

From 2c8dafec701d80ddd9a3d1855a14a8eef0c44790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sat, 29 Aug 2020 20:17:39 -0300
Subject: [PATCH 099/506] Add Network Traffic module tests

---
 tests/modules/contrib/test_network_traffic.py | 54 +++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/tests/modules/contrib/test_network_traffic.py b/tests/modules/contrib/test_network_traffic.py
index 0dd52a9..256aac1 100644
--- a/tests/modules/contrib/test_network_traffic.py
+++ b/tests/modules/contrib/test_network_traffic.py
@@ -1,9 +1,57 @@
 import pytest
+from unittest import TestCase, mock
+
+import core.config
+import core.widget
+import modules.contrib.network_traffic
+
+from types import SimpleNamespace
 
 pytest.importorskip("psutil")
-
 pytest.importorskip("netifaces")
 
-def test_load_module():
-    __import__("modules.contrib.network_traffic")
+def io_counters_mock(recv, sent):
+    return {
+        'lo': SimpleNamespace(
+            bytes_sent = sent,
+            bytes_recv = recv
+        )
+    }
+
+def gateways_response():
+    return {
+        'default': {
+            1: ('10.0.0.10', 'lo')
+        }
+    }
+
+def build_module():
+    return modules.contrib.network_traffic.Module(config=core.config.Config([]), theme=None)
+
+class TestNetworkTrafficUnit(TestCase):
+    def test_load_module(self):
+        __import__("modules.contrib.network_traffic")
+
+    @mock.patch('psutil.net_io_counters')
+    @mock.patch('netifaces.gateways')
+    @mock.patch('netifaces.AF_INET', 1)
+    def test_update_rates(self, gateways_mock, net_io_counters_mock):
+        net_io_counters_mock.return_value = io_counters_mock(0, 0)
+        gateways_mock.return_value = gateways_response()
+
+        module = build_module()
+
+        net_io_counters_mock.return_value = io_counters_mock(2842135, 1932215)
+        module.update()
+
+        assert module.widgets()[1].full_text() == '1.84MiB/s'
+        assert module.widgets()[0].full_text() == '2.71MiB/s'
+
+    def test_initial_download_rate(self):
+        module = build_module()
+        assert module.widgets()[0].full_text() == '0.00B/s'
+
+    def test_initial_upload_rate(self):
+        module = build_module()
+        assert module.widgets()[1].full_text() == '0.00B/s'
 

From dff187252a44a6d44cbae4a26e3aec26ef51f800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sat, 29 Aug 2020 21:09:59 -0300
Subject: [PATCH 100/506] Fix RECV/SENT start values

---
 bumblebee_status/modules/contrib/network_traffic.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network_traffic.py b/bumblebee_status/modules/contrib/network_traffic.py
index bd1a9b6..f9c8c98 100644
--- a/bumblebee_status/modules/contrib/network_traffic.py
+++ b/bumblebee_status/modules/contrib/network_traffic.py
@@ -38,8 +38,8 @@ class Module(core.module.Module):
         try:
             self._bandwidth = BandwidthInfo()
 
-            self._rate_recv = "?"
-            self._rate_sent = "?"
+            self._rate_recv = 0
+            self._rate_sent = 0
             self._bytes_recv = self._bandwidth.bytes_recv()
             self._bytes_sent = self._bandwidth.bytes_sent()
         except Exception:

From 22ddcf42bddca59f2028ed61665594eafadad746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sat, 29 Aug 2020 21:49:41 -0300
Subject: [PATCH 101/506] Improve tests

---
 tests/modules/contrib/test_network_traffic.py | 60 +++++++++++++++----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/tests/modules/contrib/test_network_traffic.py b/tests/modules/contrib/test_network_traffic.py
index 256aac1..1abae72 100644
--- a/tests/modules/contrib/test_network_traffic.py
+++ b/tests/modules/contrib/test_network_traffic.py
@@ -26,12 +26,48 @@ def gateways_response():
     }
 
 def build_module():
-    return modules.contrib.network_traffic.Module(config=core.config.Config([]), theme=None)
+    config = core.config.Config([])
+    return modules.contrib.network_traffic.Module(config=config, theme=None)
+
+def download_widget(module):
+    return module.widgets()[0]
+
+def upload_widget(module):
+    return module.widgets()[1]
+
+def mb_to_bytes(value):
+    return value*1024**2
 
 class TestNetworkTrafficUnit(TestCase):
     def test_load_module(self):
         __import__("modules.contrib.network_traffic")
 
+    def test_initial_download_rate(self):
+        module = build_module()
+        assert download_widget(module).full_text() == '0.00B/s'
+
+    def test_initial_upload_rate(self):
+        module = build_module()
+        assert upload_widget(module).full_text() == '0.00B/s'
+
+    @mock.patch('netifaces.gateways')
+    def test_invalid_gateways(self, gateways_mock):
+        gateways_mock.return_value = { 'invalid': 'gateways' }
+
+        module = build_module()
+
+        assert download_widget(module).full_text() == '0.00B/s'
+        assert upload_widget(module).full_text() == '0.00B/s'
+
+    @mock.patch('psutil.net_io_counters')
+    def test_invalid_io_counters(self, net_io_counters_mock):
+        net_io_counters_mock.return_value = { 'invalid': 'io_counters' }
+
+        module = build_module()
+
+        assert download_widget(module).full_text() == '0.00B/s'
+        assert upload_widget(module).full_text() == '0.00B/s'
+
     @mock.patch('psutil.net_io_counters')
     @mock.patch('netifaces.gateways')
     @mock.patch('netifaces.AF_INET', 1)
@@ -41,17 +77,15 @@ class TestNetworkTrafficUnit(TestCase):
 
         module = build_module()
 
-        net_io_counters_mock.return_value = io_counters_mock(2842135, 1932215)
+        assert download_widget(module).full_text() == '0.00B/s'
+        assert upload_widget(module).full_text() == '0.00B/s'
+
+        net_io_counters_mock.return_value = io_counters_mock(
+            mb_to_bytes(30),
+            mb_to_bytes(0.5)
+        )
+
         module.update()
 
-        assert module.widgets()[1].full_text() == '1.84MiB/s'
-        assert module.widgets()[0].full_text() == '2.71MiB/s'
-
-    def test_initial_download_rate(self):
-        module = build_module()
-        assert module.widgets()[0].full_text() == '0.00B/s'
-
-    def test_initial_upload_rate(self):
-        module = build_module()
-        assert module.widgets()[1].full_text() == '0.00B/s'
-
+        assert download_widget(module).full_text() == '30.00MiB/s'
+        assert upload_widget(module).full_text() == '512.00KiB/s'

From c339a163655cd35316f7b44982237c53ca603608 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Sun, 30 Aug 2020 09:03:34 +0200
Subject: [PATCH 102/506] small improvements in octoprint plugin

* octoprint sometimes returns additional information a the 3d printer is offline.
  so, it's better to check if the octoprint job state starts with "Offline".

* in case the returned job state is really long, truncate it.
---
 bumblebee_status/modules/contrib/octoprint.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/octoprint.py b/bumblebee_status/modules/contrib/octoprint.py
index a324af2..a7ed8ac 100644
--- a/bumblebee_status/modules/contrib/octoprint.py
+++ b/bumblebee_status/modules/contrib/octoprint.py
@@ -85,8 +85,15 @@ class Module(core.module.Module):
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__show_popup)
 
     def octoprint_status(self, widget):
-        if self.__octoprint_state == "Offline" or self.__octoprint_state == "Unknown":
-            return self.__octoprint_state
+        if (
+            self.__octoprint_state.startswith("Offline")
+            or self.__octoprint_state == "Unknown"
+        ):
+            return (
+                (self.__octoprint_state[:25] + "...")
+                if len(self.__octoprint_state) > 25
+                else self.__octoprint_state
+            )
         return (
             self.__octoprint_state
             + " | B: "

From 945838dc748a5bd9f499812a369a0d3a95f5f413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sun, 30 Aug 2020 11:15:23 -0300
Subject: [PATCH 103/506] Create memory module tests

---
 tests/modules/core/test_memory.py | 120 +++++++++++++++++++++++++++++-
 1 file changed, 118 insertions(+), 2 deletions(-)

diff --git a/tests/modules/core/test_memory.py b/tests/modules/core/test_memory.py
index 2b87b8a..b133c52 100644
--- a/tests/modules/core/test_memory.py
+++ b/tests/modules/core/test_memory.py
@@ -1,5 +1,121 @@
 import pytest
+from unittest import TestCase, mock
 
-def test_load_module():
-    __import__("modules.core.memory")
+import core.config
+import core.widget
+import modules.core.memory
 
+def build_module(args = []):
+    config = core.config.Config(args)
+    return modules.core.memory.Module(config=config, theme=None)
+
+def memory_widget(module):
+    return module.widgets()[0]
+
+def meminfo_mock(
+    total,
+    available,
+    free = 0,
+    buffers = 0,
+    cached = 0,
+    slab = 0
+):
+    data = []
+    states = [
+        ('MemTotal', total),
+        ('MemAvailable', available),
+        ('MemFree', free),
+        ('Buffers', buffers),
+        ('Cached', cached),
+        ('Slab', slab)
+    ]
+
+
+    for i, (key, value) in enumerate(states):
+        data.append('{}: {} kB'.format(key, value))
+
+    return '\n'.join(data)
+
+class TestMemory(TestCase):
+    def test_load_module(self):
+        __import__("modules.core.memory")
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(2048, 1024)))
+    def test_default_healthy_state(self):
+        module = build_module()
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '1.00MiB/2.00MiB (50.00%)'
+        assert module.state(widget) == None
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(8196, 1024)))
+    def test_default_warning_state(self):
+        module = build_module()
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '7.00MiB/8.00MiB (87.51%)'
+        assert module.state(widget) == 'warning'
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(2048, 0)))
+    def test_default_critical_state(self):
+        module = build_module()
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '2.00MiB/2.00MiB (100.00%)'
+        assert module.state(widget) == 'critical'
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(4096, 3068)))
+    def test_custom_warning_parameter(self):
+        module = build_module(['-p', 'memory.warning=20'])
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '1.00MiB/4.00MiB (25.10%)'
+        assert module.state(widget) == 'warning'
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(8196, 4096)))
+    def test_custom_critical_parameter(self):
+        module = build_module(['-p', 'memory.critical=50'])
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '4.00MiB/8.00MiB (50.02%)'
+        assert module.state(widget) == 'critical'
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(2048, 1024)))
+    def test_usedonly_parameter(self):
+        module = build_module(['-p', 'memory.usedonly=true'])
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '1.00MiB'
+        assert module.state(widget) == None
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(2048, 1024)))
+    def test_format_parameter(self):
+        module = build_module(['-p', 'memory.format={used}.{total}'])
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '1.00MiB.2.00MiB'
+        assert module.state(widget) == None
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(2048, 1024)))
+    def test_format_parameter_with_percent(self):
+        module = build_module(['-p', 'memory.format={percent}%'])
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '50.0%'
+        assert module.state(widget) == None

From 820598b1b8c7433332584616074ff87e506c67e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sun, 30 Aug 2020 12:11:48 -0300
Subject: [PATCH 104/506] Fix memory module tests

---
 bumblebee_status/modules/core/memory.py | 35 ++++++++++++++++---------
 tests/modules/core/test_memory.py       |  1 -
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/bumblebee_status/modules/core/memory.py b/bumblebee_status/modules/core/memory.py
index 82de769..9b4a3ab 100644
--- a/bumblebee_status/modules/core/memory.py
+++ b/bumblebee_status/modules/core/memory.py
@@ -41,18 +41,8 @@ class Module(core.module.Module):
         return self._format.format(**self._mem)
 
     def update(self):
-        data = {}
-        with open("/proc/meminfo", "r") as f:
-            for line in f:
-                tmp = re.split(r"[:\s]+", line)
-                value = int(tmp[1])
-                if tmp[2] == "kB":
-                    value = value * 1024
-                if tmp[2] == "mB":
-                    value = value * 1024 * 1024
-                if tmp[2] == "gB":
-                    value = value * 1024 * 1024 * 1024
-                data[tmp[0]] = value
+        data = self.__parse_meminfo()
+
         if "MemAvailable" in data:
             used = data["MemTotal"] - data["MemAvailable"]
         else:
@@ -78,5 +68,26 @@ class Module(core.module.Module):
             return "warning"
         return None
 
+    def __parse_meminfo(self):
+        data = {}
+        with open("/proc/meminfo", "r") as f:
+            # https://bugs.python.org/issue32933
+            while True:
+                line = f.readline()
+
+                if line == '':
+                    break
+
+                tmp = re.split(r"[:\s]+", line)
+                value = int(tmp[1])
+                if tmp[2] == "kB":
+                    value = value * 1024
+                if tmp[2] == "mB":
+                    value = value * 1024 * 1024
+                if tmp[2] == "gB":
+                    value = value * 1024 * 1024 * 1024
+                data[tmp[0]] = value
+
+        return data
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/modules/core/test_memory.py b/tests/modules/core/test_memory.py
index b133c52..9f52032 100644
--- a/tests/modules/core/test_memory.py
+++ b/tests/modules/core/test_memory.py
@@ -30,7 +30,6 @@ def meminfo_mock(
         ('Slab', slab)
     ]
 
-
     for i, (key, value) in enumerate(states):
         data.append('{}: {} kB'.format(key, value))
 

From 6f6f3cedd930103f9f4bfd8b740dce43ce80422d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sun, 30 Aug 2020 12:28:48 -0300
Subject: [PATCH 105/506] Improve meminfo parse logic

---
 bumblebee_status/modules/core/memory.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/bumblebee_status/modules/core/memory.py b/bumblebee_status/modules/core/memory.py
index 9b4a3ab..a4015ff 100644
--- a/bumblebee_status/modules/core/memory.py
+++ b/bumblebee_status/modules/core/memory.py
@@ -72,12 +72,7 @@ class Module(core.module.Module):
         data = {}
         with open("/proc/meminfo", "r") as f:
             # https://bugs.python.org/issue32933
-            while True:
-                line = f.readline()
-
-                if line == '':
-                    break
-
+            for line in f.readlines():
                 tmp = re.split(r"[:\s]+", line)
                 value = int(tmp[1])
                 if tmp[2] == "kB":

From 49de0e520b8c879111096c00d1c7abba77ea1fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sun, 30 Aug 2020 12:37:58 -0300
Subject: [PATCH 106/506] Reduce code cognitive complexity

---
 bumblebee_status/modules/core/memory.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/bumblebee_status/modules/core/memory.py b/bumblebee_status/modules/core/memory.py
index a4015ff..c9ecf44 100644
--- a/bumblebee_status/modules/core/memory.py
+++ b/bumblebee_status/modules/core/memory.py
@@ -74,15 +74,22 @@ class Module(core.module.Module):
             # https://bugs.python.org/issue32933
             for line in f.readlines():
                 tmp = re.split(r"[:\s]+", line)
-                value = int(tmp[1])
-                if tmp[2] == "kB":
-                    value = value * 1024
-                if tmp[2] == "mB":
-                    value = value * 1024 * 1024
-                if tmp[2] == "gB":
-                    value = value * 1024 * 1024 * 1024
+                value = self.__parse_value(tmp)
+
                 data[tmp[0]] = value
 
         return data
 
+    def __parse_value(self, data):
+        value = int(data[1])
+
+        if data[2] == "kB":
+            value = value * 1024
+        if data[2] == "mB":
+            value = value * 1024 * 1024
+        if data[2] == "gB":
+            value = value * 1024 * 1024 * 1024
+
+        return value
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 0c8d682d62b1305df5643e12cabfc50ea5ed8a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sun, 30 Aug 2020 12:49:33 -0300
Subject: [PATCH 107/506] Add unit tests

---
 tests/modules/core/test_memory.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/modules/core/test_memory.py b/tests/modules/core/test_memory.py
index 9f52032..4787395 100644
--- a/tests/modules/core/test_memory.py
+++ b/tests/modules/core/test_memory.py
@@ -15,6 +15,7 @@ def memory_widget(module):
 def meminfo_mock(
     total,
     available,
+    unit = 'kB',
     free = 0,
     buffers = 0,
     cached = 0,
@@ -31,7 +32,7 @@ def meminfo_mock(
     ]
 
     for i, (key, value) in enumerate(states):
-        data.append('{}: {} kB'.format(key, value))
+        data.append('{}: {} {}'.format(key, value, unit))
 
     return '\n'.join(data)
 
@@ -118,3 +119,25 @@ class TestMemory(TestCase):
 
         assert widget.full_text() == '50.0%'
         assert module.state(widget) == None
+
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(8196, 4096, 'mB')))
+    def test_mb_unit(self):
+        module = build_module()
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '4.00GiB/8.00GiB (50.02%)'
+        assert module.state(widget) == None
+
+    @mock.patch('builtins.open', mock.mock_open(read_data=meminfo_mock(2, 1, 'gB')))
+    def test_gb_unit(self):
+        module = build_module()
+        module.update()
+
+        widget = memory_widget(module)
+
+        assert widget.full_text() == '1.00GiB/2.00GiB (50.00%)'
+        assert module.state(widget) == None
+

From f22095e978f7147baf9199b7809fe4ef814a4fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Mon, 31 Aug 2020 17:48:19 -0300
Subject: [PATCH 108/506] Add datetime module tests

---
 tests/modules/core/test_datetime.py | 56 +++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/tests/modules/core/test_datetime.py b/tests/modules/core/test_datetime.py
index b8384d9..f99d552 100644
--- a/tests/modules/core/test_datetime.py
+++ b/tests/modules/core/test_datetime.py
@@ -1,7 +1,59 @@
 import pytest
+from unittest import mock, TestCase
+
+import datetime
+from freezegun import freeze_time
+
+import core.config
+import core.input
+import core.widget
+import modules.core.datetime
 
 pytest.importorskip("datetime")
 
-def test_load_module():
-    __import__("modules.core.datetime")
+def build_module(args = []):
+    config = core.config.Config(args)
+    return modules.core.datetime.Module(config=config, theme=None)
+
+def build_widget():
+    return core.widget.Widget()
+
+class DatetimeTest(TestCase):
+    def setup_class(self):
+        locale_patcher = mock.patch('locale.getdefaultlocale')
+        locale_mock = locale_patcher.start()
+        locale_mock.return_value = ('en-US', 'UTF-8')
+
+        self.widget = build_widget()
+
+    def test_load_module(self):
+        __import__("modules.core.datetime")
+
+    @freeze_time('2020-10-15')
+    def test_default_format(self):
+        module = build_module()
+        assert module.full_text(self.widget) == '10/15/2020 12:00:00 AM'
+
+    @freeze_time('2020-10-20')
+    def test_custom_format(self):
+        module = build_module(['-p', 'datetime.format=%Y.%m.%d'])
+        assert module.full_text(self.widget) == '2020.10.20'
+
+    @freeze_time('2020-01-10 10:20:30')
+    @mock.patch('locale.getdefaultlocale')
+    def test_invalid_locale(self, locale_mock):
+        locale_mock.return_value = ('in-IN', 'UTF-0')
+
+        module = build_module()
+        assert module.full_text(self.widget) == '01/10/2020 10:20:30 AM'
+
+    @mock.patch('core.input.register')
+    def test_register_left_mouse_action(self, input_register_mock):
+        module = build_module()
+
+        input_register_mock.assert_called_with(
+            module,
+            button=core.input.LEFT_MOUSE,
+            cmd='calendar'
+        )
 

From 0776592da66da7067237bab0cfb60bf234e0d3f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Tue, 1 Sep 2020 20:12:31 -0300
Subject: [PATCH 109/506] Add freezegun to Travis dependencies

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 400bd81..78aa402 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ before_install:
   - sudo apt-get -qq update
 install:
   - sudo apt-get install python-dbus
-  - pip install -U coverage==4.3 pytest pytest-mock
+  - pip install -U coverage==4.3 pytest pytest-mock freezegun
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser i3ipc

From b1501a815940b7bfa7129594a7aa6aa606cd445d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Tue, 1 Sep 2020 20:29:04 -0300
Subject: [PATCH 110/506] Remove useless import

---
 tests/modules/core/test_datetime.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/modules/core/test_datetime.py b/tests/modules/core/test_datetime.py
index f99d552..33b7d58 100644
--- a/tests/modules/core/test_datetime.py
+++ b/tests/modules/core/test_datetime.py
@@ -1,7 +1,5 @@
 import pytest
 from unittest import mock, TestCase
-
-import datetime
 from freezegun import freeze_time
 
 import core.config

From 07f0b7e34ab1c2b1f800acb7014851d0c6f5ba3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Tue, 1 Sep 2020 20:54:10 -0300
Subject: [PATCH 111/506] Add CPU module tests

---
 tests/modules/core/test_cpu.py | 68 +++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/tests/modules/core/test_cpu.py b/tests/modules/core/test_cpu.py
index 9ea85ed..eca2362 100644
--- a/tests/modules/core/test_cpu.py
+++ b/tests/modules/core/test_cpu.py
@@ -1,7 +1,71 @@
 import pytest
+from unittest import TestCase, mock
+
+import core.config
+import core.widget
+import modules.core.cpu
 
 pytest.importorskip("psutil")
 
-def test_load_module():
-    __import__("modules.core.cpu")
+def build_module():
+    config = core.config.Config([])
+    return modules.core.cpu.Module(config=config, theme=None)
+
+def cpu_widget(module):
+    return module.widgets()[0]
+
+class TestCPU(TestCase):
+    def test_load_module(self):
+        __import__("modules.core.cpu")
+
+    @mock.patch('psutil.cpu_percent')
+    def test_cpu_percent(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = 5
+        module = build_module()
+
+        assert cpu_widget(module).full_text() == '5.0%'
+
+    @mock.patch('psutil.cpu_percent')
+    def test_cpu_percent_update(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = 10
+        module = build_module()
+
+        assert cpu_widget(module).full_text() == '10.0%'
+
+        cpu_percent_mock.return_value = 20
+        module.update()
+
+        assert cpu_widget(module).full_text() == '20.0%'
+
+    @mock.patch('psutil.cpu_percent')
+    def test_healthy_state(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = 50
+        module = build_module()
+
+        assert module.state(None) == None
+
+    @mock.patch('psutil.cpu_percent')
+    def test_warning_state(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = 75
+        module = build_module()
+
+        assert module.state(None) == 'warning'
+
+    @mock.patch('psutil.cpu_percent')
+    def test_critical_state(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = 82
+        module = build_module()
+
+        assert module.state(None) == 'critical'
+
+    @mock.patch('core.input.register')
+    def test_register_left_mouse_action(self, input_register_mock):
+        module = build_module()
+
+        input_register_mock.assert_called_with(
+            module,
+            button=core.input.LEFT_MOUSE,
+            cmd='gnome-system-monitor'
+        )
+
 

From 032a651efaa5374d8a3d6f6af8c04806f2022106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Tue, 1 Sep 2020 22:12:54 -0300
Subject: [PATCH 112/506] Improve network traffic module tests

---
 bumblebee_status/modules/contrib/network_traffic.py |  3 ---
 tests/modules/contrib/test_network_traffic.py       | 12 ++++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network_traffic.py b/bumblebee_status/modules/contrib/network_traffic.py
index f9c8c98..ad5781f 100644
--- a/bumblebee_status/modules/contrib/network_traffic.py
+++ b/bumblebee_status/modules/contrib/network_traffic.py
@@ -97,9 +97,6 @@ class BandwidthInfo(object):
         """Return default active network adapter"""
         gateway = netifaces.gateways()["default"]
 
-        if not gateway:
-            raise "No default gateway found"
-
         return gateway[netifaces.AF_INET][1]
 
     @classmethod
diff --git a/tests/modules/contrib/test_network_traffic.py b/tests/modules/contrib/test_network_traffic.py
index 1abae72..c18692e 100644
--- a/tests/modules/contrib/test_network_traffic.py
+++ b/tests/modules/contrib/test_network_traffic.py
@@ -89,3 +89,15 @@ class TestNetworkTrafficUnit(TestCase):
 
         assert download_widget(module).full_text() == '30.00MiB/s'
         assert upload_widget(module).full_text() == '512.00KiB/s'
+
+    def test_widget_states(self):
+        module = build_module()
+
+        assert module.state(download_widget(module)) == 'rx'
+        assert module.state(upload_widget(module)) == 'tx'
+
+    def test_invalid_widget_state(self):
+        module = build_module()
+        invalid_widget = core.widget.Widget(name='invalid')
+
+        assert module.state(invalid_widget) == None

From 213c28992cebe03b3b0143b831c005d620503510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Tue, 1 Sep 2020 20:34:18 -0300
Subject: [PATCH 113/506] Add date tests

---
 tests/modules/core/test_date.py | 55 +++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/tests/modules/core/test_date.py b/tests/modules/core/test_date.py
index b87e64b..4c4afc3 100644
--- a/tests/modules/core/test_date.py
+++ b/tests/modules/core/test_date.py
@@ -1,5 +1,56 @@
 import pytest
+from unittest import TestCase, mock
+from freezegun import freeze_time
+
+import core.config
+import core.input
+import core.widget
+import modules.core.date
+
+def build_module(args = []):
+    config = core.config.Config(args)
+    return modules.core.date.Module(config=config, theme=None)
+
+def build_widget():
+    return core.widget.Widget()
+
+class DateTest(TestCase):
+    def setup_class(self):
+        locale_patcher = mock.patch('locale.getdefaultlocale')
+        locale_mock = locale_patcher.start()
+        locale_mock.return_value = ('en-US', 'UTF-8')
+
+        self.widget = build_widget()
+
+    def test_load_module(self):
+        __import__("modules.core.date")
+
+    @freeze_time('2020-10-15 03:25:59')
+    def test_default_format(self):
+        module = build_module()
+        assert module.full_text(self.widget) == '10/15/2020'
+
+    @freeze_time('2020-10-20 12:30:00')
+    def test_custom_format(self):
+        module = build_module(['-p', 'date.format=%d.%m.%y'])
+        assert module.full_text(self.widget) == '20.10.20'
+
+    @freeze_time('2020-01-10 10:20:30')
+    @mock.patch('locale.getdefaultlocale')
+    def test_invalid_locale(self, locale_mock):
+        locale_mock.return_value = ('in-IN', 'UTF-0')
+
+        module = build_module()
+        assert module.full_text(self.widget) == '01/10/2020'
+
+    @mock.patch('core.input.register')
+    def test_register_left_mouse_action(self, input_register_mock):
+        module = build_module()
+
+        input_register_mock.assert_called_with(
+            module,
+            button=core.input.LEFT_MOUSE,
+            cmd='calendar'
+        )
 
-def test_load_module():
-    __import__("modules.core.date")
 

From 04f6a6a08fa8e97018b12e827c951fae974d048b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Tue, 1 Sep 2020 21:49:51 -0300
Subject: [PATCH 114/506] Add time module tests

---
 tests/modules/core/test_date.py |  2 ++
 tests/modules/core/test_time.py | 57 +++++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/tests/modules/core/test_date.py b/tests/modules/core/test_date.py
index 4c4afc3..9f5e888 100644
--- a/tests/modules/core/test_date.py
+++ b/tests/modules/core/test_date.py
@@ -7,6 +7,8 @@ import core.input
 import core.widget
 import modules.core.date
 
+pytest.importorskip("datetime")
+
 def build_module(args = []):
     config = core.config.Config(args)
     return modules.core.date.Module(config=config, theme=None)
diff --git a/tests/modules/core/test_time.py b/tests/modules/core/test_time.py
index 603a50d..0395e82 100644
--- a/tests/modules/core/test_time.py
+++ b/tests/modules/core/test_time.py
@@ -1,5 +1,58 @@
 import pytest
+from unittest import TestCase, mock
+from freezegun import freeze_time
+
+import core.config
+import core.input
+import core.widget
+import modules.core.time
+
+pytest.importorskip("datetime")
+
+def build_module(args = []):
+    config = core.config.Config(args)
+    return modules.core.time.Module(config=config, theme=None)
+
+def build_widget():
+    return core.widget.Widget()
+
+class TimeTest(TestCase):
+    def setup_class(self):
+        locale_patcher = mock.patch('locale.getdefaultlocale')
+        locale_mock = locale_patcher.start()
+        locale_mock.return_value = ('en-US', 'UTF-8')
+
+        self.widget = build_widget()
+
+    def test_load_module(self):
+        __import__("modules.core.time")
+
+    @freeze_time('2020-10-15 03:25:59')
+    def test_default_format(self):
+        module = build_module()
+        assert module.full_text(self.widget) == '03:25:59 AM'
+
+    @freeze_time('2020-10-20 12:30:12')
+    def test_custom_format(self):
+        module = build_module(['-p', 'time.format=%H.%M.%S'])
+        assert module.full_text(self.widget) == '12.30.12'
+
+    @freeze_time('2020-01-10 10:20:30')
+    @mock.patch('locale.getdefaultlocale')
+    def test_invalid_locale(self, locale_mock):
+        locale_mock.return_value = ('in-IN', 'UTF-0')
+
+        module = build_module()
+        assert module.full_text(self.widget) == '10:20:30 AM'
+
+    @mock.patch('core.input.register')
+    def test_register_left_mouse_action(self, input_register_mock):
+        module = build_module()
+
+        input_register_mock.assert_called_with(
+            module,
+            button=core.input.LEFT_MOUSE,
+            cmd='calendar'
+        )
 
-def test_load_module():
-    __import__("modules.core.time")
 

From 6c0930cfae2885ab06ed3382cd7df82d8f677508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Wed, 2 Sep 2020 14:33:07 -0300
Subject: [PATCH 115/506] Add load module tests

---
 bumblebee_status/modules/core/load.py |   1 +
 tests/modules/core/test_load.py       | 128 +++++++++++++++++++++++++-
 2 files changed, 127 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/core/load.py b/bumblebee_status/modules/core/load.py
index 7800c88..ca7d26a 100644
--- a/bumblebee_status/modules/core/load.py
+++ b/bumblebee_status/modules/core/load.py
@@ -27,6 +27,7 @@ class Module(core.module.Module):
             self._cpus = multiprocessing.cpu_count()
         except NotImplementedError as e:
             self._cpus = 1
+
         core.input.register(
             self, button=core.input.LEFT_MOUSE, cmd="gnome-system-monitor"
         )
diff --git a/tests/modules/core/test_load.py b/tests/modules/core/test_load.py
index 2210f9e..a80e6f6 100644
--- a/tests/modules/core/test_load.py
+++ b/tests/modules/core/test_load.py
@@ -1,7 +1,131 @@
 import pytest
+from unittest import TestCase, mock
 
+import core.config
+import core.widget
+import modules.core.load
+
+pytest.importorskip("os")
 pytest.importorskip("multiprocessing")
 
-def test_load_module():
-    __import__("modules.core.load")
+def build_module():
+    config = core.config.Config([])
+    return modules.core.load.Module(config=config, theme=None)
+
+def widget(module):
+    return module.widgets()[0]
+
+class TestLoad(TestCase):
+    def test_load_module(self):
+        __import__("modules.core.load")
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_initial_values(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 1
+        load_avg_mock.return_value = (0.10, 0.20, 0.30)
+
+        module = build_module()
+
+        assert widget(module).full_text() == '0.00/0.00/0.00'
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_update_values(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 1
+        load_avg_mock.return_value = (0.85, 0.95, 0.25)
+
+        module = build_module()
+        module.update()
+
+        assert widget(module).full_text() == '0.85/0.95/0.25'
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_cpu_count_exception(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.side_effect = NotImplementedError
+        load_avg_mock.return_value = (0.1, 0.2, 0.3)
+
+        module = build_module()
+        module.update()
+
+        assert widget(module).full_text() == '0.10/0.20/0.30'
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_healthy_state(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 1
+        load_avg_mock.return_value = (0.55, 0.95, 0.25)
+
+        module = build_module()
+        module.update()
+
+        assert module.state(widget(module)) == None
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_warning_state(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 1
+        load_avg_mock.return_value = (0.8, 0.85, 0.9)
+
+        module = build_module()
+        module.update()
+
+        assert module.state(widget(module)) == 'warning'
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_critical_state(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 1
+        load_avg_mock.return_value = (0.95, 0.85, 0.9)
+
+        module = build_module()
+        module.update()
+
+        assert module.state(widget(module)) == 'critical'
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_healthy_state_with_8_cpus(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 8
+        load_avg_mock.return_value = (4.42, 0.85, 0.9)
+
+        module = build_module()
+        module.update()
+
+        assert module.state(widget(module)) == None
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_warning_state_with_8_cpus(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 8
+        load_avg_mock.return_value = (5.65, 0.85, 0.9)
+
+        module = build_module()
+        module.update()
+
+        assert module.state(widget(module)) == 'warning'
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    def test_critical_state_with_8_cpus(self, load_avg_mock, cpu_count_mock):
+        cpu_count_mock.return_value = 8
+        load_avg_mock.return_value = (6.45, 0.85, 0.9)
+
+        module = build_module()
+        module.update()
+
+        assert module.state(widget(module)) == 'critical'
+
+    @mock.patch('multiprocessing.cpu_count')
+    @mock.patch('os.getloadavg')
+    @mock.patch('core.input.register')
+    def test_register_left_mouse_action(self, input_register_mock, load_avg_mock, cpu_count_mock):
+        module = build_module()
+
+        input_register_mock.assert_called_with(
+            module,
+            button=core.input.LEFT_MOUSE,
+            cmd='gnome-system-monitor'
+        )
 

From 710a2cef98689500149dabfde62524247b4a76cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Wed, 2 Sep 2020 22:10:09 -0300
Subject: [PATCH 116/506] Create uptime and public ip tests

---
 tests/modules/contrib/test_publicip.py | 43 ++++++++++++++++++++++++--
 tests/modules/contrib/test_uptime.py   | 25 +++++++++++++--
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/tests/modules/contrib/test_publicip.py b/tests/modules/contrib/test_publicip.py
index 6c5a31a..891cfc8 100644
--- a/tests/modules/contrib/test_publicip.py
+++ b/tests/modules/contrib/test_publicip.py
@@ -1,5 +1,44 @@
 import pytest
+from unittest import TestCase, mock
 
-def test_load_module():
-    __import__("modules.contrib.publicip")
+import core.config
+import core.widget
+import modules.contrib.publicip
 
+
+def build_module():
+    config = core.config.Config([])
+    return modules.contrib.publicip.Module(config=config, theme=None)
+
+def widget(module):
+    return module.widgets()[0]
+
+class PublicIPTest(TestCase):
+    def test_load_module(self):
+        __import__("modules.contrib.publicip")
+
+    @mock.patch('util.location.public_ip')
+    def test_public_ip(self, public_ip_mock):
+        public_ip_mock.return_value = '5.12.220.2'
+
+        module = build_module()
+        module.update()
+
+        assert widget(module).full_text() == '5.12.220.2'
+
+    @mock.patch('util.location.public_ip')
+    def test_public_ip_with_exception(self, public_ip_mock):
+        public_ip_mock.side_effect = Exception
+
+        module = build_module()
+        module.update()
+
+        assert widget(module).full_text() == 'n/a'
+
+    @mock.patch('util.location.public_ip')
+    def test_interval_seconds(self, public_ip_mock):
+        public_ip_mock.side_effect = Exception
+
+        module = build_module()
+
+        assert module.parameter('interval') == 3600
diff --git a/tests/modules/contrib/test_uptime.py b/tests/modules/contrib/test_uptime.py
index 67c791f..18a59d4 100644
--- a/tests/modules/contrib/test_uptime.py
+++ b/tests/modules/contrib/test_uptime.py
@@ -1,7 +1,26 @@
 import pytest
+from unittest import TestCase, mock
 
-pytest.importorskip("datetime")
+import core.config
+import core.widget
+import modules.contrib.uptime
 
-def test_load_module():
-    __import__("modules.contrib.uptime")
 
+def build_module():
+    config = core.config.Config([])
+    return modules.contrib.uptime.Module(config=config, theme=None)
+
+def widget(module):
+    return module.widgets()[0]
+
+class UptimeTest(TestCase):
+    def test_load_module(self):
+        __import__("modules.contrib.uptime")
+
+    @mock.patch('builtins.open', new_callable=mock.mock_open, read_data='300000 10.45')
+    def test_uptime(self, uptime_mock):
+        module = build_module()
+        module.update()
+
+        uptime_mock.assert_called_with('/proc/uptime', 'r')
+        assert widget(module).full_text() == '3 days, 11:20:00'

From e7b853c667b5785355214380954c83b843c46f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Wed, 2 Sep 2020 22:16:58 -0300
Subject: [PATCH 117/506] Remove useless mock side effect

---
 tests/modules/contrib/test_publicip.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/modules/contrib/test_publicip.py b/tests/modules/contrib/test_publicip.py
index 891cfc8..9584bd7 100644
--- a/tests/modules/contrib/test_publicip.py
+++ b/tests/modules/contrib/test_publicip.py
@@ -35,10 +35,7 @@ class PublicIPTest(TestCase):
 
         assert widget(module).full_text() == 'n/a'
 
-    @mock.patch('util.location.public_ip')
-    def test_interval_seconds(self, public_ip_mock):
-        public_ip_mock.side_effect = Exception
-
+    def test_interval_seconds(self):
         module = build_module()
 
         assert module.parameter('interval') == 3600

From d568ef36228e074b75f277b0aab197b6c588877a Mon Sep 17 00:00:00 2001
From: Cristian Miranda <crism60@gmail.com>
Date: Fri, 4 Sep 2020 17:30:46 -0300
Subject: [PATCH 118/506] [modules/dunstctl]: Toggle dunst v1.5.0+
 notifications using dunstctl

---
 bumblebee_status/modules/contrib/dunstctl.py | 42 ++++++++++++++++++++
 themes/icons/awesome-fonts.json              |  4 ++
 2 files changed, 46 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/dunstctl.py

diff --git a/bumblebee_status/modules/contrib/dunstctl.py b/bumblebee_status/modules/contrib/dunstctl.py
new file mode 100644
index 0000000..1b7649c
--- /dev/null
+++ b/bumblebee_status/modules/contrib/dunstctl.py
@@ -0,0 +1,42 @@
+# pylint: disable=C0111,R0903
+
+"""
+Toggle dunst notifications using dunstctl.
+
+When notifications are paused using this module dunst doesn't get killed and you'll keep getting notifications on the background that will be displayed when unpausing.
+This is specially useful if you're using dunst's scripting (https://wiki.archlinux.org/index.php/Dunst#Scripting), which requires dunst to be running. Scripts will be executed when dunst gets unpaused.
+
+Requires:
+    * dunst v1.5.0+
+
+contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
+"""
+
+import core.module
+import core.widget
+import core.input
+
+import util.cli
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(""))
+        self._paused = self.__isPaused()
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.toggle_status)
+
+    def toggle_status(self, event):
+        self._paused = self.__isPaused()
+        if self._paused:
+            util.cli.execute("dunstctl set-paused false")
+        else:
+            util.cli.execute("dunstctl set-paused true")
+        self._paused = not self._paused
+
+    def __isPaused(self):
+        return util.cli.execute("dunstctl is-paused").strip() == "true"
+
+    def state(self, widget):
+        if self._paused:
+            return ["muted", "warning"]
+        return ["unmuted"]
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index ca8d38f..963bcea 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -257,6 +257,10 @@
     "muted": { "prefix": "" },
     "unmuted": { "prefix": "" }
   },
+  "dunstctl": {
+    "muted": { "prefix": "" },
+    "unmuted": { "prefix": "" }
+  },
   "twmn": {
     "muted": { "prefix": "" },
     "unmuted": { "prefix": "" }

From 100568206ad9a138fc9ef447a3341549d63d17a9 Mon Sep 17 00:00:00 2001
From: Cristian Miranda <crism60@gmail.com>
Date: Sat, 5 Sep 2020 18:05:16 -0300
Subject: [PATCH 119/506] [modules/thunderbird]: Thunderbird's unread email
 counts by inbox

---
 .../modules/contrib/thunderbird.py            | 89 +++++++++++++++++++
 themes/icons/awesome-fonts.json               |  3 +
 2 files changed, 92 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/thunderbird.py

diff --git a/bumblebee_status/modules/contrib/thunderbird.py b/bumblebee_status/modules/contrib/thunderbird.py
new file mode 100644
index 0000000..5240e6b
--- /dev/null
+++ b/bumblebee_status/modules/contrib/thunderbird.py
@@ -0,0 +1,89 @@
+# pylint: disable=C0111,R0903
+
+"""
+Displays the unread emails count for one or more Thunderbird inboxes
+
+Parameters:
+    * thunderbird.home: Absolute path of your .thunderbird directory (e.g.: /home/pi/.thunderbird)
+    * thunderbird.inboxes: Comma separated values for all MSF inboxes and their parent directory (account) (e.g.: imap.gmail.com/INBOX.msf,outlook.office365.com/Work.msf)
+
+Tips:
+    * You can run the following command in order to list all your Thunderbird inboxes
+
+        find ~/.thunderbird -name '*.msf' | awk -F '/' '{print $(NF-1)"/"$(NF)}'
+
+contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
+"""
+
+import core.module
+import core.widget
+import core.decorators
+import core.input
+
+import util.cli
+
+
+class Module(core.module.Module):
+    @core.decorators.every(minutes=1)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.thunderbird))
+
+        self.__total = 0
+        self.__label = ""
+        self.__inboxes = []
+
+        self.__home = self.parameter("home", "")
+        inboxes = self.parameter("inboxes", "")
+        if inboxes:
+            self.__inboxes = util.format.aslist(inboxes)
+
+    def thunderbird(self, _):
+        return str(self.__label)
+
+    def update(self):
+        try:
+            self.__total = 0
+            self.__label = ""
+
+            stream = self.__getThunderbirdStream()
+            unread = self.__getUnreadMessagesByInbox(stream)
+
+            counts = []
+            for inbox in self.__inboxes:
+                count = unread[inbox]
+                self.__total += int(count)
+                counts.append(count)
+
+            self.__label = "/".join(counts)
+
+        except Exception as err:
+            self.__label = err
+
+    def __getThunderbirdStream(self):
+        cmd = (
+            "find "
+            + self.__home
+            + " -name '*.msf' -exec grep -REo 'A2=[0-9]' {} + | grep"
+        )
+        for inbox in self.__inboxes:
+            cmd += " -e {}".format(inbox)
+        cmd += "| awk -F / '{print $(NF-1)\"/\"$(NF)}'"
+
+        return util.cli.execute(cmd, shell=True).strip().split("\n")
+
+    def __getUnreadMessagesByInbox(self, stream):
+        unread = {}
+        for line in stream:
+            entry = line.split(":A2=")
+            inbox = entry[0]
+            count = entry[1]
+            unread[inbox] = count
+
+        return unread
+
+    def state(self, widget):
+        if self.__total > 0:
+            return ["warning"]
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index ca8d38f..8a6f1f2 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -293,5 +293,8 @@
   "speedtest": {
     "running": { "prefix": ["\uf251", "\uf252", "\uf253"] },
 	"not-running": { "prefix": "\uf144" }
+  },
+  "thunderbird": {
+    "prefix": ""
   }
 }

From 965e7b2453e7e3dcb460d1e328a25214ef8c254d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 6 Sep 2020 14:00:32 +0200
Subject: [PATCH 120/506] [modules/spotify] improve update mechanism

instead of updating the widget list during each update, create the list
of widgets during initialization, and later only update the widget
states.

see #702
---
 bumblebee_status/modules/contrib/spotify.py | 70 +++++++++++----------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 85b8c31..3192088 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -25,7 +25,6 @@ import core.input
 import core.decorators
 import util.format
 
-
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
@@ -43,6 +42,39 @@ class Module(core.module.Module):
         self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
                 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
 
+        widget_map = {}
+        for widget_name in self.__layout:
+            widget = self.add_widget(name=widget_name)
+            if widget_name == "spotify.prev":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": self.__cmd + "Previous",
+                }
+                widget.set("state", "prev")
+            elif widget_name == "spotify.pause":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": self.__cmd + "PlayPause",
+                }
+            elif widget_name == "spotify.next":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": self.__cmd + "Next",
+                }
+                widget.set("state", "next")
+            elif widget_name == "spotify.song":
+                widget.set("state", "song")
+                widget.full_text(self.__song)
+            else:
+                raise KeyError(
+                    "The spotify module does not have a {widget_name!r} widget".format(
+                        widget_name=widget_name
+                    )
+                )
+        for widget, callback_options in widget_map.items():
+            core.input.register(widget, **callback_options)
+
+
     def hidden(self):
         return self.string_song == ""
 
@@ -62,23 +94,10 @@ class Module(core.module.Module):
 
     def update(self):
         try:
-            self.clear_widgets()
             self.__get_song()
 
-            widget_map = {}
-            for widget_name in self.__layout:
-                widget = self.add_widget(name=widget_name)
-                if widget_name == "spotify.prev":
-                    widget_map[widget] = {
-                        "button": core.input.LEFT_MOUSE,
-                        "cmd": self.__cmd + "Previous",
-                    }
-                    widget.set("state", "prev")
-                elif widget_name == "spotify.pause":
-                    widget_map[widget] = {
-                        "button": core.input.LEFT_MOUSE,
-                        "cmd": self.__cmd + "PlayPause",
-                    }
+            for widget in self.widgets():
+                if widget.name == "spotify.pause":
                     playback_status = str(
                         dbus.Interface(
                             dbus.SessionBus().get_object(
@@ -92,25 +111,8 @@ class Module(core.module.Module):
                         widget.set("state", "playing")
                     else:
                         widget.set("state", "paused")
-                elif widget_name == "spotify.next":
-                    widget_map[widget] = {
-                        "button": core.input.LEFT_MOUSE,
-                        "cmd": self.__cmd + "Next",
-                    }
-                    widget.set("state", "next")
-                elif widget_name == "spotify.song":
-                    widget.set("state", "song")
-                    widget.full_text(self.__song)
-                else:
-                    raise KeyError(
-                        "The spotify module does not have a {widget_name!r} widget".format(
-                            widget_name=widget_name
-                        )
-                    )
-            for widget, callback_options in widget_map.items():
-                core.input.register(widget, **callback_options)
 
-        except Exception:
+        except Exception as e:
             self.__song = ""
 
     @property

From 3a5365a2c3bde494c79595e19674c1760debaba6 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 6 Sep 2020 14:09:18 +0200
Subject: [PATCH 121/506] [doc] add testing guidelines, general improvements

---
 docs/development/general.rst | 37 +++++++++---------------------------
 docs/development/index.rst   |  1 +
 docs/development/testing.rst | 33 ++++++++++++++++++++++++++++++++
 docs/modules.rst             | 36 ++++++++++++++++++++++++++++++++---
 4 files changed, 76 insertions(+), 31 deletions(-)
 create mode 100644 docs/development/testing.rst

diff --git a/docs/development/general.rst b/docs/development/general.rst
index 824d1a7..0ec89a0 100644
--- a/docs/development/general.rst
+++ b/docs/development/general.rst
@@ -1,34 +1,15 @@
 General guidelines
 ==================
 
-Writing unit tests
-------------------
+Not much, right now. If you have an idea and some code, just
+create a PR, I will gladly review and comment (and, likely, merge)
 
-Some general hints:
+Just one minor note: ``bumblebee-status`` is mostly a one-person,
+spare-time project, so please be patient when answering an issue,
+question or PR takes a while.
 
-- Tests should run with just Python Standard Library modules installed
-  (i.e. if there are additional requirements, the test should be skipped
-  if those are missing)
-- Tests should run even if there is no network connectivity (please mock
-  urllib calls, for example)
-- Tests should be stable and not require modifications every time the
-  tested code's implementation changes slightly (been there / done that)
+Also, the (small) community that has gathered around ``bumblebee-status``
+is extremely friendly and helpful, so don't hesitate to create issues
+with questions, somebody will always come up with a useful answer.
 
-Right now, ``bumblebee-status`` is moving away from Python's
-built-in ``unittest`` framework (tests located inside ``tests/``)
-and towards ``pytest`` (tests located inside ``pytests/``).
-
-First implication: To run the new tests, you need to have ``pytest``
-installed, it is not part of the Python Standard Library. Most
-distributions call the package ``python-pytest`` or ``python3-pytest``
-or something similar (or you just use ``pip install --use pytest``)
-
-Aside from that, you just write your tests using ``pytest`` as usual,
-with one big caveat:
-
-**If** you create a new directory inside ``pytests/``, you need to
-also create a file called ``__init__.py`` inside that, otherwise,
-modules won't load correctly.
-
-For examples, just browse the existing code. A good, minimal sample
-for unit testing ``bumblebee-status`` is ``pytests/core/test_event.py``.
+:)
diff --git a/docs/development/index.rst b/docs/development/index.rst
index 179dee0..6881fdb 100644
--- a/docs/development/index.rst
+++ b/docs/development/index.rst
@@ -8,4 +8,5 @@ Developer's Guide
    general
    module
    theme
+   testing
 
diff --git a/docs/development/testing.rst b/docs/development/testing.rst
new file mode 100644
index 0000000..c5c9375
--- /dev/null
+++ b/docs/development/testing.rst
@@ -0,0 +1,33 @@
+Testing guidelines
+==================
+
+Writing unit tests
+------------------
+
+Some general hints:
+
+- Tests should run with just Python Standard Library modules installed
+  (i.e. if there are additional requirements, the test should be skipped
+  if those are missing)
+- Tests should run even if there is no network connectivity (please mock
+  urllib calls, for example)
+- Tests should be stable and not require modifications every time the
+  tested code's implementation changes slightly (been there / done that)
+
+Right now, ``bumblebee-status`` uses the ``pytest`` framework, and its
+unit tests are located inside the ``tests/`` subdirectory.
+
+First implication: To run the new tests, you need to have ``pytest``
+installed, it is not part of the Python Standard Library. Most
+distributions call the package ``python-pytest`` or ``python3-pytest``
+or something similar (or you just use ``pip install --use pytest``)
+
+Aside from that, you just write your tests using ``pytest`` as usual,
+with one big caveat:
+
+**If** you create a new directory inside ``tests/``, you need to
+also create a file called ``__init__.py`` inside that, otherwise,
+modules won't load correctly.
+
+For examples, just browse the existing code. A good, minimal sample
+for unit testing ``bumblebee-status`` is ``tests/core/test_event.py``.
diff --git a/docs/modules.rst b/docs/modules.rst
index 09879f7..18b3806 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -278,6 +278,7 @@ Parameters:
     * vault.location: Location of the password store (defaults to ~/.password-store)
     * vault.offx: x-axis offset of popup menu (defaults to 0)
     * vault.offy: y-axis offset of popup menu (defaults to 0)
+    * vault.text: Text to display on the widget (defaults to <click-for-password>)
 
 Many thanks to `bbernhard <https://github.com/bbernhard>`_ for the idea!
 
@@ -294,6 +295,9 @@ Parameters:
       and appending a file '~/.config/i3/config.<screen name>' for every screen.
     * xrandr.autoupdate: If set to 'false', does *not* invoke xrandr automatically. Instead, the
       module will only refresh when displays are enabled or disabled (defaults to true)
+    * xrandr.exclude: Comma-separated list of display name prefixes to exclude
+    * xrandr.autotoggle: Boolean flag to automatically enable new displays (defaults to false)
+    * xrandr.autotoggle_side: Which side to put autotoggled displays on ('right' or 'left', defaults to 'right')
 
 Requires the following python module:
     * (optional) i3 - if present, the need for updating the widget list is auto-detected
@@ -636,9 +640,6 @@ Displays DNF package update information (<security>/<bugfixes>/<enhancements>/<o
 Requires the following executable:
     * dnf
 
-Parameters:
-    * dnf.interval: Time in minutes between two consecutive update checks (defaults to 30 minutes)
-
 .. image:: ../screenshots/dnf.png
 
 docker_ps
@@ -660,6 +661,19 @@ contributed by `eknoes <https://github.com/eknoes>`_ - many thanks!
 
 .. image:: ../screenshots/dunst.png
 
+dunstctl
+~~~~~~~~
+
+Toggle dunst notifications using dunstctl.
+
+When notifications are paused using this module dunst doesn't get killed and you'll keep getting notifications on the background that will be displayed when unpausing.
+This is specially useful if you're using dunst's scripting (https://wiki.archlinux.org/index.php/Dunst#Scripting), which requires dunst to be running. Scripts will be executed when dunst gets unpaused.
+
+Requires:
+    * dunst v1.5.0+
+
+contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
+
 getcrypto
 ~~~~~~~~~
 
@@ -1303,6 +1317,22 @@ contributed by `chdorb <https://github.com/chdorb>`_ - many thanks!
 
 .. image:: ../screenshots/taskwarrior.png
 
+thunderbird
+~~~~~~~~~~~
+
+Displays the unread emails count for one or more Thunderbird inboxes
+
+Parameters:
+    * thunderbird.home: Absolute path of your .thunderbird directory (e.g.: /home/pi/.thunderbird)
+    * thunderbird.inboxes: Comma separated values for all MSF inboxes and their parent directory (account) (e.g.: imap.gmail.com/INBOX.msf,outlook.office365.com/Work.msf)
+
+Tips:
+    * You can run the following command in order to list all your Thunderbird inboxes
+
+        find ~/.thunderbird -name '*.msf' | awk -F '/' '{print $(NF-1)"/"$(NF)}'
+
+contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
+
 timetz
 ~~~~~~
 

From b79c19b616a0f42216ed69c57dd4097341166c4c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 6 Sep 2020 14:27:17 +0200
Subject: [PATCH 122/506] [modules/spotify] fix song not shown issue

the previous commit accidentially removed the song display. re-add that
and also add a bit of logging for troubleshooting.
---
 bumblebee_status/modules/contrib/spotify.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 3192088..c3f4d1f 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -25,6 +25,8 @@ import core.input
 import core.decorators
 import util.format
 
+import logging
+
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
@@ -63,8 +65,7 @@ class Module(core.module.Module):
                 }
                 widget.set("state", "next")
             elif widget_name == "spotify.song":
-                widget.set("state", "song")
-                widget.full_text(self.__song)
+                pass
             else:
                 raise KeyError(
                     "The spotify module does not have a {widget_name!r} widget".format(
@@ -111,8 +112,12 @@ class Module(core.module.Module):
                         widget.set("state", "playing")
                     else:
                         widget.set("state", "paused")
+                elif widget.name == "spotify.song":
+                    widget.set("state", "song")
+                    widget.full_text(self.__song)
 
         except Exception as e:
+            logging.exception(e)
             self.__song = ""
 
     @property

From 070fe865ddd47607316afd0e0f38e5d4a0480a2c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 9 Sep 2020 14:15:16 +0200
Subject: [PATCH 123/506] [modules/spotify] update in the background

to rule out issues in the dbus communication, update the spotify module
in the background.

see #702
---
 bumblebee_status/modules/contrib/spotify.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index c3f4d1f..078ccd2 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -31,6 +31,8 @@ class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
 
+        self.background = True
+
         self.__layout = util.format.aslist(
             self.parameter(
                 "layout", "spotify.song,spotify.prev,spotify.pause,spotify.next",

From 2390dfa946fa7b05ca44ecd678f0aeb737390533 Mon Sep 17 00:00:00 2001
From: Cristian Miranda <crism60@gmail.com>
Date: Thu, 10 Sep 2020 17:42:19 -0300
Subject: [PATCH 124/506] docs[dunstctl]: Added missing screenshot

---
 docs/modules.rst         |   2 ++
 screenshots/dunstctl.png | Bin 0 -> 37370 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 screenshots/dunstctl.png

diff --git a/docs/modules.rst b/docs/modules.rst
index 18b3806..72f59a5 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -674,6 +674,8 @@ Requires:
 
 contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
 
+.. image:: ../screenshots/dunstctl.png
+
 getcrypto
 ~~~~~~~~~
 
diff --git a/screenshots/dunstctl.png b/screenshots/dunstctl.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aef636e15119df2b37c5a8270faad681268eb0c
GIT binary patch
literal 37370
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

literal 0
HcmV?d00001


From 4621de95b5507b99e6fa33057c2a5d30a433e32f Mon Sep 17 00:00:00 2001
From: Cristian Miranda <crism60@gmail.com>
Date: Thu, 10 Sep 2020 17:42:41 -0300
Subject: [PATCH 125/506] docs[thunderbird]: Added missing screenshot

---
 docs/modules.rst            |   2 ++
 screenshots/thunderbird.png | Bin 0 -> 12067 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 screenshots/thunderbird.png

diff --git a/docs/modules.rst b/docs/modules.rst
index 72f59a5..9319671 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1335,6 +1335,8 @@ Tips:
 
 contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
 
+.. image:: ../screenshots/thunderbird.png
+
 timetz
 ~~~~~~
 
diff --git a/screenshots/thunderbird.png b/screenshots/thunderbird.png
new file mode 100644
index 0000000000000000000000000000000000000000..7baffd83af1aaef750953a36b7689fc9341caf00
GIT binary patch
literal 12067
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
Ip~k`g1D@1-0RR91

literal 0
HcmV?d00001


From fcbb89db90f531e242a9ac13ecff55321155c37e Mon Sep 17 00:00:00 2001
From: Tobias Witek <tobi@tobi-wan-kenobi.at>
Date: Sun, 13 Sep 2020 11:16:57 +0200
Subject: [PATCH 126/506] [modules/spotify] make global dbus object

instead of creating a new dbus instance during each update interval,
reuse one dbus instance.

see #702
---
 bumblebee_status/modules/contrib/spotify.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 078ccd2..25bff6f 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -39,6 +39,7 @@ class Module(core.module.Module):
             )
         )
 
+        self.__bus = dbus.SessionBus()
         self.__song = ""
         self.__pause = ""
         self.__format = self.parameter("format", "{artist} - {title}")
@@ -82,7 +83,7 @@ class Module(core.module.Module):
         return self.string_song == ""
 
     def __get_song(self):
-        bus = dbus.SessionBus()
+        bus = self.__bus
         spotify = bus.get_object(
             "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
         )
@@ -103,7 +104,7 @@ class Module(core.module.Module):
                 if widget.name == "spotify.pause":
                     playback_status = str(
                         dbus.Interface(
-                            dbus.SessionBus().get_object(
+                            self.__bus.get_object(
                                 "org.mpris.MediaPlayer2.spotify",
                                 "/org/mpris/MediaPlayer2",
                             ),

From aa6238a5c6f5781ebd136810e115ba297ee15a23 Mon Sep 17 00:00:00 2001
From: Tobias Witek <tobi@tobi-wan-kenobi.at>
Date: Sun, 13 Sep 2020 11:19:05 +0200
Subject: [PATCH 127/506] [modules/spotify] properly initialize widgets

see #702
---
 bumblebee_status/modules/contrib/spotify.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 25bff6f..77960b7 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -68,7 +68,8 @@ class Module(core.module.Module):
                 }
                 widget.set("state", "next")
             elif widget_name == "spotify.song":
-                pass
+                widget.set("state", "song")
+                widget.full_text(self.__song)
             else:
                 raise KeyError(
                     "The spotify module does not have a {widget_name!r} widget".format(
@@ -115,9 +116,6 @@ class Module(core.module.Module):
                         widget.set("state", "playing")
                     else:
                         widget.set("state", "paused")
-                elif widget.name == "spotify.song":
-                    widget.set("state", "song")
-                    widget.full_text(self.__song)
 
         except Exception as e:
             logging.exception(e)

From e42f09b27e86bd9b8c4104ac7122d7c6b9cc1b9a Mon Sep 17 00:00:00 2001
From: Tobias Witek <tobi@tobi-wan-kenobi.at>
Date: Sun, 13 Sep 2020 11:21:39 +0200
Subject: [PATCH 128/506] [bumblebee] Make update lock on input non-blocking

for consistent lock behaviour, make the input loop lock non-blocking.

see #702
---
 bumblebee-status | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index dda14e4..f6bcb94 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -68,10 +68,10 @@ def handle_input(output, update_lock):
                         modules[event["name"]] = True
                 except ValueError:
                     pass
-            update_lock.acquire()
-            core.event.trigger("update", modules.keys())
-            core.event.trigger("draw")
-            update_lock.release()
+            if update_lock.acquire(blocking=False) == True:
+                core.event.trigger("update", modules.keys(), force=True)
+                core.event.trigger("draw")
+                update_lock.release()
 
         poll.unregister(sys.stdin.fileno())
 

From 8a4fc409478294a721c82167dfc15091bfaad662 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 15 Sep 2020 20:27:50 +0200
Subject: [PATCH 129/506] Revert "[modules/spotify] properly initialize
 widgets"

This reverts commit aa6238a5c6f5781ebd136810e115ba297ee15a23.
---
 bumblebee_status/modules/contrib/spotify.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 77960b7..25bff6f 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -68,8 +68,7 @@ class Module(core.module.Module):
                 }
                 widget.set("state", "next")
             elif widget_name == "spotify.song":
-                widget.set("state", "song")
-                widget.full_text(self.__song)
+                pass
             else:
                 raise KeyError(
                     "The spotify module does not have a {widget_name!r} widget".format(
@@ -116,6 +115,9 @@ class Module(core.module.Module):
                         widget.set("state", "playing")
                     else:
                         widget.set("state", "paused")
+                elif widget.name == "spotify.song":
+                    widget.set("state", "song")
+                    widget.full_text(self.__song)
 
         except Exception as e:
             logging.exception(e)

From 806b97895e29d151eea8db1779df267792a560e0 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 16 Sep 2020 09:09:49 +0200
Subject: [PATCH 130/506] [bumblebee] add small sleep before update

in some situations/modules (spotify, playerctl, etc.), it is possible
that a state change (e.g. play/pause) takes a small time to actually
propagate into the whole system (e.g. until the next "update" retrieves
the correct value).

To alleviate that, add a very small delay to the update.
---
 bumblebee-status | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee-status b/bumblebee-status
index f6bcb94..d7e8dab 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -68,6 +68,8 @@ def handle_input(output, update_lock):
                         modules[event["name"]] = True
                 except ValueError:
                     pass
+
+            time.sleep(0.2)
             if update_lock.acquire(blocking=False) == True:
                 core.event.trigger("update", modules.keys(), force=True)
                 core.event.trigger("draw")

From 1759c33cf30dc1ee2bab71bf79380c626da99d6e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 16 Sep 2020 09:13:48 +0200
Subject: [PATCH 131/506] [bumblebee] make input delay configurable

make the delay before updating the bar after an input event
configurable as engine.input_delay.

see #702
---
 bumblebee-status | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index d7e8dab..0c1623e 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -40,7 +40,7 @@ class CommandSocket(object):
         os.unlink(self.__name)
 
 
-def handle_input(output, update_lock):
+def handle_input(output, config, update_lock):
     with CommandSocket() as cmdsocket:
         poll = select.poll()
         poll.register(sys.stdin.fileno(), select.POLLIN)
@@ -69,7 +69,9 @@ def handle_input(output, update_lock):
                 except ValueError:
                     pass
 
-            time.sleep(0.2)
+            delay = float(config.get("engine.input_delay", 0.2))
+            if delay > 0:
+                time.sleep(delay)
             if update_lock.acquire(blocking=False) == True:
                 core.event.trigger("update", modules.keys(), force=True)
                 core.event.trigger("draw")
@@ -102,7 +104,7 @@ def main():
     core.input.register(None, core.input.WHEEL_DOWN, "i3-msg workspace next_on_output")
 
     update_lock = threading.Lock()
-    input_thread = threading.Thread(target=handle_input, args=(output, update_lock, ))
+    input_thread = threading.Thread(target=handle_input, args=(output, config, update_lock, ))
     input_thread.daemon = True
     input_thread.start()
 

From 9e80d4d9076d5bbe812e7ce6754a1c427e0a8ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sat, 26 Sep 2020 10:05:19 -0300
Subject: [PATCH 132/506] Add amixer tests

---
 tests/modules/contrib/test_amixer.py | 154 +++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/tests/modules/contrib/test_amixer.py b/tests/modules/contrib/test_amixer.py
index b1cfbf0..4ff37a3 100644
--- a/tests/modules/contrib/test_amixer.py
+++ b/tests/modules/contrib/test_amixer.py
@@ -1,5 +1,159 @@
 import pytest
 
+import util.cli
+import core.config
+import modules.contrib.amixer
+
+@pytest.fixture
+def module_mock(request):
+    def _module_mock(config = []):
+        return modules.contrib.amixer.Module(
+            config=core.config.Config(config),
+            theme=None
+        )
+
+    yield _module_mock
+
+@pytest.fixture
+def amixer_mock():
+    def _mock(device='Master', volume='10%', state='on'):
+        return """
+        Simple mixer control '{device}',0
+          Capabilities: pvolume pswitch pswitch-joined
+          Playback channels: Front Left - Front Right
+          Limits: Playback 0 - 65536
+          Mono:
+          Front Left: Playback 55705 [{volume}%] [{state}]
+          Front Right: Playback 55705 [{volume}%] [{state}]
+        """.format(
+            device=device,
+            volume=volume,
+            state=state
+        )
+
+    return _mock
+
 def test_load_module():
     __import__("modules.contrib.amixer")
 
+def test_initial_full_text(module_mock, amixer_mock, mocker):
+    module = module_mock()
+    assert module.widget().full_text() == 'n/a'
+
+def test_input_registration(mocker):
+   input_register = mocker.patch('core.input.register')
+
+   module = modules.contrib.amixer.Module(
+       config=core.config.Config([]),
+       theme=None
+   )
+
+   input_register.assert_any_call(
+       module,
+       button=core.input.WHEEL_DOWN,
+       cmd=module.decrease_volume
+   )
+
+   input_register.assert_any_call(
+       module,
+       button=core.input.WHEEL_UP,
+       cmd=module.increase_volume
+   )
+
+   input_register.assert_any_call(
+       module,
+       button=core.input.LEFT_MOUSE,
+       cmd=module.toggle
+   )
+
+def test_volume_update(module_mock, amixer_mock, mocker):
+    mocker.patch(
+        'util.cli.execute',
+        return_value=amixer_mock(volume='25%', state='on')
+    )
+
+    module = module_mock()
+    widget = module.widget()
+
+    module.update()
+    assert widget.full_text() == '25%'
+    assert module.state(widget) == ['unmuted']
+
+def test_muted_update(module_mock, amixer_mock, mocker):
+    mocker.patch(
+        'util.cli.execute',
+        return_value=amixer_mock(volume='50%', state='off')
+    )
+
+    module = module_mock()
+    widget = module.widget()
+
+    module.update()
+    assert widget.full_text() == '50%'
+    assert module.state(widget) == ['warning', 'muted']
+
+def test_exception_update(module_mock, mocker):
+    mocker.patch(
+        'util.cli.execute',
+        side_effect=Exception
+    )
+
+    module = module_mock()
+    widget = module.widget()
+
+    module.update()
+    assert widget.full_text() == 'n/a'
+
+def test_unavailable_amixer(module_mock, mocker):
+    mocker.patch('util.cli.execute', return_value='Invalid')
+
+    module = module_mock()
+    widget = module.widget()
+
+    module.update()
+    assert widget.full_text() == '0%'
+
+def test_toggle(module_mock, mocker):
+    command = mocker.patch('util.cli.execute')
+    module = module_mock()
+    module.toggle(False)
+    command.assert_called_once_with('amixer -q set Master,0 toggle')
+
+def test_default_volume(module_mock, mocker):
+    module = module_mock()
+
+    command = mocker.patch('util.cli.execute')
+    module.increase_volume(False)
+    command.assert_called_once_with('amixer -q set Master,0 4%+')
+
+    command = mocker.patch('util.cli.execute')
+    module.decrease_volume(False)
+    command.assert_called_once_with('amixer -q set Master,0 4%-')
+
+def test_custom_volume(module_mock, mocker):
+    module = module_mock(['-p', 'amixer.percent_change=25'])
+
+    command = mocker.patch('util.cli.execute')
+    module.increase_volume(False)
+    command.assert_called_once_with('amixer -q set Master,0 25%+')
+
+    command = mocker.patch('util.cli.execute')
+    module.decrease_volume(False)
+    command.assert_called_once_with('amixer -q set Master,0 25%-')
+
+def test_custom_device(module_mock, mocker):
+    mocker.patch('util.cli.execute')
+    module = module_mock(['-p', 'amixer.device=CustomMaster'])
+
+    command = mocker.patch('util.cli.execute')
+    module.toggle(False)
+    command.assert_called_once_with('amixer -q set CustomMaster toggle')
+
+    command = mocker.patch('util.cli.execute')
+    module.increase_volume(False)
+    command.assert_called_once_with('amixer -q set CustomMaster 4%+')
+
+    command = mocker.patch('util.cli.execute')
+    module.decrease_volume(False)
+    command.assert_called_once_with('amixer -q set CustomMaster 4%-')
+

From 7d85ba87d543148544e74a2693dc280dbc80fa2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Mon, 28 Sep 2020 19:38:18 -0300
Subject: [PATCH 133/506] Force feedparser to 6.0.0b1

---
 .travis.yml                  | 2 +-
 requirements/modules/rss.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 78aa402..dbc9da8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ install:
   - pip install -U coverage==4.3 pytest pytest-mock freezegun
   - pip install codeclimate-test-reporter
   - pip install i3-py Pillow Babel DateTime python-dateutil
-  - pip install docker feedparser i3ipc
+  - pip install docker feedparser==6.0.0b1 i3ipc
   - pip install netifaces power
   - pip install psutil pytz
   - pip install requests simplejson
diff --git a/requirements/modules/rss.txt b/requirements/modules/rss.txt
index 1b25361..4373b0d 100644
--- a/requirements/modules/rss.txt
+++ b/requirements/modules/rss.txt
@@ -1 +1 @@
-feedparser
+feedparser==6.0.0b1

From 4df495601a8c8605b29a06eebf58cf95a9cca679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Thu, 1 Oct 2020 19:10:46 -0300
Subject: [PATCH 134/506] Create symbolic links

---
 bumblebee_status/modules/contrib/arch_update.py      | 1 +
 bumblebee_status/modules/contrib/battery_upower.py   | 1 +
 bumblebee_status/modules/contrib/layout_xkbswitch.py | 1 +
 bumblebee_status/modules/core/layout_xkb.py          | 1 +
 tests/modules/contrib/test_arch-update.py            | 2 ++
 tests/modules/contrib/test_battery-upower.py         | 3 +++
 tests/modules/contrib/test_layout-xkbswitch.py       | 2 ++
 tests/modules/core/test_layout-xkb.py                | 2 ++
 8 files changed, 13 insertions(+)
 create mode 120000 bumblebee_status/modules/contrib/arch_update.py
 create mode 120000 bumblebee_status/modules/contrib/battery_upower.py
 create mode 120000 bumblebee_status/modules/contrib/layout_xkbswitch.py
 create mode 120000 bumblebee_status/modules/core/layout_xkb.py

diff --git a/bumblebee_status/modules/contrib/arch_update.py b/bumblebee_status/modules/contrib/arch_update.py
new file mode 120000
index 0000000..57fd99f
--- /dev/null
+++ b/bumblebee_status/modules/contrib/arch_update.py
@@ -0,0 +1 @@
+arch-update.py
\ No newline at end of file
diff --git a/bumblebee_status/modules/contrib/battery_upower.py b/bumblebee_status/modules/contrib/battery_upower.py
new file mode 120000
index 0000000..4a7bb68
--- /dev/null
+++ b/bumblebee_status/modules/contrib/battery_upower.py
@@ -0,0 +1 @@
+battery-upower.py
\ No newline at end of file
diff --git a/bumblebee_status/modules/contrib/layout_xkbswitch.py b/bumblebee_status/modules/contrib/layout_xkbswitch.py
new file mode 120000
index 0000000..e7d6b94
--- /dev/null
+++ b/bumblebee_status/modules/contrib/layout_xkbswitch.py
@@ -0,0 +1 @@
+layout-xkbswitch.py
\ No newline at end of file
diff --git a/bumblebee_status/modules/core/layout_xkb.py b/bumblebee_status/modules/core/layout_xkb.py
new file mode 120000
index 0000000..f2e8037
--- /dev/null
+++ b/bumblebee_status/modules/core/layout_xkb.py
@@ -0,0 +1 @@
+layout-xkb.py
\ No newline at end of file
diff --git a/tests/modules/contrib/test_arch-update.py b/tests/modules/contrib/test_arch-update.py
index 6a1c172..b11187b 100644
--- a/tests/modules/contrib/test_arch-update.py
+++ b/tests/modules/contrib/test_arch-update.py
@@ -3,3 +3,5 @@ import pytest
 def test_load_module():
     __import__("modules.contrib.arch-update")
 
+def test_load_symbolic_link_module():
+    __import__("modules.contrib.arch_update")
diff --git a/tests/modules/contrib/test_battery-upower.py b/tests/modules/contrib/test_battery-upower.py
index cb62a16..d129679 100644
--- a/tests/modules/contrib/test_battery-upower.py
+++ b/tests/modules/contrib/test_battery-upower.py
@@ -5,3 +5,6 @@ pytest.importorskip("dbus")
 def test_load_module():
     __import__("modules.contrib.battery-upower")
 
+def test_load_symbolic_link_module():
+    __import__("modules.contrib.battery_upower")
+
diff --git a/tests/modules/contrib/test_layout-xkbswitch.py b/tests/modules/contrib/test_layout-xkbswitch.py
index 08cfd96..b709254 100644
--- a/tests/modules/contrib/test_layout-xkbswitch.py
+++ b/tests/modules/contrib/test_layout-xkbswitch.py
@@ -3,3 +3,5 @@ import pytest
 def test_load_module():
     __import__("modules.contrib.layout-xkbswitch")
 
+def test_load_symbolic_link_module():
+    __import__("modules.contrib.layout_xkbswitch")
diff --git a/tests/modules/core/test_layout-xkb.py b/tests/modules/core/test_layout-xkb.py
index 8eacfad..852b9da 100644
--- a/tests/modules/core/test_layout-xkb.py
+++ b/tests/modules/core/test_layout-xkb.py
@@ -5,3 +5,5 @@ pytest.importorskip("xkbgroup")
 def test_load_module():
     __import__("modules.core.layout-xkb")
 
+def test_load_symbolic_link_module():
+    __import__("modules.core.layout_xkb")

From a253e703280d836f57997980ba0ef80f57b5e56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Thu, 1 Oct 2020 19:16:51 -0300
Subject: [PATCH 135/506] Update documentation

---
 docs/development/module.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/development/module.rst b/docs/development/module.rst
index 1d6e716..113a6f7 100644
--- a/docs/development/module.rst
+++ b/docs/development/module.rst
@@ -11,6 +11,7 @@ Adding a new module to ``bumblebee-status`` is straight-forward:
    ``bumblebee-status`` (i.e. a module called
    ``bumblebee_status/modules/contrib/test.py`` will be loaded using
    ``bumblebee-status -m test``)
+-  The module name must follow the `Python Naming Conventions <https://www.python.org/dev/peps/pep-0008/#package-and-module-names>`_
 -  See below for how to actually write the module
 -  Test (run ``bumblebee-status`` in the CLI)
 -  Make sure your changes don’t break anything: ``./coverage.sh``

From f2153b95a535445f520d94c29b9eca3ae6906633 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 2 Oct 2020 09:34:53 +0200
Subject: [PATCH 136/506] [doc] add scrolling parameters

see #710
---
 docs/features.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/features.rst b/docs/features.rst
index f050a2b..f48ebf0 100644
--- a/docs/features.rst
+++ b/docs/features.rst
@@ -87,6 +87,19 @@ attention, it will remain hidden. Note that this parameter is specified
 *in addition* to ``-m`` (i.e. to autohide the CPU module, you would use
 ``bumblebee-status -m cpu memory traffic -a cpu``).
 
+Scrolling widget text
+-----------------------
+Some widgets support scrolling for long text (e.g. most music player
+widgets, rss, etc.). Those have some additional settings for customizing
+the scrolling behaviour, in particular:
+
+  - ``scrolling.width``: Desired width of the scrolling panel
+  - ``scrolling.makewide``: If set to true, extends texts shorter than
+    ``scrolling.width`` to that width
+  - ``scrolling.bounce``: If set to true, bounces the text when it reaches
+    the end, otherwise, it behaves like marquee (scroll-through) text
+  - ``scrolling.speed``: Defines the scroll speed, in characters per update
+
 Additional widget theme settings
 --------------------------------
 

From 130bfc0f0b76ccae20ef1d71016ac29203a5acdf Mon Sep 17 00:00:00 2001
From: Niladri Bhattacharjee <47671104+Niladri29@users.noreply.github.com>
Date: Sat, 3 Oct 2020 00:53:04 +0530
Subject: [PATCH 137/506] Some minor

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7c26ddd..18e76a5 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Supported Python versions: 3.4, 3.5, 3.6, 3.7, 3.8
 Supported FontAwesome version: 4 (free version of 5 doesn't include some of the icons)
 
 ---
-**NOTE**
+***NOTE***
 
 The default branch for this project is `main` - I'm keeping `master` around for backwards compatibility (I do not want to break anybody's setup), but the default branch is now `main`!
 

From 823a57d2616c5251c44d7039b10fc2c8759a7154 Mon Sep 17 00:00:00 2001
From: Joshua Barrass <josh.barrass.work@gmail.com>
Date: Sun, 4 Oct 2020 14:44:27 +0100
Subject: [PATCH 138/506] Add org-mode TODO module

---
 bumblebee_status/modules/contrib/todo_org.py | 57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/todo_org.py

diff --git a/bumblebee_status/modules/contrib/todo_org.py b/bumblebee_status/modules/contrib/todo_org.py
new file mode 100644
index 0000000..05fa90b
--- /dev/null
+++ b/bumblebee_status/modules/contrib/todo_org.py
@@ -0,0 +1,57 @@
+# pylint: disable=C0111,R0903
+"""Displays the number of todo items from an org-mode file
+Parameters:
+    * todo_org.file:      File to read TODOs from (defaults to ~/org/todo.org)
+    * todo_org.remaining: False by default. When true, will output the number of remaining todos instead of the number completed (i.e. 1/4 means 1 of 4 todos remaining, rather than 1 of 4 todos completed)
+Based on the todo module by `codingo <https://github.com/codingo>`
+"""
+
+import re
+import os.path
+
+import core.module
+import core.widget
+import core.input
+from util.format import asbool
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.output))
+
+        self.__todo_regex = re.compile("^\\s*\\*+\\s*TODO")
+        self.__done_regex = re.compile("^\\s*\\*+\\s*DONE")
+
+        self.__doc = os.path.expanduser(
+            self.parameter("file", "~/org/todo.org")
+        )
+        self.__remaining = asbool(self.parameter("remaining", "False"))
+        self.__todo, self.__total = self.count_items()
+        core.input.register(
+            self,
+            button=core.input.LEFT_MOUSE,
+            cmd="emacs {}".format(self.__doc)
+        )
+
+    def output(self, widget):
+        if self.__remaining:
+            return "TODO: {}/{}".format(self.__todo, self.__total)
+        return "TODO: {}/{}".format(self.__total-self.__todo, self.__total)
+
+    def update(self):
+        self.__todo, self.__total = self.count_items()
+
+    def count_items(self):
+        todo, total = 0, 0
+        try:
+            with open(self.__doc, "r") as f:
+                for line in f:
+                    if self.__todo_regex.match(line.upper()) is not None:
+                        todo += 1
+                        total += 1
+                    elif self.__done_regex.match(line.upper()) is not None:
+                        total += 1
+            return todo, total
+        except OSError:
+            return -1, -1
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From fbe57643131c483970dfe2269f893beb928aef00 Mon Sep 17 00:00:00 2001
From: Joshua Barrass <josh.barrass.work@gmail.com>
Date: Sun, 4 Oct 2020 15:36:24 +0100
Subject: [PATCH 139/506] Add "concise controls" to spotify module

---
 bumblebee_status/modules/contrib/spotify.py | 24 +++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 25bff6f..2295609 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -8,6 +8,8 @@ Parameters:
       Available values are: {album}, {title}, {artist}, {trackNumber}
     * spotify.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
+    * spotify.concise_controls: When enabled, allows spotify to be controlled from just the spotify.song widget.
+      Concise controls are:     Left Click: Toggle Pause; Wheel Up: Next; Wheel Down; Previous.
 
 contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 
@@ -68,15 +70,33 @@ class Module(core.module.Module):
                 }
                 widget.set("state", "next")
             elif widget_name == "spotify.song":
-                pass
+                if util.format.asbool(self.parameter("concise_controls", "false")):
+                    widget_map[widget] = [
+                        {
+                            "button": core.input.LEFT_MOUSE,
+                            "cmd": self.__cmd + "PlayPause",
+                        }, {
+                            "button": core.input.WHEEL_UP,
+                            "cmd": self.__cmd + "Next",
+                        }, {
+                            "button": core.input.WHEEL_DOWN,
+                            "cmd": self.__cmd + "Previous",
+                        }
+                    ]
             else:
                 raise KeyError(
                     "The spotify module does not have a {widget_name!r} widget".format(
                         widget_name=widget_name
                     )
                 )
+        # is there any reason the inputs can't be directly registered above?
         for widget, callback_options in widget_map.items():
-            core.input.register(widget, **callback_options)
+            if isinstance(callback_options, dict):
+                core.input.register(widget, **callback_options)
+
+            elif isinstance(callback_options, list): # used by concise_controls
+                for opts in callback_options:
+                    core.input.register(widget, **opts)
 
 
     def hidden(self):

From 0a7a4150e090204365be5ae85328a4966ea1ef75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sun, 4 Oct 2020 15:35:13 -0300
Subject: [PATCH 140/506] Create arch-update tests

---
 tests/modules/contrib/test_arch-update.py | 69 +++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/tests/modules/contrib/test_arch-update.py b/tests/modules/contrib/test_arch-update.py
index b11187b..53c2941 100644
--- a/tests/modules/contrib/test_arch-update.py
+++ b/tests/modules/contrib/test_arch-update.py
@@ -1,7 +1,76 @@
 import pytest
 
+import util.cli
+import core.config
+import modules.contrib.arch_update
+
+@pytest.fixture
+def module():
+    module = modules.contrib.arch_update.Module(
+        config=core.config.Config([]),
+        theme=None
+    )
+
+    yield module
+
 def test_load_module():
     __import__("modules.contrib.arch-update")
 
 def test_load_symbolic_link_module():
     __import__("modules.contrib.arch_update")
+
+def test_with_one_package(module, mocker):
+    command = mocker.patch(
+        'util.cli.execute',
+        return_value=(0, 'bumblebee 1.0.0')
+    )
+
+    module.update()
+
+    command.assert_called_with(
+        'checkupdates',
+        ignore_errors=True,
+        return_exitcode=True
+    )
+
+    widget = module.widget()
+    assert widget.full_text() == 'Update Arch: 1'
+    assert module.state(widget) == None
+    assert module.hidden() == False
+
+def test_with_two_packages(module, mocker):
+    command = mocker.patch(
+        'util.cli.execute',
+        return_value=(0, 'bumblebee 1.0.0\ni3wm 3.5.7')
+    )
+
+    module.update()
+
+    widget = module.widget()
+    assert widget.full_text() == 'Update Arch: 2'
+    assert module.state(widget) == 'warning'
+    assert module.hidden() == False
+
+def test_with_no_packages(module, mocker):
+    mocker.patch('util.cli.execute', return_value=(2, ''))
+
+    module.update()
+
+    widget = module.widget()
+    assert widget.full_text() == 'Update Arch: 0'
+    assert module.state(widget) == None
+    assert module.hidden() == True
+
+def test_with_unknown_code(module, mocker):
+    mocker.patch('util.cli.execute', return_value=(99, 'error'))
+    logger = mocker.patch('logging.error')
+
+    module.update()
+
+    logger.assert_called_with('checkupdates exited with {}: {}'.format(99, 'error'))
+
+    widget = module.widget()
+    assert widget.full_text() == 'Update Arch: 0'
+    assert module.state(widget) == 'warning'
+    assert module.hidden() == False
+

From 180a87e0c3165da8e34298bc336c3184786cb825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sun, 4 Oct 2020 15:57:48 -0300
Subject: [PATCH 141/506] Create dunstctl tests

---
 bumblebee_status/modules/contrib/dunstctl.py |  1 +
 tests/modules/contrib/test_dunstctl.py       | 67 ++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 tests/modules/contrib/test_dunstctl.py

diff --git a/bumblebee_status/modules/contrib/dunstctl.py b/bumblebee_status/modules/contrib/dunstctl.py
index 1b7649c..24b93f0 100644
--- a/bumblebee_status/modules/contrib/dunstctl.py
+++ b/bumblebee_status/modules/contrib/dunstctl.py
@@ -27,6 +27,7 @@ class Module(core.module.Module):
 
     def toggle_status(self, event):
         self._paused = self.__isPaused()
+
         if self._paused:
             util.cli.execute("dunstctl set-paused false")
         else:
diff --git a/tests/modules/contrib/test_dunstctl.py b/tests/modules/contrib/test_dunstctl.py
new file mode 100644
index 0000000..e6a7ce3
--- /dev/null
+++ b/tests/modules/contrib/test_dunstctl.py
@@ -0,0 +1,67 @@
+import pytest
+
+import util.cli
+import core.config
+import modules.contrib.dunstctl
+
+def build_module():
+    return modules.contrib.dunstctl.Module(
+        config=core.config.Config([]),
+        theme=None
+    )
+
+def test_load_module():
+    __import__("modules.contrib.dunstctl")
+
+def test_dunst_running(mocker):
+    command = mocker.patch('util.cli.execute', return_value='false')
+
+    module = build_module()
+    module.update()
+
+    command.assert_called_with('dunstctl is-paused')
+
+    widget = module.widget()
+    assert module.state(widget) == ['unmuted']
+
+def test_dunst_paused(mocker):
+    command = mocker.patch('util.cli.execute', return_value='true')
+
+    module = build_module()
+    module.update()
+
+    command.assert_called_with('dunstctl is-paused')
+
+    widget = module.widget()
+    assert module.state(widget) == ['muted', 'warning']
+
+def test_toggle_status_pause(mocker):
+    command = mocker.patch('util.cli.execute')
+    command.side_effect = ['true', 'true', None]
+
+    module = build_module()
+    module.toggle_status(False)
+
+    command.assert_any_call('dunstctl set-paused false')
+
+def test_toggle_status_unpause(mocker):
+    command = mocker.patch('util.cli.execute')
+    command.side_effect = ['false', 'false', None]
+
+    module = build_module()
+    module.toggle_status(False)
+
+    command.assert_called_with('dunstctl set-paused true')
+
+def test_input_register(mocker):
+    command = mocker.patch('util.cli.execute')
+    input_register = mocker.patch('core.input.register')
+
+    module = build_module()
+
+    input_register.assert_called_with(
+        module,
+        button=core.input.LEFT_MOUSE,
+        cmd=module.toggle_status
+    )
+

From 04a2ea438bb9147df2e95d45235b55254b2cfbfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Wed, 7 Oct 2020 17:36:58 -0300
Subject: [PATCH 142/506] Create layout-xkbswitch tests

---
 .../modules/contrib/layout-xkbswitch.py       |  4 +-
 .../modules/contrib/test_layout-xkbswitch.py  | 51 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/layout-xkbswitch.py b/bumblebee_status/modules/contrib/layout-xkbswitch.py
index 767deb9..a749522 100644
--- a/bumblebee_status/modules/contrib/layout-xkbswitch.py
+++ b/bumblebee_status/modules/contrib/layout-xkbswitch.py
@@ -19,13 +19,13 @@ class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.current_layout))
 
-        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__next_keymap)
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.next_keymap)
         self.__current_layout = self.__get_current_layout()
 
     def current_layout(self, _):
         return self.__current_layout
 
-    def __next_keymap(self, event):
+    def next_keymap(self, event):
         util.cli.execute("xkb-switch -n", ignore_errors=True)
 
     def __get_current_layout(self):
diff --git a/tests/modules/contrib/test_layout-xkbswitch.py b/tests/modules/contrib/test_layout-xkbswitch.py
index b709254..404aa73 100644
--- a/tests/modules/contrib/test_layout-xkbswitch.py
+++ b/tests/modules/contrib/test_layout-xkbswitch.py
@@ -1,7 +1,58 @@
 import pytest
 
+import util.cli
+import core.config
+import modules.contrib.layout_xkbswitch
+
+def build_module():
+    return modules.contrib.layout_xkbswitch.Module(
+        config=core.config.Config([]),
+        theme=None
+    )
+
 def test_load_module():
     __import__("modules.contrib.layout-xkbswitch")
 
 def test_load_symbolic_link_module():
     __import__("modules.contrib.layout_xkbswitch")
+
+def test_current_layout(mocker):
+    command = mocker.patch('util.cli.execute')
+    command.side_effect = ['en', 'en']
+
+    module = build_module()
+    widget = module.widget()
+
+    module.update()
+
+    assert widget.full_text() == 'en'
+
+def test_current_layout_exception(mocker):
+    command = mocker.patch('util.cli.execute')
+    command.side_effect = RuntimeError
+
+    module = build_module()
+    widget = module.widget()
+
+    module.update()
+
+    assert widget.full_text() == ['n/a']
+
+def test_input_register(mocker):
+    input_register = mocker.patch('core.input.register')
+
+    module = build_module()
+
+    input_register.assert_called_with(
+        module,
+        button=core.input.LEFT_MOUSE,
+        cmd=module.next_keymap
+    )
+
+def test_next_keymap(mocker):
+    command = mocker.patch('util.cli.execute')
+
+    module = build_module()
+    module.next_keymap(False)
+
+    command.assert_called_with('xkb-switch -n', ignore_errors=True)

From 1912f3053d3d6e7bb815e465697a7ec4e52c23fe Mon Sep 17 00:00:00 2001
From: Martin Morlot <martinmorlot@gmail.com>
Date: Fri, 9 Oct 2020 10:59:45 +0200
Subject: [PATCH 143/506] [Bluetooth2] fixed the execution of the toggle state

---
 bumblebee_status/modules/contrib/bluetooth2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/bluetooth2.py b/bumblebee_status/modules/contrib/bluetooth2.py
index b8fac09..52474b9 100644
--- a/bumblebee_status/modules/contrib/bluetooth2.py
+++ b/bumblebee_status/modules/contrib/bluetooth2.py
@@ -69,7 +69,7 @@ class Module(core.module.Module):
         )
 
         logging.debug("bt: toggling bluetooth")
-        core.util.execute(cmd)
+        util.cli.execute(cmd)
 
     def state(self, widget):
         """Get current state."""

From 1a7ae9ecc69bb43732713ae6f4c9901e459cd99b Mon Sep 17 00:00:00 2001
From: w1kl4s <w1kl4s@protonmail.com>
Date: Wed, 14 Oct 2020 18:07:29 +0200
Subject: [PATCH 144/506] Fix Python 3.9 compatibility

Replaced threading.Thread.isAlive() with threading.Thread.is_alive()
---
 bumblebee_status/core/module.py           | 2 +-
 bumblebee_status/modules/contrib/apt.py   | 2 +-
 bumblebee_status/modules/core/redshift.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 23ea4b5..f4bac7e 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -123,7 +123,7 @@ class Module(core.input.Object):
 
     def update_wrapper(self):
         if self.background == True:
-            if self.__thread and self.__thread.isAlive():
+            if self.__thread and self.__thread.is_alive():
                 return # skip this update interval
             self.__thread = threading.Thread(target=self.internal_update, args=(True,))
             self.__thread.start()
diff --git a/bumblebee_status/modules/contrib/apt.py b/bumblebee_status/modules/contrib/apt.py
index 2a41aea..b7200bb 100644
--- a/bumblebee_status/modules/contrib/apt.py
+++ b/bumblebee_status/modules/contrib/apt.py
@@ -65,7 +65,7 @@ class Module(core.module.Module):
         )
 
     def update(self):
-        if self.__thread and self.__thread.isAlive():
+        if self.__thread and self.__thread.is_alive():
             return
 
         self.__thread = threading.Thread(target=get_apt_check_info, args=(self,))
diff --git a/bumblebee_status/modules/core/redshift.py b/bumblebee_status/modules/core/redshift.py
index c60ed9e..c6735b1 100644
--- a/bumblebee_status/modules/core/redshift.py
+++ b/bumblebee_status/modules/core/redshift.py
@@ -101,7 +101,7 @@ class Module(core.module.Module):
         return val
 
     def update(self):
-        if self.__thread is not None and self.__thread.isAlive():
+        if self.__thread is not None and self.__thread.is_alive():
             return
         self.__thread = threading.Thread(target=get_redshift_value, args=(self,))
         self.__thread.start()

From 3c0499ba56759e40732ded9cf607f83b595c6aab Mon Sep 17 00:00:00 2001
From: Joachim Mathes <joachim_mathes@web.de>
Date: Sun, 18 Oct 2020 15:34:52 +0200
Subject: [PATCH 145/506] Provide alternative dunstctl implementation

---
 bumblebee_status/modules/contrib/dunstctl.py | 41 ++++++++-------
 tests/modules/contrib/test_dunstctl.py       | 54 ++++++--------------
 themes/icons/ascii.json                      | 11 ++++
 themes/icons/awesome-fonts.json              |  3 +-
 themes/icons/ionicons.json                   |  5 ++
 5 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/bumblebee_status/modules/contrib/dunstctl.py b/bumblebee_status/modules/contrib/dunstctl.py
index 24b93f0..3c803a4 100644
--- a/bumblebee_status/modules/contrib/dunstctl.py
+++ b/bumblebee_status/modules/contrib/dunstctl.py
@@ -1,43 +1,42 @@
 # pylint: disable=C0111,R0903
 
-"""
-Toggle dunst notifications using dunstctl.
+"""Toggle dunst notifications using dunstctl.
 
-When notifications are paused using this module dunst doesn't get killed and you'll keep getting notifications on the background that will be displayed when unpausing.
-This is specially useful if you're using dunst's scripting (https://wiki.archlinux.org/index.php/Dunst#Scripting), which requires dunst to be running. Scripts will be executed when dunst gets unpaused.
+When notifications are paused using this module dunst doesn't get killed and
+you'll keep getting notifications on the background that will be displayed when
+unpausing. This is specially useful if you're using dunst's scripting
+(https://wiki.archlinux.org/index.php/Dunst#Scripting), which requires dunst to
+be running. Scripts will be executed when dunst gets unpaused.
 
 Requires:
     * dunst v1.5.0+
 
 contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
+contributed by `joachimmathes <https://github.com/joachimmathes>`_ - many thanks!
 """
 
 import core.module
 import core.widget
 import core.input
-
 import util.cli
 
 
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(""))
-        self._paused = self.__isPaused()
-        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.toggle_status)
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__toggle_state)
+        self.__states = {"unknown": ["unknown", "critical"],
+                         "true": ["muted", "warning"],
+                         "false": ["unmuted"]}
 
-    def toggle_status(self, event):
-        self._paused = self.__isPaused()
-
-        if self._paused:
-            util.cli.execute("dunstctl set-paused false")
-        else:
-            util.cli.execute("dunstctl set-paused true")
-        self._paused = not self._paused
-
-    def __isPaused(self):
-        return util.cli.execute("dunstctl is-paused").strip() == "true"
+    def __toggle_state(self, event):
+        util.cli.execute("dunstctl set-paused toggle", ignore_errors=True)
 
     def state(self, widget):
-        if self._paused:
-            return ["muted", "warning"]
-        return ["unmuted"]
+        return self.__states[self.__is_dunst_paused()]
+
+    def __is_dunst_paused(self):
+        result = util.cli.execute("dunstctl is-paused",
+                                  return_exitcode=True,
+                                  ignore_errors=True)
+        return result[1].rstrip() if result[0] == 0 else "unknown"
diff --git a/tests/modules/contrib/test_dunstctl.py b/tests/modules/contrib/test_dunstctl.py
index e6a7ce3..db77fe3 100644
--- a/tests/modules/contrib/test_dunstctl.py
+++ b/tests/modules/contrib/test_dunstctl.py
@@ -14,54 +14,34 @@ def test_load_module():
     __import__("modules.contrib.dunstctl")
 
 def test_dunst_running(mocker):
-    command = mocker.patch('util.cli.execute', return_value='false')
+    command = mocker.patch('util.cli.execute', return_value=(0, "false"))
 
     module = build_module()
     module.update()
-
-    command.assert_called_with('dunstctl is-paused')
-
     widget = module.widget()
-    assert module.state(widget) == ['unmuted']
+
+    actual = module.state(widget)
+    command.assert_called_with('dunstctl is-paused', return_exitcode=True, ignore_errors=True)
+    assert actual == ['unmuted']
 
 def test_dunst_paused(mocker):
-    command = mocker.patch('util.cli.execute', return_value='true')
+    command = mocker.patch('util.cli.execute', return_value=(0, "true"))
 
     module = build_module()
     module.update()
-
-    command.assert_called_with('dunstctl is-paused')
-
     widget = module.widget()
-    assert module.state(widget) == ['muted', 'warning']
 
-def test_toggle_status_pause(mocker):
-    command = mocker.patch('util.cli.execute')
-    command.side_effect = ['true', 'true', None]
+    actual = module.state(widget)
+    command.assert_called_with('dunstctl is-paused', return_exitcode=True, ignore_errors=True)
+    assert actual == ['muted', 'warning']
+
+def test_dunst_off(mocker):
+    command = mocker.patch('util.cli.execute', return_value=(1, "dontcare"))
 
     module = build_module()
-    module.toggle_status(False)
-
-    command.assert_any_call('dunstctl set-paused false')
-
-def test_toggle_status_unpause(mocker):
-    command = mocker.patch('util.cli.execute')
-    command.side_effect = ['false', 'false', None]
-
-    module = build_module()
-    module.toggle_status(False)
-
-    command.assert_called_with('dunstctl set-paused true')
-
-def test_input_register(mocker):
-    command = mocker.patch('util.cli.execute')
-    input_register = mocker.patch('core.input.register')
-
-    module = build_module()
-
-    input_register.assert_called_with(
-        module,
-        button=core.input.LEFT_MOUSE,
-        cmd=module.toggle_status
-    )
+    module.update()
+    widget = module.widget()
 
+    actual = module.state(widget)
+    command.assert_called_with('dunstctl is-paused', return_exitcode=True, ignore_errors=True)
+    assert actual == ['unknown', 'critical']
diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index 2580d32..77ef931 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -355,6 +355,17 @@
       "prefix": "dunst"
     }
   },
+  "dunstctl": {
+    "muted": {
+      "prefix": "dunst(muted)"
+    },
+    "unmuted": {
+      "prefix": "dunst"
+    },
+    "unknown": {
+      "prefix": "dunst(unknown)"
+    }
+  },
   "twmn": {
     "muted": {
       "prefix": "twmn"
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 2ac9061..2d05dc6 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -259,7 +259,8 @@
   },
   "dunstctl": {
     "muted": { "prefix": "" },
-    "unmuted": { "prefix": "" }
+    "unmuted": { "prefix": "" },
+    "unknown": { "prefix": "" }
   },
   "twmn": {
     "muted": { "prefix": "" },
diff --git a/themes/icons/ionicons.json b/themes/icons/ionicons.json
index b510cc1..c9931f1 100644
--- a/themes/icons/ionicons.json
+++ b/themes/icons/ionicons.json
@@ -187,6 +187,11 @@
     "muted": { "prefix": "\uf39a" },
     "unmuted": { "prefix": "\uf39b" }
   },
+  "dunstctl": {
+    "muted": { "prefix": "\uf39a" },
+    "unmuted": { "prefix": "\uf39b" },
+    "unknown": { "prefix": "\uf142" }
+  },
   "twmn": {
     "muted": { "prefix": "\uf1f6" },
     "unmuted": { "prefix": "\uf0f3" }

From 9b82e736a00b4743c1149da67c0fe7eddd78f484 Mon Sep 17 00:00:00 2001
From: Joe Finney <spxtr@users.noreply.github.com>
Date: Sun, 25 Oct 2020 17:29:00 -0700
Subject: [PATCH 146/506] Fix arch-updates off-by-one.

There's a newline in the output so this overcounts by one.
---
 bumblebee_status/modules/contrib/arch-update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/arch-update.py b/bumblebee_status/modules/contrib/arch-update.py
index c93545b..ed9ae58 100644
--- a/bumblebee_status/modules/contrib/arch-update.py
+++ b/bumblebee_status/modules/contrib/arch-update.py
@@ -40,7 +40,7 @@ class Module(core.module.Module):
         )
 
         if code == 0:
-            self.__packages = len(result.split("\n"))
+            self.__packages = len(result.strip().split("\n"))
         elif code == 2:
             self.__packages = 0
         else:

From 5e96b63c603e01a1a1dcac60be8e769b6c5993fb Mon Sep 17 00:00:00 2001
From: Frank Scherrer <fscherrer@cinemo.com>
Date: Mon, 26 Oct 2020 08:28:55 +0100
Subject: [PATCH 147/506] update python name in shebang to respect PEP-0394

---
 bumblebee-status | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee-status b/bumblebee-status
index dda14e4..bd4ab1f 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import sys

From a811c9c886003aef252ab555c1d3e75512607e30 Mon Sep 17 00:00:00 2001
From: Martin Morlot <martinmorlot@gmail.com>
Date: Fri, 6 Nov 2020 12:13:35 +0100
Subject: [PATCH 148/506] [module] Improved smartstatus with combined_singles

Added combined_singles as way to detect the drives that are permanently inside your machine and not plugged via USB.

As USB flash drives without smartstatus sometime caused the module to crash.
---
 bumblebee_status/modules/contrib/smartstatus.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/smartstatus.py b/bumblebee_status/modules/contrib/smartstatus.py
index b5f3037..81060da 100644
--- a/bumblebee_status/modules/contrib/smartstatus.py
+++ b/bumblebee_status/modules/contrib/smartstatus.py
@@ -10,7 +10,7 @@ Requires the following executables:
     * smartctl
 
 Parameters:
-    * smartstatus.display: how to display (defaults to 'combined', other choices: 'seperate' or 'singles')
+    * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'seperate' or 'singles')
     * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
     * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. 
 """
@@ -38,7 +38,7 @@ class Module(core.module.Module):
         self.create_widgets()
 
     def create_widgets(self):
-        if self.display == "combined":
+        if self.display == "combined" or self.display == "combined_singles":
             widget = self.add_widget()
             widget.set("device", "combined")
             widget.set("assessment", self.combined())
@@ -81,6 +81,8 @@ class Module(core.module.Module):
 
     def combined(self):
         for device in self.devices:
+            if self.display == "combined_singles" and device not in self.drives:
+                    continue
             result = self.smart(device)
             if result == "Fail":
                 return "Fail"

From 08ef42834eb2299ce629218c5fee4d01c76d33a2 Mon Sep 17 00:00:00 2001
From: Tobias Witek <tobi@tobi-wan-kenobi.at>
Date: Fri, 13 Nov 2020 14:56:31 +0100
Subject: [PATCH 149/506] [modules/nic] update documentation to include iwgetid

fixes #734
---
 bumblebee_status/modules/core/nic.py |  1 +
 docs/modules.rst                     | 68 ++++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index d64a14f..41607d9 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -7,6 +7,7 @@ Requires the following python module:
 
 Requires the following executable:
     * iw
+    * (until and including 2.0.5: iwgetid)
 
 Parameters:
     * nic.exclude: Comma-separated list of interface prefixes to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br')
diff --git a/docs/modules.rst b/docs/modules.rst
index 9319671..9ebca7f 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -88,6 +88,20 @@ layout-xkb
 
 Displays the current keyboard layout using libX11
 
+Requires the following library:
+    * libX11.so.6
+and python module:
+    * xkbgroup
+
+Parameters:
+    * layout-xkb.showname: Boolean that indicate whether the full name should be displayed. Defaults to false (only the symbol will be displayed)
+    * layout-xkb.show_variant: Boolean that indecates whether the variant name should be displayed. Defaults to true.
+
+layout_xkb
+~~~~~~~~~~
+
+Displays the current keyboard layout using libX11
+
 Requires the following library:
     * libX11.so.6
 and python module:
@@ -141,6 +155,7 @@ Requires the following python module:
 
 Requires the following executable:
     * iw
+    * (until and including 2.0.5: iwgetid)
 
 Parameters:
     * nic.exclude: Comma-separated list of interface prefixes to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br')
@@ -366,6 +381,16 @@ Requires the following executable:
 
 contributed by `lucassouto <https://github.com/lucassouto>`_ - many thanks!
 
+arch_update
+~~~~~~~~~~~
+
+Check updates to Arch Linux.
+
+Requires the following executable:
+    * checkupdates (from pacman-contrib)
+
+contributed by `lucassouto <https://github.com/lucassouto>`_ - many thanks!
+
 battery
 ~~~~~~~
 
@@ -396,6 +421,18 @@ Parameters:
 
 contributed by `martindoublem <https://github.com/martindoublem>`_ - many thanks!
 
+battery_upower
+~~~~~~~~~~~~~~
+
+Displays battery status, remaining percentage and charging information.
+
+Parameters:
+    * battery-upower.warning      : Warning threshold in % of remaining charge (defaults to 20)
+    * battery-upower.critical     : Critical threshold in % of remaining charge (defaults to 10)
+    * battery-upower.showremaining : If set to true (default) shows the remaining time until the batteries are completely discharged
+
+contributed by `martindoublem <https://github.com/martindoublem>`_ - many thanks!
+
 bluetooth
 ~~~~~~~~~
 
@@ -666,13 +703,17 @@ dunstctl
 
 Toggle dunst notifications using dunstctl.
 
-When notifications are paused using this module dunst doesn't get killed and you'll keep getting notifications on the background that will be displayed when unpausing.
-This is specially useful if you're using dunst's scripting (https://wiki.archlinux.org/index.php/Dunst#Scripting), which requires dunst to be running. Scripts will be executed when dunst gets unpaused.
+When notifications are paused using this module dunst doesn't get killed and
+you'll keep getting notifications on the background that will be displayed when
+unpausing. This is specially useful if you're using dunst's scripting
+(https://wiki.archlinux.org/index.php/Dunst#Scripting), which requires dunst to
+be running. Scripts will be executed when dunst gets unpaused.
 
 Requires:
     * dunst v1.5.0+
 
 contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
+contributed by `joachimmathes <https://github.com/joachimmathes>`_ - many thanks!
 
 .. image:: ../screenshots/dunstctl.png
 
@@ -804,6 +845,16 @@ Requires the following executable:
 
 contributed by `somospocos <https://github.com/somospocos>`_ - many thanks!
 
+layout_xkbswitch
+~~~~~~~~~~~~~~~~
+
+Displays and changes the current keyboard layout
+
+Requires the following executable:
+    * xkb-switch
+
+contributed by `somospocos <https://github.com/somospocos>`_ - many thanks!
+
 libvirtvms
 ~~~~~~~~~~
 
@@ -1190,7 +1241,7 @@ Requires the following executables:
     * smartctl
 
 Parameters:
-    * smartstatus.display: how to display (defaults to 'combined', other choices: 'seperate' or 'singles')
+    * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'seperate' or 'singles')
     * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
     * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. 
 
@@ -1234,6 +1285,8 @@ Parameters:
       Available values are: {album}, {title}, {artist}, {trackNumber}
     * spotify.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
+    * spotify.concise_controls: When enabled, allows spotify to be controlled from just the spotify.song widget.
+      Concise controls are:     Left Click: Toggle Pause; Wheel Up: Next; Wheel Down; Previous.
 
 contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 
@@ -1377,6 +1430,15 @@ contributed by `codingo <https://github.com/codingo>`_ - many thanks!
 
 .. image:: ../screenshots/todo.png
 
+todo_org
+~~~~~~~~
+
+Displays the number of todo items from an org-mode file
+Parameters:
+    * todo_org.file:      File to read TODOs from (defaults to ~/org/todo.org)
+    * todo_org.remaining: False by default. When true, will output the number of remaining todos instead of the number completed (i.e. 1/4 means 1 of 4 todos remaining, rather than 1 of 4 todos completed)
+Based on the todo module by `codingo <https://github.com/codingo>`
+
 traffic
 ~~~~~~~
 

From 02465ea0c2e54a68654ad4fd26981286581a3e75 Mon Sep 17 00:00:00 2001
From: James Baumgarten <jebaum@ucla.edu>
Date: Mon, 23 Nov 2020 17:31:12 -0800
Subject: [PATCH 150/506] add rofication module

---
 .../modules/contrib/rofication.py             | 48 +++++++++++++++++++
 themes/icons/awesome-fonts.json               |  3 ++
 2 files changed, 51 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/rofication.py

diff --git a/bumblebee_status/modules/contrib/rofication.py b/bumblebee_status/modules/contrib/rofication.py
new file mode 100644
index 0000000..79e6afd
--- /dev/null
+++ b/bumblebee_status/modules/contrib/rofication.py
@@ -0,0 +1,48 @@
+"""Rofication indicator
+
+    https://github.com/DaveDavenport/Rofication
+    simple module to show an icon + the number of notifications stored in rofication
+    module will have normal highlighting if there are zero notifications,
+                     "warning" highlighting if there are nonzero notifications,
+                     "critical" highlighting if there are any critical notifications
+"""
+
+import core.module
+import core.widget
+import core.decorators
+
+import sys
+import socket
+
+class Module(core.module.Module):
+    @core.decorators.every(seconds=5)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.full_text))
+        self.__critical = False
+        self.__numnotifications = 0
+
+
+    def full_text(self, widgets):
+        with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as client:
+            client.connect("/tmp/rofi_notification_daemon")
+            # below code will fetch two numbers in a list, e.g. ['22', '1']
+            # first is total number of notifications, second is number of critical notifications
+            client.sendall(bytes("num", "utf-8"))
+            val = client.recv(512)
+            val = val.decode("utf-8")
+            l = val.split('\n',2)
+            self.__numnotifications = int(l[0])
+            self.__critical = bool(int(l[1]))
+            return self.__numnotifications
+
+    def state(self, widget):
+        # rofication doesn't really support the idea of seen vs unseen notifications
+        # marking a message as "seen" actually just sets its urgency to normal
+        # so, doing highlighting if any notifications are present
+        if self.__critical:
+            return ["critical"]
+        elif self.__numnotifications:
+            return ["warning"]
+        return []
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 2d05dc6..9f14da9 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -262,6 +262,9 @@
     "unmuted": { "prefix": "" },
     "unknown": { "prefix": "" }
   },
+  "rofication": {
+    "prefix":  ""
+  },
   "twmn": {
     "muted": { "prefix": "" },
     "unmuted": { "prefix": "" }

From 681bba4f125ec1a3f4c4e9a084144206bd819223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?=
 <6774676+eumiro@users.noreply.github.com>
Date: Sun, 29 Nov 2020 22:14:33 +0100
Subject: [PATCH 151/506] add python 3.9 support

---
 .travis.yml    |  2 ++
 README.md      |  2 +-
 docs/index.rst | 18 +++++++++---------
 setup.cfg      |  1 +
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dbc9da8..4ae69a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
+  - "3.9"
 before_install:
   - sudo apt-get -qq update
 install:
diff --git a/README.md b/README.md
index 18e76a5..75ace2d 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Thanks a lot!
 
 Required i3wm version: 4.12+ (in earlier versions, blocks won't have background colors)
 
-Supported Python versions: 3.4, 3.5, 3.6, 3.7, 3.8
+Supported Python versions: 3.4, 3.5, 3.6, 3.7, 3.8, 3.9
 
 Supported FontAwesome version: 4 (free version of 5 doesn't include some of the icons)
 
diff --git a/docs/index.rst b/docs/index.rst
index 084a8fd..f405d91 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,15 +20,15 @@ feature requests, etc. :)
 
 Thanks a lot!
 
-+------------------------------------+-------------------------+
-| **Required i3wm version**          | 4.12+                   |
-+------------------------------------+-------------------------+
-| **Supported Python versions**      | 3.4, 3.5, 3.6, 3.7, 3.8 |
-+------------------------------------+-------------------------+
-| **Supported FontAwesome versions** | 4 only                  |
-+------------------------------------+-------------------------+
-| **Per-module requirements**        | see :doc:`modules`      |
-+------------------------------------+-------------------------+
++------------------------------------+------------------------------+
+| **Required i3wm version**          | 4.12+                        |
++------------------------------------+------------------------------+
+| **Supported Python versions**      | 3.4, 3.5, 3.6, 3.7, 3.8, 3.9 |
++------------------------------------+------------------------------+
+| **Supported FontAwesome versions** | 4 only                       |
++------------------------------------+------------------------------+
+| **Per-module requirements**        | see :doc:`modules`           |
++------------------------------------+------------------------------+
 
 see :doc:`FAQ` for details on this
 
diff --git a/setup.cfg b/setup.cfg
index 9352f13..081fab6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Topic :: Software Development :: Libraries
     Topic :: Software Development :: Internationalization
     Topic :: Utilities

From d0ee1b06e4394e1f139226ee2b76b286bd7df1ec Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 30 Nov 2020 17:21:17 +0100
Subject: [PATCH 152/506] [modules/nic] make exclude list regular expression
 capable

Allow the usage of regexps in the exclude list, but keep the "this is a
prefix" logic for backwards compatibility.

should address (see #738)
---
 bumblebee_status/modules/core/nic.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 41607d9..667cffa 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -10,7 +10,7 @@ Requires the following executable:
     * (until and including 2.0.5: iwgetid)
 
 Parameters:
-    * nic.exclude: Comma-separated list of interface prefixes to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br')
+    * nic.exclude: Comma-separated list of interface prefixes (supporting regular expressions) to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br,.*:avahi')
     * nic.include: Comma-separated list of interfaces to include
     * nic.states: Comma-separated list of states to show (prefix with '^' to invert - i.e. ^down -> show all devices that are not in state down)
     * nic.format: Format string (defaults to '{intf} {state} {ip} {ssid}')
@@ -32,13 +32,10 @@ class Module(core.module.Module):
     def __init__(self, config, theme):
         widgets = []
         super().__init__(config, theme, widgets)
-        self._exclude = tuple(
-            filter(
-                len,
-                self.parameter("exclude", "lo,virbr,docker,vboxnet,veth,br").split(","),
-            )
+        self._exclude = util.format.aslist(
+            self.parameter("exclude", "lo,virbr,docker,vboxnet,veth,br,.*:avahi")
         )
-        self._include = self.parameter("include", "").split(",")
+        self._include = util.format.aslist(self.parameter("include", ""))
 
         self._states = {"include": [], "exclude": []}
         for state in tuple(
@@ -90,11 +87,18 @@ class Module(core.module.Module):
             return []
         return retval
 
+    def _excluded(self, intf):
+        for e in self._exclude:
+            if re.match(e, intf):
+                return True
+        return False
+
     def _update_widgets(self, widgets):
         self.clear_widgets()
-        interfaces = [
-            i for i in netifaces.interfaces() if not i.startswith(self._exclude)
-        ]
+        interfaces = []
+        for i in netifaces.interfaces():
+            if not self._excluded(i):
+                interfaces.append(i)
         interfaces.extend([i for i in netifaces.interfaces() if i in self._include])
 
         for intf in interfaces:

From f5e6bc12db8da5ab3f2948a02f714e8c14232e5b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 30 Nov 2020 17:22:42 +0100
Subject: [PATCH 153/506] [doc] update doc

---
 docs/modules.rst | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index 9ebca7f..8ec9ecf 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -158,7 +158,7 @@ Requires the following executable:
     * (until and including 2.0.5: iwgetid)
 
 Parameters:
-    * nic.exclude: Comma-separated list of interface prefixes to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br')
+    * nic.exclude: Comma-separated list of interface prefixes (supporting regular expressions) to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br,.*:avahi')
     * nic.include: Comma-separated list of interfaces to include
     * nic.states: Comma-separated list of states to show (prefix with '^' to invert - i.e. ^down -> show all devices that are not in state down)
     * nic.format: Format string (defaults to '{intf} {state} {ip} {ssid}')
@@ -1137,6 +1137,17 @@ publicip
 
 Displays public IP address
 
+rofication
+~~~~~~~~~~
+
+Rofication indicator
+
+https://github.com/DaveDavenport/Rofication
+simple module to show an icon + the number of notifications stored in rofication
+module will have normal highlighting if there are zero notifications,
+                 "warning" highlighting if there are nonzero notifications,
+                 "critical" highlighting if there are any critical notifications
+
 rotation
 ~~~~~~~~
 

From de01d96b915b8a7698f082970dd0ca51ae81afef Mon Sep 17 00:00:00 2001
From: Florian Eich <florian@bmc-labs.com>
Date: Mon, 30 Nov 2020 23:21:21 +0100
Subject: [PATCH 154/506] Change iw call in module nic from link to info

---
 bumblebee_status/modules/core/nic.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 667cffa..70ea1cf 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -134,13 +134,15 @@ class Module(core.module.Module):
             widget.set("state", state)
 
     def get_ssid(self, intf):
-        if self._iswlan(intf) and not self._istunnel(intf) and self.iw:
-            ssid = util.cli.execute("{} dev {} link".format(self.iw, intf))
-            found_ssid = re.findall("SSID:\s(.+)", ssid)
-            if len(found_ssid) > 0:
-                return found_ssid[0]
-            else:
-                return ""
+        if not self._iswlan(intf) or self._istunnel(intf) or not self.iw:
+            return ""
+
+        iw_info = util.cli.execute("{} dev {} info".format(self.iw, intf))
+        for line in iw_info.split("\n"):
+            match = re.match("^\s+ssid\s(.+)$", line)
+            if match:
+                return match.group(1)
+
         return ""
 
 

From a8d1254e067a60d61df8a5c704d3ced57388441c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 1 Dec 2020 15:58:55 +0100
Subject: [PATCH 155/506] [modules/nic] Make regex for SSID a raw string

---
 bumblebee_status/modules/core/nic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 70ea1cf..7dde2f0 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -139,7 +139,7 @@ class Module(core.module.Module):
 
         iw_info = util.cli.execute("{} dev {} info".format(self.iw, intf))
         for line in iw_info.split("\n"):
-            match = re.match("^\s+ssid\s(.+)$", line)
+            match = re.match(r"^\s+ssid\s(.+)$", line)
             if match:
                 return match.group(1)
 

From 2de39be731a540dc98b5879851ff29c80bf3f530 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 2 Dec 2020 11:07:19 +0100
Subject: [PATCH 156/506] [travis/code climate] update to new reporter + small
 fixes

---
 .travis.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ae69a7..00a9074 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
-sudo: false
+dist: xenial
+os: linux
 language: python
+env:
+  global:
+    - CC_TEST_REPORTER_ID=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf 
 python:
   - "3.4"
   - "3.5"
@@ -7,12 +11,15 @@ python:
   - "3.7"
   - "3.8"
   - "3.9"
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 before_install:
-  - sudo apt-get -qq update
+  - apt-get -qq update
 install:
-  - sudo apt-get install python-dbus
-  - pip install -U coverage==4.3 pytest pytest-mock freezegun
-  - pip install codeclimate-test-reporter
+  - apt-get install python-dbus
+  - pip install -U coverage pytest pytest-mock freezegun
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser==6.0.0b1 i3ipc
   - pip install netifaces power
@@ -22,7 +29,5 @@ install:
   - pip install tzlocal
 script:
   - coverage run --source=. -m pytest tests -v
-  - CODECLIMATE_REPO_TOKEN=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf codeclimate-test-reporter
-addons:
-  code_climate:
-    repo_token: 40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

From 3c08eafa4a401b641c48d069e846fbb301e7fe2c Mon Sep 17 00:00:00 2001
From: Florian Eich <florian@bmc-labs.com>
Date: Wed, 2 Dec 2020 19:08:45 +0100
Subject: [PATCH 157/506] Add TiB to disk units, add SI unit option for disk
 space

---
 bumblebee_status/modules/core/disk.py |  8 +++++---
 bumblebee_status/util/format.py       | 21 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/bumblebee_status/modules/core/disk.py b/bumblebee_status/modules/core/disk.py
index 12c7a16..ff0d4f9 100644
--- a/bumblebee_status/modules/core/disk.py
+++ b/bumblebee_status/modules/core/disk.py
@@ -8,6 +8,7 @@ Parameters:
     * disk.path: Path to calculate disk usage from (defaults to /)
     * disk.open: Which application / file manager to launch (default xdg-open)
     * disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to '{path} {used}/{size} ({percent:05.02f}%)')
+    * disk.system: Unit system to use - SI (KB, MB, ...) or IEC (KiB, MiB, ...) (defaults to 'IEC')
 """
 
 import os
@@ -25,6 +26,7 @@ class Module(core.module.Module):
 
         self._path = self.parameter("path", "/")
         self._format = self.parameter("format", "{used}/{size} ({percent:05.02f}%)")
+        self._system = self.parameter("system", "IEC")
 
         self._used = 0
         self._left = 0
@@ -38,9 +40,9 @@ class Module(core.module.Module):
         )
 
     def diskspace(self, widget):
-        used_str = util.format.byte(self._used)
-        size_str = util.format.byte(self._size)
-        left_str = util.format.byte(self._left)
+        used_str = util.format.byte(self._used, sys=self._system)
+        size_str = util.format.byte(self._size, sys=self._system)
+        left_str = util.format.byte(self._left, sys=self._system)
         percent_str = self._percent
 
         return self._format.format(
diff --git a/bumblebee_status/util/format.py b/bumblebee_status/util/format.py
index 65242a3..3acf440 100644
--- a/bumblebee_status/util/format.py
+++ b/bumblebee_status/util/format.py
@@ -71,22 +71,33 @@ def astemperature(val, unit="metric"):
     return "{}°{}".format(int(val), __UNITS.get(unit.lower(), __UNITS["default"]))
 
 
-def byte(val, fmt="{:.2f}"):
+def byte(val, fmt="{:.2f}", sys="IEC"):
     """Returns a byte representation of the input value
 
     :param val: value to format, must be convertible into a float
     :param fmt: optional output format string, defaults to {:.2f}
+    :param sys: optional unit system specifier - SI (kilo, Mega, Giga, ...) or
+        IEC (kibi, Mebi, Gibi, ...) - defaults to IEC
 
     :return: byte representation (e.g. <X> KiB, GiB, etc.) of the input value
     :rtype: string
     """
 
+    if sys == "IEC":
+        div = 1024.0
+        units = ["", "Ki", "Mi", "Gi", "Ti"]
+        final = "TiB"
+    elif sys == "SI":
+        div = 1000.0
+        units = ["", "K", "M", "G", "T"]
+        final = "TB"
+
     val = float(val)
-    for unit in ["", "Ki", "Mi", "Gi"]:
-        if val < 1024.0:
+    for unit in units:
+        if val < div:
             return "{}{}B".format(fmt, unit).format(val)
-        val /= 1024.0
-    return "{}GiB".format(fmt).format(val * 1024.0)
+        val /= div
+    return "{}{}".format(fmt).format(val * div, final)
 
 
 __seconds_pattern = re.compile(r"(([\d\.?]+)h)?(([\d\.]+)m)?([\d\.]+)?s?")

From efebc8d0490f9d217e39b2b374b89dd86eb704d2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 2 Dec 2020 20:53:43 +0100
Subject: [PATCH 158/506] [travis] add sudo (accidentially removed)

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00a9074..4566db0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ before_script:
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 before_install:
-  - apt-get -qq update
+  - sudo apt-get -qq update
 install:
-  - apt-get install python-dbus
+  - sudo apt-get install python-dbus
   - pip install -U coverage pytest pytest-mock freezegun
   - pip install i3-py Pillow Babel DateTime python-dateutil
   - pip install docker feedparser==6.0.0b1 i3ipc

From cd851340e2a72342fc10b7ae975c2150bf98db4f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 2 Dec 2020 21:20:40 +0100
Subject: [PATCH 159/506] [pip] updated/fixed dependencies

many thanks to @jayvdb for pointing those out!

fixes #741
---
 bumblebee_status/modules/contrib/deadbeef.py | 2 --
 bumblebee_status/modules/contrib/spaceapi.py | 1 -
 requirements/modules/battery.txt             | 1 +
 requirements/modules/battery_upower_reqs.txt | 1 +
 requirements/modules/currency.txt            | 1 +
 requirements/modules/dunst.txt               | 1 -
 requirements/modules/hddtemp.txt             | 1 -
 requirements/modules/libvirtvms.txt          | 1 +
 requirements/modules/octoprint.txt           | 2 ++
 requirements/modules/spaceapi.txt            | 2 --
 requirements/modules/speedtest.txt           | 1 +
 requirements/modules/yubikey.txt             | 2 +-
 requirements/modules/zpool.txt               | 1 +
 13 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 requirements/modules/battery.txt
 delete mode 100644 requirements/modules/dunst.txt
 delete mode 100644 requirements/modules/hddtemp.txt
 create mode 100644 requirements/modules/libvirtvms.txt
 create mode 100644 requirements/modules/octoprint.txt
 create mode 100644 requirements/modules/speedtest.txt
 create mode 100644 requirements/modules/zpool.txt

diff --git a/bumblebee_status/modules/contrib/deadbeef.py b/bumblebee_status/modules/contrib/deadbeef.py
index 948fdc5..0bbba41 100644
--- a/bumblebee_status/modules/contrib/deadbeef.py
+++ b/bumblebee_status/modules/contrib/deadbeef.py
@@ -5,8 +5,6 @@ some media control bindings.
 Left click toggles pause, scroll up skips the current song, scroll
 down returns to the previous song.
 
-Requires the following library:
-    * subprocess
 Parameters:
     * deadbeef.format:    Format string (defaults to '{artist} - {title}')
       Available values are: {artist}, {title}, {album}, {length},
diff --git a/bumblebee_status/modules/contrib/spaceapi.py b/bumblebee_status/modules/contrib/spaceapi.py
index d29c081..a6c2772 100644
--- a/bumblebee_status/modules/contrib/spaceapi.py
+++ b/bumblebee_status/modules/contrib/spaceapi.py
@@ -9,7 +9,6 @@ an example.
 
 Requires the following libraries:
     * requests
-    * regex
 
 Parameters:
     * spaceapi.url: String representation of the api endpoint
diff --git a/requirements/modules/battery.txt b/requirements/modules/battery.txt
new file mode 100644
index 0000000..d028b9b
--- /dev/null
+++ b/requirements/modules/battery.txt
@@ -0,0 +1 @@
+power
diff --git a/requirements/modules/battery_upower_reqs.txt b/requirements/modules/battery_upower_reqs.txt
index e2182f1..a7fc9f1 100644
--- a/requirements/modules/battery_upower_reqs.txt
+++ b/requirements/modules/battery_upower_reqs.txt
@@ -1 +1,2 @@
 dbus
+power
diff --git a/requirements/modules/currency.txt b/requirements/modules/currency.txt
index f229360..126f5e8 100644
--- a/requirements/modules/currency.txt
+++ b/requirements/modules/currency.txt
@@ -1 +1,2 @@
 requests
+Babel
diff --git a/requirements/modules/dunst.txt b/requirements/modules/dunst.txt
deleted file mode 100644
index 053749f..0000000
--- a/requirements/modules/dunst.txt
+++ /dev/null
@@ -1 +0,0 @@
-dunst
diff --git a/requirements/modules/hddtemp.txt b/requirements/modules/hddtemp.txt
deleted file mode 100644
index b4e9f6f..0000000
--- a/requirements/modules/hddtemp.txt
+++ /dev/null
@@ -1 +0,0 @@
-hddtemp
diff --git a/requirements/modules/libvirtvms.txt b/requirements/modules/libvirtvms.txt
new file mode 100644
index 0000000..76aa22c
--- /dev/null
+++ b/requirements/modules/libvirtvms.txt
@@ -0,0 +1 @@
+libvirt
diff --git a/requirements/modules/octoprint.txt b/requirements/modules/octoprint.txt
new file mode 100644
index 0000000..2e1fb7c
--- /dev/null
+++ b/requirements/modules/octoprint.txt
@@ -0,0 +1,2 @@
+Pillow
+simplejson
diff --git a/requirements/modules/spaceapi.txt b/requirements/modules/spaceapi.txt
index 3a2dc45..f229360 100644
--- a/requirements/modules/spaceapi.txt
+++ b/requirements/modules/spaceapi.txt
@@ -1,3 +1 @@
 requests
-json
-time
diff --git a/requirements/modules/speedtest.txt b/requirements/modules/speedtest.txt
new file mode 100644
index 0000000..4b024b7
--- /dev/null
+++ b/requirements/modules/speedtest.txt
@@ -0,0 +1 @@
+speedtest-cli
diff --git a/requirements/modules/yubikey.txt b/requirements/modules/yubikey.txt
index 0ad4a6b..3466c66 100644
--- a/requirements/modules/yubikey.txt
+++ b/requirements/modules/yubikey.txt
@@ -1 +1 @@
-yubico
+python-yubico
diff --git a/requirements/modules/zpool.txt b/requirements/modules/zpool.txt
new file mode 100644
index 0000000..49fe098
--- /dev/null
+++ b/requirements/modules/zpool.txt
@@ -0,0 +1 @@
+setuptools

From 38c4b46351496aa2cb8bf40e639e58246bc7efbb Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 07:56:36 +0700
Subject: [PATCH 160/506] libvirtvms.txt: Fix PyPI dependency name

Related to https://github.com/tobi-wan-kenobi/bumblebee-status/issues/741
---
 requirements/modules/libvirtvms.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/modules/libvirtvms.txt b/requirements/modules/libvirtvms.txt
index 76aa22c..ff1a357 100644
--- a/requirements/modules/libvirtvms.txt
+++ b/requirements/modules/libvirtvms.txt
@@ -1 +1 @@
-libvirt
+libvirt-python

From 659a0147da7fda458ed3d1c8751eef2483a733d9 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 08:02:12 +0700
Subject: [PATCH 161/506] system.txt: Replace tk with Pillow

Related to https://github.com/tobi-wan-kenobi/bumblebee-status/issues/741
---
 requirements/modules/system.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/modules/system.txt b/requirements/modules/system.txt
index 5d6fce4..aa8980c 100644
--- a/requirements/modules/system.txt
+++ b/requirements/modules/system.txt
@@ -1 +1 @@
-tkinter
+Pillow  # placeholder for tk

From 071a69b2d87776da26a78d0669f754f7081b578d Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 08:02:41 +0700
Subject: [PATCH 162/506] .travis.yml: Install declared PyPI dependencies

---
 .travis.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4566db0..47c124c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,13 +20,7 @@ before_install:
 install:
   - sudo apt-get install python-dbus
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install i3-py Pillow Babel DateTime python-dateutil
-  - pip install docker feedparser==6.0.0b1 i3ipc
-  - pip install netifaces power
-  - pip install psutil pytz
-  - pip install requests simplejson
-  - pip install suntime
-  - pip install tzlocal
+  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:

From 21268d7d861774e7e1a9677b6e77a8076627c1f8 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 10:55:23 +0700
Subject: [PATCH 163/506] Use dbus-python PyPI package

---
 requirements/modules/battery_upower_reqs.txt | 2 +-
 requirements/modules/spotify.txt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/modules/battery_upower_reqs.txt b/requirements/modules/battery_upower_reqs.txt
index a7fc9f1..a8ec395 100644
--- a/requirements/modules/battery_upower_reqs.txt
+++ b/requirements/modules/battery_upower_reqs.txt
@@ -1,2 +1,2 @@
-dbus
+dbus-python
 power
diff --git a/requirements/modules/spotify.txt b/requirements/modules/spotify.txt
index e2182f1..555438c 100644
--- a/requirements/modules/spotify.txt
+++ b/requirements/modules/spotify.txt
@@ -1 +1 @@
-dbus
+dbus-python

From a58454de97d3003fc558284e92392a07bf708910 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 12:54:44 +0700
Subject: [PATCH 164/506] .travis.yml: Allow building dbus-python

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47c124c..72e3881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-dist: xenial
 os: linux
 language: python
 env:
@@ -15,10 +14,11 @@ before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
-before_install:
-  - sudo apt-get -qq update
+addons:
+  apt:
+    packages:
+      libdbus-1-dev
 install:
-  - sudo apt-get install python-dbus
   - pip install -U coverage pytest pytest-mock freezegun
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:

From e0fc98bfb0e813b2bee8db9a040837caf9b8e157 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:48:06 +0100
Subject: [PATCH 165/506] [travis] temporarily exclude dbus and libvirt from
 requirements

since they cause issues in the automated tests, do not install the dbus
and libvirt python libraries.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 72e3881..e9708a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ addons:
       libdbus-1-dev
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
+  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python)
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:

From 3937e73e7df61ade2fc6f45e7e5baa111e10fb7d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 4 Dec 2020 18:53:52 +0100
Subject: [PATCH 166/506] [travis] hopefully fixed test build

locally tested with a xenial image, and this should work.

Unfortunately, cannot get the pygit2 to build against the provided
libgit2-dev, so using the packaged version instead.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e9708a5..a9bb5fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,10 @@ addons:
   apt:
     packages:
       libdbus-1-dev
+      libffi-dev
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python)
+  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python|grep -v Pillow|grep -v pygit2)
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:

From 5ff626398673f2c71044ec488230ef6ac55834bc Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 4 Dec 2020 18:55:21 +0100
Subject: [PATCH 167/506] [travis] forgotten in previous commit

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a9bb5fb..ee38e1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ addons:
     packages:
       libdbus-1-dev
       libffi-dev
+      python3-pygit2
 install:
   - pip install -U coverage pytest pytest-mock freezegun
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python|grep -v Pillow|grep -v pygit2)

From b5988694508e374594b5ffef488851f56676d835 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Fri, 4 Dec 2020 18:48:49 +0700
Subject: [PATCH 168/506] .travis.yml: Add taskwarrior

Taskwarrior package requires task to be installed.
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee38e1e..079ecc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,7 @@ addons:
   apt:
     packages:
       libdbus-1-dev
-      libffi-dev
-      python3-pygit2
+      taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python|grep -v Pillow|grep -v pygit2)

From d0e309ad0f72350e2833d9c84ff523c7f5f7ebb0 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sat, 5 Dec 2020 05:48:59 +0700
Subject: [PATCH 169/506] test_format: Allow 2.00TiB

---
 tests/util/test_format.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/util/test_format.py b/tests/util/test_format.py
index 1e34dec..dc69ced 100644
--- a/tests/util/test_format.py
+++ b/tests/util/test_format.py
@@ -71,7 +71,7 @@ def test_byteformat():
     assert byte(1024 + 512) == "1.50KiB"
     assert byte(1024 * 1024 * 2 + 1024 * 512) == "2.50MiB"
     assert byte(1024 * 1024 * 1024 * 4 + 1024 * 1024 * 512) == "4.50GiB"
-    assert byte(1024 * 1024 * 1024 * 1024 * 2) == "2048.00GiB"
+    assert byte(1024 * 1024 * 1024 * 1024 * 2) in ["2048.00GiB", "2.00TiB"]
 
 
 def test_duration():

From a018343af68e4e599c712548ff2193ae4d191fe8 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sat, 5 Dec 2020 07:37:06 +0700
Subject: [PATCH 170/506] .travis.yml: Add libgit2-dev

And pre-install pygit2<1 for Python 3.4 and 3.5 support.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 079ecc2..7d1bbc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,12 @@ addons:
   apt:
     packages:
       libdbus-1-dev
+      libgit2-dev
       taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python|grep -v Pillow|grep -v pygit2)
+  - pip install 'pygit2<1' || true
+  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:

From e8728973461f6a45ab96b678e8babc4064f13253 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Fri, 4 Dec 2020 17:08:44 +0700
Subject: [PATCH 171/506] .travis.yml: Pre-install libvirt-dev

Also install libvirt-python<6.3 for Python 3.4 support.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7d1bbc0..ca3b78d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,11 @@ addons:
     packages:
       libdbus-1-dev
       libgit2-dev
+      libvirt-dev
       taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install 'pygit2<1' || true
+  - pip install 'pygit2<1' 'libvirt-python<6.3' || true
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v

From 9e9dff7658d8417151b5c4f82f27749457180ad5 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sat, 5 Dec 2020 16:54:59 +0700
Subject: [PATCH 172/506] rss.txt: Unpin feedparser

And install feedparser<6 on Travis for Python 3.4-5.
---
 .travis.yml                  | 2 +-
 requirements/modules/rss.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ca3b78d..369aeb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ addons:
       taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install 'pygit2<1' 'libvirt-python<6.3' || true
+  - pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v
diff --git a/requirements/modules/rss.txt b/requirements/modules/rss.txt
index 4373b0d..1b25361 100644
--- a/requirements/modules/rss.txt
+++ b/requirements/modules/rss.txt
@@ -1 +1 @@
-feedparser==6.0.0b1
+feedparser

From fa668735822f9e2b3054a38b661c905243016d77 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 7 Dec 2020 08:59:56 +0100
Subject: [PATCH 173/506] [core/theme] add xresources support

add support for reading foreground and background, and colors, from
xresources.py

many thanks to @Aliuakbar for the addition!

fixes #731
---
 bumblebee_status/core/theme.py      | 13 +++++++++++--
 bumblebee_status/util/xresources.py | 10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 bumblebee_status/util/xresources.py

diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index b52c465..800bd66 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -7,6 +7,7 @@ import glob
 
 import core.event
 import util.algorithm
+import util.xresources
 
 log = logging.getLogger(__name__)
 
@@ -89,13 +90,21 @@ class Theme(object):
         try:
             if isinstance(name, dict):
                 return name
+
+            result = {}
             if name.lower() == "wal":
                 wal = self.__load_json("~/.cache/wal/colors.json")
-                result = {}
                 for field in ["special", "colors"]:
                     for key in wal.get(field, {}):
                         result[key] = wal[field][key]
-                return result
+            if name.lower() == "xresources":
+                for key in ("background", "foreground"):
+                    result[key] = xresources.query(key)
+                for i in range(16):
+                    key = color + str(i)
+                    result[key] = xresources.query(key)
+
+            return result
         except Exception as e:
             log.error("failed to load colors: {}", e)
 
diff --git a/bumblebee_status/util/xresources.py b/bumblebee_status/util/xresources.py
new file mode 100644
index 0000000..70665a9
--- /dev/null
+++ b/bumblebee_status/util/xresources.py
@@ -0,0 +1,10 @@
+import subprocess
+import shutil
+
+def query(key):
+    if shutil.which("xgetres"):
+        return subprocess.run(["xgetres", key],
+                capture_output=True).stdout.decode("utf-8").strip()
+    else:
+        raise Exception("xgetres must be installed for this theme")
+

From 3644acce76c198c01b971a8a68b3a7bdf72b74d9 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 7 Dec 2020 10:00:20 +0100
Subject: [PATCH 174/506] [pip] adjust removed dependencies

---
 setup.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setup.py b/setup.py
index f9f2ee4..2e5bafb 100755
--- a/setup.py
+++ b/setup.py
@@ -20,11 +20,9 @@ EXTRAS_REQUIREMENTS_MAP = {
     "cpu2": read_module("cpu2"),
     "currency": read_module("currency"),
     "docker_ps": read_module("docker_ps"),
-    "dunst": read_module("dunst"),
     "getcrypto": read_module("getcrypto"),
     "git": read_module("git"),
     "github": read_module("github"),
-    "hddtemp": read_module("hddtemp"),
     "layout-xkb": read_module("layout_xkb"),
     "memory": read_module("memory"),
     "network_traffic": read_module("network_traffic"),

From 601b2115ce9a45229f044c8ab0687428c7ef4a8b Mon Sep 17 00:00:00 2001
From: gkeep <gkeep77@protonmail.com>
Date: Fri, 18 Dec 2020 13:56:26 +0300
Subject: [PATCH 175/506] Add initial spotifyd compatibility

---
 bumblebee_status/modules/contrib/spotify.py | 35 ++++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 2295609..7544b48 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -10,6 +10,8 @@ Parameters:
       Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
     * spotify.concise_controls: When enabled, allows spotify to be controlled from just the spotify.song widget.
       Concise controls are:     Left Click: Toggle Pause; Wheel Up: Next; Wheel Down; Previous.
+    * spotify.bus_name: String (defaults to `spotify`)
+      Available values: spotify, spotifyd
 
 contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 
@@ -35,6 +37,8 @@ class Module(core.module.Module):
 
         self.background = True
 
+        self.__bus_name = self.parameter("bus_name", "spotify")
+
         self.__layout = util.format.aslist(
             self.parameter(
                 "layout", "spotify.song,spotify.prev,spotify.pause,spotify.next",
@@ -46,7 +50,11 @@ class Module(core.module.Module):
         self.__pause = ""
         self.__format = self.parameter("format", "{artist} - {title}")
 
-        self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
+        if self.__bus_name == "spotifyd":
+            self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotifyd \
+                /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
+        else:
+            self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
                 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
 
         widget_map = {}
@@ -104,9 +112,14 @@ class Module(core.module.Module):
 
     def __get_song(self):
         bus = self.__bus
-        spotify = bus.get_object(
-            "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
-        )
+        if self.__bus_name == "spotifyd":
+            spotify = bus.get_object(
+                "org.mpris.MediaPlayer2.spotifyd", "/org/mpris/MediaPlayer2"
+            )
+        else:
+            spotify = bus.get_object(
+                "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
+            )
         spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties")
         props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata")
         self.__song = self.__format.format(
@@ -120,14 +133,20 @@ class Module(core.module.Module):
         try:
             self.__get_song()
 
+            if self.__bus_name == "spotifyd":
+                bus = self.__bus.get_object(
+                    "org.mpris.MediaPlayer2.spotifyd", "/org/mpris/MediaPlayer2"
+                )
+            else:
+                bus = self.__bus.get_object(
+                    "org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
+                )
+
             for widget in self.widgets():
                 if widget.name == "spotify.pause":
                     playback_status = str(
                         dbus.Interface(
-                            self.__bus.get_object(
-                                "org.mpris.MediaPlayer2.spotify",
-                                "/org/mpris/MediaPlayer2",
-                            ),
+                            bus,
                             "org.freedesktop.DBus.Properties",
                         ).Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
                     )

From a94114dd9496d801ce262bea721fa89436f7981c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 19 Dec 2020 13:07:29 +0100
Subject: [PATCH 176/506] [core/module] better error reporting for failed
 module loads

if a module fails to load, explicitly log errors for core and contrib in
the error log, but be a bit less verbose (and less confusing) in the
module error message itself.

fixes #747
---
 bumblebee_status/core/module.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index f4bac7e..dad06e2 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -33,20 +33,20 @@ def load(module_name, config=core.config.Config([]), theme=None):
     error = None
     module_short, alias = (module_name.split(":") + [module_name])[0:2]
     config.set("__alias__", alias)
-    for namespace in ["core", "contrib"]:
+
+    try:
+        mod = importlib.import_module("modules.core.{}".format(module_short))
+        log.debug("importing {} from core".format(module_short))
+        return getattr(mod, "Module")(config, theme)
+    except ImportError as e:
         try:
-            mod = importlib.import_module(
-                "modules.{}.{}".format(namespace, module_short)
-            )
-            log.debug(
-                "importing {} from {}.{}".format(module_short, namespace, module_short)
-            )
+            log.warning("failed to import {} from core: {}".format(module_short, e))
+            mod = importlib.import_module("modules.contrib.{}".format(module_short))
+            log.debug("importing {} from contrib".format(module_short))
             return getattr(mod, "Module")(config, theme)
         except ImportError as e:
-            log.debug("failed to import {}: {}".format(module_name, e))
-            error = e
-    log.fatal("failed to import {}: {}".format(module_name, error))
-    return Error(config=config, module=module_name, error=error)
+            log.fatal("failed to import {} from contrib: {}".format(module_short, e))
+    return Error(config=config, module=module_name, error="unable to load module")
 
 
 class Module(core.input.Object):

From 7fd4f710a12c213b19b02cbbde4c7cb9247bf09d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 19 Dec 2020 13:17:05 +0100
Subject: [PATCH 177/506] [doc] improve interval documentation

Add information about global vs. per-module intervals.

see #751
---
 docs/introduction.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/introduction.rst b/docs/introduction.rst
index 927a384..a27b8c7 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -56,8 +56,16 @@ To change the update interval, use:
 
    $ ./bumblebee-status -m <list of modules> -p interval=<interval in seconds>
 
+Note that some modules define their own intervals (e.g. most modules that query
+an online service), such as to not cause a storm of "once every second" queries.
+
+For such modules, the "global" interval defined here effectively defines the
+highest possible "resolution". If you have a global interval of 10s, for example,
+any other module can update at 10s, 20s, 30s, etc., but not every 25s. The status
+bar will internally always align to the next future time slot.
+
 The update interval can also be changed on a per-module basis, like
-this:
+this (overriding the default module interval indicated above):
 
 .. code-block:: bash
 

From 7b1659a1b594cc49f8207a2858b499086cda27a8 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 20 Dec 2020 10:23:06 +0100
Subject: [PATCH 178/506] [core/theme] add /usr/share as theme directory

add a theme directory /usr/share/bumblebee-status/themes for system-wide
theme installation.

fixes #753
---
 bumblebee_status/core/theme.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index 800bd66..4de58d3 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -17,6 +17,7 @@ PATHS = [
     os.path.join(THEME_BASE_DIR, "../../themes"),
     os.path.expanduser("~/.config/bumblebee-status/themes"),
     os.path.expanduser("~/.local/share/bumblebee-status/themes"),  # PIP
+    "/usr/share/bumblebee-status/themes",
 ]
 
 

From 73b071edb0c8c0c63a22758a12704be8b1d9a521 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 20 Dec 2020 15:11:35 +0100
Subject: [PATCH 179/506] [doc] clarify interval handling further

fixes #751
---
 docs/features.rst     | 19 +++++++++++++++++++
 docs/introduction.rst | 17 ++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/docs/features.rst b/docs/features.rst
index f48ebf0..f167033 100644
--- a/docs/features.rst
+++ b/docs/features.rst
@@ -1,6 +1,25 @@
 Advanced usage
 ===========================
 
+Intervals
+---------
+
+Some modules define their own update intervals (e.g. most modules that query
+an online service), such as to not cause a storm of "once every second" queries.
+
+For such modules, the "global" interval defined via the ``interval`` parameter effectively defines the
+highest possible "resolution". If you have a global interval of 10s, for example,
+any other module can update at 10s, 20s, 30s, etc., but not every 25s. The status
+bar will internally always align to the next future time slot.
+
+The update interval can also be changed on a per-module basis, like
+this (overriding the default module interval indicated above):
+
+.. code-block:: bash
+
+   $ ./bumblebee-status -m cpu memory -p cpu.interval=5s memory.interval=1m
+
+
 Events
 ------
 
diff --git a/docs/introduction.rst b/docs/introduction.rst
index a27b8c7..7c3de02 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -56,20 +56,15 @@ To change the update interval, use:
 
    $ ./bumblebee-status -m <list of modules> -p interval=<interval in seconds>
 
+The update interval is the global "refresh" interval of the modules (i.e. how often
+the bar will be updated with new data). The default interval is one second. It is
+possible to use suffixes such as "m" (for minutes), or "h" for hours (e.g.
+``-p interval=5m`` to update once every 5 minutes.
+
 Note that some modules define their own intervals (e.g. most modules that query
 an online service), such as to not cause a storm of "once every second" queries.
 
-For such modules, the "global" interval defined here effectively defines the
-highest possible "resolution". If you have a global interval of 10s, for example,
-any other module can update at 10s, 20s, 30s, etc., but not every 25s. The status
-bar will internally always align to the next future time slot.
-
-The update interval can also be changed on a per-module basis, like
-this (overriding the default module interval indicated above):
-
-.. code-block:: bash
-
-   $ ./bumblebee-status -m cpu memory -p cpu.interval=5s memory.interval=1m
+For more details on that, please refer to :doc:`features`.
 
 All modules can be given “aliases” using ``<module name>:<alias>``, by
 which they can be parametrized, for example:

From 960792b2e5ffe999d1559fa27720ff482e165a9b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 27 Dec 2020 14:49:12 +0100
Subject: [PATCH 180/506] [tests] fix module load test for python 3.6 and
 further

---
 tests/core/test_module.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/core/test_module.py b/tests/core/test_module.py
index 68415b7..5383c8b 100644
--- a/tests/core/test_module.py
+++ b/tests/core/test_module.py
@@ -55,7 +55,8 @@ def test_importerror(mocker):
     module = core.module.load(module_name="test", config=config)
 
     assert module.__class__.__name__ == "Error"
-    assert module.widget().full_text() == "test: some-error"
+    assert module.widget().full_text() == "test: some-error" or
+        module.widget().full_text() == "test: unable to load module"
 
 
 def test_loadvalid_module():

From af95b2e27615891ed16b4e1b87c53525b35d6607 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 27 Dec 2020 14:52:45 +0100
Subject: [PATCH 181/506] [tests] fix syntax error

---
 tests/core/test_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/core/test_module.py b/tests/core/test_module.py
index 5383c8b..4bca263 100644
--- a/tests/core/test_module.py
+++ b/tests/core/test_module.py
@@ -55,7 +55,7 @@ def test_importerror(mocker):
     module = core.module.load(module_name="test", config=config)
 
     assert module.__class__.__name__ == "Error"
-    assert module.widget().full_text() == "test: some-error" or
+    assert module.widget().full_text() == "test: some-error" or \
         module.widget().full_text() == "test: unable to load module"
 
 

From 436cea8f374577f5d5df5e7a9e4ade07eb9ccce0 Mon Sep 17 00:00:00 2001
From: gkeep <gkeep77@protonmail.com>
Date: Sun, 27 Dec 2020 19:02:45 +0300
Subject: [PATCH 182/506] [modules/playerctl] Add format and layout parameters

---
 bumblebee_status/modules/contrib/playerctl.py | 132 +++++++++++++-----
 1 file changed, 94 insertions(+), 38 deletions(-)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index b145500..3a61c00 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -5,57 +5,113 @@
 Requires the following executable:
     * playerctl
 
-contributed by `smitajit <https://github.com/smitajit>`_ - many thanks!
+Parameters:
+    * playerctl.format:   Format string (defaults to '{artist} - {title}')
+      Available values are: {album}, {title}, {artist}, {trackNumber}
+    * playerctl.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
+      Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
 
+Parameters are inherited from `spotify` module, many thanks to its developers!
+
+contributed by `smitajit <https://github.com/smitajit>`_ - many thanks!
 """
 
 import core.module
 import core.widget
 import core.input
 import util.cli
+import util.format
+
+import logging
 
 class Module(core.module.Module):
-    def __init__(self,config , theme):
-        widgets = [
-            core.widget.Widget(name="playerctl.prev"),
-            core.widget.Widget(name="playerctl.main", full_text=self.description),
-            core.widget.Widget(name="playerctl.next"),
-        ]
-        super(Module, self).__init__(config, theme ,  widgets)
+    def __init__(self, config, theme):
+        super(Module, self).__init__(config, theme, [])
 
-        core.input.register(widgets[0], button=core.input.LEFT_MOUSE,
-            cmd="playerctl previous")
-        core.input.register(widgets[1], button=core.input.LEFT_MOUSE,
-             cmd="playerctl play-pause")
-        core.input.register(widgets[2], button=core.input.LEFT_MOUSE,
-             cmd="playerctl next")
+        self.background = True
 
-        self._status = None
-        self._tags = None
+        self.__layout = util.format.aslist(
+            self.parameter(
+                "layout", "playerctl.prev, playerctl.song, playerctl.pause, playerctl.next"
+            )
+        )
 
-    def description(self, widget):
-        return self._tags if self._tags else "..."
+        self.__song = ""
+        self.__cmd = "playerctl "
+        self.__format = self.parameter("format", "{artist} - {title}")
+
+        widget_map = {}
+        for widget_name in self.__layout:
+            widget = self.add_widget(name=widget_name)
+            if widget_name == "playerctl.prev":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": self.__cmd + "previous",
+                }
+                widget.set("state", "prev")
+            elif widget_name == "playerctl.pause":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": self.__cmd + "play-pause",
+                }
+            elif widget_name == "playerctl.next":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": self.__cmd + "next",
+                }
+                widget.set("state", "next")
+            elif widget_name == "playerctl.song":
+                widget_map[widget] = [
+                    {
+                        "button": core.input.LEFT_MOUSE,
+                        "cmd": self.__cmd + "play-pause",
+                    }, {
+                        "button": core.input.WHEEL_UP,
+                        "cmd": self.__cmd + "next",
+                    }, {
+                        "button": core.input.WHEEL_DOWN,
+                        "cmd": self.__cmd + "previous",
+                    }
+                ]
+            else:
+                raise KeyError(
+                    "The playerctl module does not have a {widget_name!r} widget".format(
+                        widget_name=widget_name
+                    )
+                )
+
+        for widget, callback_options in widget_map.items():
+            if isinstance(callback_options, dict):
+                core.input.register(widget, **callback_options)
 
     def update(self):
-        self._load_song()
-
-    def state(self, widget):
-        if widget.name == "playerctl.prev":
-            return "prev"
-        if widget.name == "playerctl.next":
-            return "next"
-        return self._status
-
-    def _load_song(self):
-        info = ""
         try:
-            status = util.cli.execute("playerctl status").lower()
-            info = util.cli.execute("playerctl metadata xesam:title")
-        except :
-            self._status = None
-            self._tags = None
-            return
-        self._status = status.split("\n")[0].lower()
-        self._tags = info.split("\n")[0][:20]
+            self.__get_song()
 
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
+            for widget in self.widgets():
+                if widget.name == "playerctl.pause":
+                    playback_status = str(util.cli.execute(self.__cmd + "status")).strip()
+                    if playback_status != "":
+                        if playback_status == "Playing":
+                            widget.set("state", "playing")
+                        else:
+                            widget.set("state", "paused")
+                elif widget.name == "playerctl.song":
+                    widget.set("state", "song")
+                    widget.full_text(self.__song)
+        except Exception as e:
+            logging.exception(e)
+            self.__song = ""
+
+    def __get_song(self):
+        album = str(util.cli.execute(self.__cmd + "metadata xesam:album")).strip()
+        title = str(util.cli.execute(self.__cmd + "metadata xesam:title")).strip()
+        artist = str(util.cli.execute(self.__cmd + "metadata xesam:albumArtist")).strip()
+        track_number = str(util.cli.execute(self.__cmd + "metadata xesam:trackNumber")).strip()
+
+        self.__song = self.__format.format(
+            album = album,
+            title = title,
+            artist = artist,
+            track_number = track_number
+        )

From b74ebce702c5f272c71a26a68e8f7d688043aebb Mon Sep 17 00:00:00 2001
From: gkeep <gkeep77@protonmail.com>
Date: Sun, 27 Dec 2020 19:12:36 +0300
Subject: [PATCH 183/506] [modules/playerctl] Small fix

---
 bumblebee_status/modules/contrib/playerctl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index 3a61c00..3a0d7e5 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -113,5 +113,5 @@ class Module(core.module.Module):
             album = album,
             title = title,
             artist = artist,
-            track_number = track_number
+            trackNumber = track_number
         )

From 5e790b7496b8128c67656c3c5218250a345e30f5 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:21:35 +0100
Subject: [PATCH 184/506] [doc] Add reference to slackbuild

fixes #755
---
 README.md             | 2 ++
 docs/introduction.rst | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 75ace2d..7268a16 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,8 @@ makepkg -sicr
 pip install --user bumblebee-status
 ```
 
+There is also a SlackBuild available here: [slackbuilds:bumblebee-status](http://slackbuilds.org/repository/14.2/desktop/bumblebee-status/) - many thanks to [@Tonus1](https://github.com/Tonus1)!
+
 # Dependencies
 [Available modules](https://bumblebee-status.readthedocs.io/en/main/modules.html) lists the dependencies (Python modules and external executables)
 for each module. If you are not using a module, you don't need the dependencies.
diff --git a/docs/introduction.rst b/docs/introduction.rst
index 7c3de02..3831d4b 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -19,6 +19,9 @@ Installation
    # will install bumblebee-status into ~/.local/bin/bumblebee-status
    pip install --user bumblebee-status
 
+
+There is also a SlackBuild available here: [slackbuilds:bumblebee-status](http://slackbuilds.org/repository/14.2/desktop/bumblebee-status/) - many thanks to [@Tonus1](https://github.com/Tonus1)!
+
 Dependencies
 ------------
 

From 413abdcae79f17b638c26c51dacf54aaf4956d4d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:22:40 +0100
Subject: [PATCH 185/506] [doc] add license badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7268a16..25d32b4 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 [![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
+![License](https://img.shields.io/github/license/tobi-wan-kenobi/bumblebee-status)
 
 **Many, many thanks to all contributors! I am still amazed by and deeply grateful for how many PRs this project gets.**
 

From 21ded8f640359829159248aa5b7dfcbb71e56661 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 17 Jan 2021 14:18:58 +0100
Subject: [PATCH 186/506] [core] Allow module loading from user directory

If a module fails to load from both core and contrib, fall back to
loading by file name from "~/.config/bumblebee-status/modules/<name>.py"

fixes #757
---
 bumblebee_status/core/module.py | 10 +++++++++-
 docs/development/module.rst     |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index dad06e2..145d16d 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -17,6 +17,7 @@ except Exception as e:
 
 log = logging.getLogger(__name__)
 
+import sys
 
 """Loads a module by name
 
@@ -45,7 +46,14 @@ def load(module_name, config=core.config.Config([]), theme=None):
             log.debug("importing {} from contrib".format(module_short))
             return getattr(mod, "Module")(config, theme)
         except ImportError as e:
-            log.fatal("failed to import {} from contrib: {}".format(module_short, e))
+            try:
+                log.warning("failed to import {} from system: {}".format(module_short, e))
+                mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
+                    os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))).load_module()
+                log.debug("importing {} from user".format(module_short))
+                return getattr(mod, "Module")(config, theme)
+            except ImportError as e:
+                log.fatal("failed to import {}: {}".format(module_short, e))
     return Error(config=config, module=module_name, error="unable to load module")
 
 
diff --git a/docs/development/module.rst b/docs/development/module.rst
index 113a6f7..cc71900 100644
--- a/docs/development/module.rst
+++ b/docs/development/module.rst
@@ -11,6 +11,7 @@ Adding a new module to ``bumblebee-status`` is straight-forward:
    ``bumblebee-status`` (i.e. a module called
    ``bumblebee_status/modules/contrib/test.py`` will be loaded using
    ``bumblebee-status -m test``)
+-  Alternatively, you can put your module in ``~/.config/bumblebee-status/modules/``
 -  The module name must follow the `Python Naming Conventions <https://www.python.org/dev/peps/pep-0008/#package-and-module-names>`_
 -  See below for how to actually write the module
 -  Test (run ``bumblebee-status`` in the CLI)

From 45c0a382c99c6f58977b0342972b2e914c3b3026 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 17 Jan 2021 15:17:14 +0100
Subject: [PATCH 187/506] [core/module] fix load error when no user module
 exists

---
 bumblebee_status/core/module.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 145d16d..9239a49 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -46,10 +46,13 @@ def load(module_name, config=core.config.Config([]), theme=None):
             log.debug("importing {} from contrib".format(module_short))
             return getattr(mod, "Module")(config, theme)
         except ImportError as e:
+            usermod = os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))
+            if not os.path.exists(usermod):
+                raise e
             try:
                 log.warning("failed to import {} from system: {}".format(module_short, e))
                 mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
-                    os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))).load_module()
+                    os.path.expanduser(usermod)).load_module()
                 log.debug("importing {} from user".format(module_short))
                 return getattr(mod, "Module")(config, theme)
             except ImportError as e:

From beca26c2bf4676c6095abdb3551aa75abdbd6ad2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 17 Jan 2021 15:21:40 +0100
Subject: [PATCH 188/506] [core/config] Allow modules to be hidden when in
 critical/error state

When a module is in critical state, the user can now hide the module
(e.g. if pulseaudio fails to load).

fixes #746
---
 bumblebee_status/core/config.py | 20 +++++++++++++++++---
 bumblebee_status/core/output.py |  2 ++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index c84d10c..b777e6d 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -172,6 +172,13 @@ class Config(util.store.Store):
             default=[],
             help="Specify a list of modules to hide when not in warning/error state",
         )
+        parser.add_argument(
+            "-e",
+            "--errorhide",
+            nargs="+",
+            default=[],
+            help="Specify a list of modules that are hidden when in state error"
+        )
         parser.add_argument(
             "-d", "--debug", action="store_true", help="Add debug fields to i3 output"
         )
@@ -302,14 +309,21 @@ class Config(util.store.Store):
     def iconset(self):
         return self.__args.iconset
 
-    """Returns which modules should be hidden if their state is not warning/critical
+    """Returns whether a module should be hidden if their state is not warning/critical
 
-    :return: list of modules to hide automatically
-    :rtype: list of strings
+    :return: True if module should be hidden automatically, False otherwise
+    :rtype: bool
     """
 
     def autohide(self, name):
         return name in self.__args.autohide
 
+    """Returns which modules should be hidden if they are in state error
+
+    :return: returns True if name should be hidden, False otherwise
+    :rtype: bool
+    """
+    def errorhide(self, name):
+        return name in self.__args.errorhide
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 687cafd..e3ec476 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -216,6 +216,8 @@ class i3(object):
                     continue
             if module.hidden():
                 continue
+            if "critical" in widget.state() and self.__config.errorhide(widget.module.name):
+                continue
             blocks.extend(self.separator_block(module, widget))
             blocks.append(self.__content_block(module, widget))
             core.event.trigger("next-widget")

From a27c284869eef0cd4262d7a92aa499a9906b6ead Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 17 Jan 2021 15:29:44 +0100
Subject: [PATCH 189/506] [core/module] fix failing unit test

wrong error handling again
---
 bumblebee_status/core/module.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 9239a49..6987129 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -17,8 +17,6 @@ except Exception as e:
 
 log = logging.getLogger(__name__)
 
-import sys
-
 """Loads a module by name
 
 :param module_name: Name of the module to load
@@ -47,16 +45,16 @@ def load(module_name, config=core.config.Config([]), theme=None):
             return getattr(mod, "Module")(config, theme)
         except ImportError as e:
             usermod = os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))
-            if not os.path.exists(usermod):
-                raise e
-            try:
-                log.warning("failed to import {} from system: {}".format(module_short, e))
-                mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
-                    os.path.expanduser(usermod)).load_module()
-                log.debug("importing {} from user".format(module_short))
-                return getattr(mod, "Module")(config, theme)
-            except ImportError as e:
-                log.fatal("failed to import {}: {}".format(module_short, e))
+            if os.path.exists(usermod):
+                try:
+                    log.warning("failed to import {} from system: {}".format(module_short, e))
+                    mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
+                        os.path.expanduser(usermod)).load_module()
+                    log.debug("importing {} from user".format(module_short))
+                    return getattr(mod, "Module")(config, theme)
+                except ImportError as e:
+                    log.fatal("import failed: {}".format(e))
+        log.fatal("failed to import {}".format(module_short))
     return Error(config=config, module=module_name, error="unable to load module")
 
 

From 406eadeac749307d5f7f63d7d038a0a02b9487aa Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 17 Jan 2021 15:35:39 +0100
Subject: [PATCH 190/506] [modules/time] update once per second

fixes #676
---
 bumblebee_status/modules/core/time.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bumblebee_status/modules/core/time.py b/bumblebee_status/modules/core/time.py
index 1c2c4b1..020bef1 100644
--- a/bumblebee_status/modules/core/time.py
+++ b/bumblebee_status/modules/core/time.py
@@ -12,7 +12,6 @@ from .datetime import Module
 
 
 class Module(Module):
-    @core.decorators.every(seconds=59)  # ensures one update per minute
     def __init__(self, config, theme):
         super().__init__(config, theme)
 

From 0734c970b0cc4846e4517ddd5ed6455119e09c98 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 12 Feb 2021 09:30:24 +0100
Subject: [PATCH 191/506] [modules/hddtemp] fix typo

fixes #761
---
 bumblebee_status/modules/contrib/hddtemp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/hddtemp.py b/bumblebee_status/modules/contrib/hddtemp.py
index a039166..6e269cb 100644
--- a/bumblebee_status/modules/contrib/hddtemp.py
+++ b/bumblebee_status/modules/contrib/hddtemp.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-"""Fetch hard drive temeperature data from a hddtemp daemon
+"""Fetch hard drive temperature data from a hddtemp daemon
 that runs on localhost and default port (7634)
 
 contributed by `somospocos <https://github.com/somospocos>`_ - many thanks!

From 6e3caa6f14a8baf0bcd8fd9e6d0744d34f6f88ba Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 12 Feb 2021 09:31:09 +0100
Subject: [PATCH 192/506] [modules/shortcut] fix typo

fixes #760
---
 bumblebee_status/modules/contrib/shortcut.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/shortcut.py b/bumblebee_status/modules/contrib/shortcut.py
index 4ea0a7c..129bfdc 100644
--- a/bumblebee_status/modules/contrib/shortcut.py
+++ b/bumblebee_status/modules/contrib/shortcut.py
@@ -4,7 +4,7 @@
 when clicking on it.
 
 For more than one shortcut, the commands and labels are strings separated by
-a demiliter (; semicolon by default).
+a delimiter (; semicolon by default).
 
 For example in order to create two shortcuts labeled A and B with commands
 cmdA and cmdB you could do:

From 31f1f991022f94ba826784435b867270c2358471 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 12 Feb 2021 09:31:32 +0100
Subject: [PATCH 193/506] [doc] regenerate to fix typos

---
 docs/modules.rst | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index 8ec9ecf..87a80ad 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -63,6 +63,7 @@ Parameters:
     * disk.path: Path to calculate disk usage from (defaults to /)
     * disk.open: Which application / file manager to launch (default xdg-open)
     * disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to '{path} {used}/{size} ({percent:05.02f}%)')
+    * disk.system: Unit system to use - SI (KB, MB, ...) or IEC (KiB, MiB, ...) (defaults to 'IEC')
 
 .. image:: ../screenshots/disk.png
 
@@ -620,8 +621,6 @@ some media control bindings.
 Left click toggles pause, scroll up skips the current song, scroll
 down returns to the previous song.
 
-Requires the following library:
-    * subprocess
 Parameters:
     * deadbeef.format:    Format string (defaults to '{artist} - {title}')
       Available values are: {artist}, {title}, {album}, {length},
@@ -772,7 +771,7 @@ contributed by `TheEdgeOfRage <https://github.com/TheEdgeOfRage>`_ - many thanks
 hddtemp
 ~~~~~~~
 
-Fetch hard drive temeperature data from a hddtemp daemon
+Fetch hard drive temperature data from a hddtemp daemon
 that runs on localhost and default port (7634)
 
 contributed by `somospocos <https://github.com/somospocos>`_ - many thanks!
@@ -1051,6 +1050,14 @@ Displays information about the current song in vlc, audacious, bmp, xmms2, spoti
 Requires the following executable:
     * playerctl
 
+Parameters:
+    * playerctl.format:   Format string (defaults to '{artist} - {title}')
+      Available values are: {album}, {title}, {artist}, {trackNumber}
+    * playerctl.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
+      Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
+
+Parameters are inherited from `spotify` module, many thanks to its developers!
+
 contributed by `smitajit <https://github.com/smitajit>`_ - many thanks!
 
 .. image:: ../screenshots/playerctl.png
@@ -1225,7 +1232,7 @@ Shows a widget per user-defined shortcut and allows to define the behaviour
 when clicking on it.
 
 For more than one shortcut, the commands and labels are strings separated by
-a demiliter (; semicolon by default).
+a delimiter (; semicolon by default).
 
 For example in order to create two shortcuts labeled A and B with commands
 cmdA and cmdB you could do:
@@ -1265,7 +1272,6 @@ an example.
 
 Requires the following libraries:
     * requests
-    * regex
 
 Parameters:
     * spaceapi.url: String representation of the api endpoint
@@ -1298,6 +1304,8 @@ Parameters:
       Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
     * spotify.concise_controls: When enabled, allows spotify to be controlled from just the spotify.song widget.
       Concise controls are:     Left Click: Toggle Pause; Wheel Up: Next; Wheel Down; Previous.
+    * spotify.bus_name: String (defaults to `spotify`)
+      Available values: spotify, spotifyd
 
 contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
 

From 618ebbecccd03df95dfe62b053adc130387341b9 Mon Sep 17 00:00:00 2001
From: Michal Cieslicki <michalroxorpl@gmail.com>
Date: Sat, 20 Feb 2021 13:50:31 +0100
Subject: [PATCH 194/506] Add parameter to specify a configuration file

---
 bumblebee_status/core/config.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index b777e6d..b5fd5ef 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -147,6 +147,13 @@ class Config(util.store.Store):
         parser = argparse.ArgumentParser(
             description="bumblebee-status is a modular, theme-able status line generator for the i3 window manager. https://github.com/tobi-wan-kenobi/bumblebee-status/wiki"
         )
+        parser.add_argument(
+            "-c",
+            "--config-file",
+            action="store",
+            default=None,
+            help="Specify a configuration file to use"
+        )
         parser.add_argument(
             "-m", "--modules", nargs="+", action="append", default=[], help=MODULE_HELP
         )
@@ -203,13 +210,18 @@ class Config(util.store.Store):
 
         self.__args = parser.parse_args(args)
 
-        for cfg in [
-            "~/.bumblebee-status.conf",
-            "~/.config/bumblebee-status.conf",
-            "~/.config/bumblebee-status/config",
-        ]:
+        if self.__args.config_file:
+            cfg = self.__args.config_file
             cfg = os.path.expanduser(cfg)
             self.load_config(cfg)
+        else:
+            for cfg in [
+                "~/.bumblebee-status.conf",
+                "~/.config/bumblebee-status.conf",
+                "~/.config/bumblebee-status/config",
+            ]:
+                cfg = os.path.expanduser(cfg)
+                self.load_config(cfg)
 
         parameters = [item for sub in self.__args.parameters for item in sub]
         for param in parameters:

From 6d7934f0fe903edcacf651c364dc8b1e6d25241a Mon Sep 17 00:00:00 2001
From: Michal Cieslicki <michalroxorpl@gmail.com>
Date: Fri, 26 Feb 2021 18:02:47 +0100
Subject: [PATCH 195/506] Add code to enable scrolling of shell module output

---
 bumblebee_status/modules/contrib/shell.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index 6fd9aa2..cb7bc38 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -54,6 +54,7 @@ class Module(core.module.Module):
     def set_output(self, value):
         self.__output = value
 
+    @core.decorators.scrollable
     def get_output(self, _):
         return self.__output
 

From 32eef6b204221ac75660567b7b8b8c486c425a2d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 27 Feb 2021 12:53:00 +0100
Subject: [PATCH 196/506] [doc] fix typos/wrong grammar

fixes #769
---
 docs/development/module.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/development/module.rst b/docs/development/module.rst
index cc71900..992ef05 100644
--- a/docs/development/module.rst
+++ b/docs/development/module.rst
@@ -16,7 +16,7 @@ Adding a new module to ``bumblebee-status`` is straight-forward:
 -  See below for how to actually write the module
 -  Test (run ``bumblebee-status`` in the CLI)
 -  Make sure your changes don’t break anything: ``./coverage.sh``
--  If you want to do me favour, run your module through
+-  If you want to do me a favour, run your module through
    ``black -t py34`` before submitting
 
 Pull requests
@@ -24,7 +24,7 @@ Pull requests
 
 The project **gladly** accepts PRs for bugfixes, new functionality, new
 modules, etc. When you feel comfortable with what you’ve developed,
-please just open a PR, somebody will look at it eventually :) Thanks!
+please just open a PR. Somebody will look at it eventually :) Thanks!
 
 Coding guidelines
 -----------------
@@ -67,7 +67,7 @@ Of modules and widgets
 
 There are two important concepts for module writers: - A module is
 something that offers a single set of coherent functionality - A module
-has 1 to n “widgets”, which translates to individual blocks in the i3bar
+has 1 to n “widgets”, which translates to individual blocks in the i3bar.
 
 Very often, this is a 1:1 relationship, and a single module has a single
 widget. If that’s the case for you, you can stop reading now :)

From 0ff49ac7d5922bc97725b29e696014ea727ff4e4 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 2 Mar 2021 17:00:12 +0100
Subject: [PATCH 197/506] [doc] Remove requests dependency in stock module

The module is using `urllib.request`
---
 bumblebee_status/modules/contrib/stock.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/stock.py b/bumblebee_status/modules/contrib/stock.py
index 36afe17..224a5fb 100644
--- a/bumblebee_status/modules/contrib/stock.py
+++ b/bumblebee_status/modules/contrib/stock.py
@@ -3,9 +3,6 @@
 
 """Display a stock quote from finance.yahoo.com
 
-Requires the following python packages:
-    * requests
-
 Parameters:
     * stock.symbols : Comma-separated list of symbols to fetch
     * stock.change : Should we fetch change in stock value (defaults to True)

From 7d0d1455c8894758ff6b83765194d28bd2a7ac9b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 9 Mar 2021 19:12:59 +0100
Subject: [PATCH 198/506] [core/module] Add fallback for user module loading

If importlib.machinery is not present, fall back to importlib.util to
load the module by its absolute name.

hopefully fixes #763
---
 bumblebee_status/core/module.py | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 6987129..5de00ee 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -17,6 +17,22 @@ except Exception as e:
 
 log = logging.getLogger(__name__)
 
+def import_user(module_short, config, theme):
+    usermod = os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))
+    if os.path.exists(usermod):
+        if hasattr(importlib, "machinery"):
+            log.debug("importing {} from user via machinery".format(module_short))
+            mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
+                os.path.expanduser(usermod)).load_module()
+            return getattr(mod, "Module")(config, theme)
+        else:
+            log.debug("importing {} from user via importlib.util".format(module_short))
+            spec = importlib.util.spec_from_file_location("modules.{}".format(module_short), usermod)
+            mod = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(mod)
+            return mod.Module(config, theme)
+    raise ImportError("not found")
+
 """Loads a module by name
 
 :param module_name: Name of the module to load
@@ -44,16 +60,11 @@ def load(module_name, config=core.config.Config([]), theme=None):
             log.debug("importing {} from contrib".format(module_short))
             return getattr(mod, "Module")(config, theme)
         except ImportError as e:
-            usermod = os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))
-            if os.path.exists(usermod):
-                try:
-                    log.warning("failed to import {} from system: {}".format(module_short, e))
-                    mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
-                        os.path.expanduser(usermod)).load_module()
-                    log.debug("importing {} from user".format(module_short))
-                    return getattr(mod, "Module")(config, theme)
-                except ImportError as e:
-                    log.fatal("import failed: {}".format(e))
+            try:
+                log.warning("failed to import {} from system: {}".format(module_short, e))
+                return import_user(module_short, config, theme)
+            except ImportError as e:
+                log.fatal("import failed: {}".format(e))
         log.fatal("failed to import {}".format(module_short))
     return Error(config=config, module=module_name, error="unable to load module")
 

From 8d88b23947542aca7622fe46a4efc36467e80165 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 13 Mar 2021 13:17:20 +0100
Subject: [PATCH 199/506] [modules] add a module "keys" that shows whether a
 key is pressed

also, add backend functionality to hide individual widgets of a module.
---
 bumblebee_status/core/module.py |  4 +-
 bumblebee_status/core/output.py |  2 +
 bumblebee_status/core/widget.py |  3 +-
 themes/gruvbox-powerline.json   | 65 ++++++++++++++++++++-------------
 4 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 5de00ee..5be7a4f 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -190,9 +190,9 @@ class Module(core.input.Object):
     :rtype: bumblebee_status.widget.Widget
     """
 
-    def add_widget(self, full_text="", name=None):
+    def add_widget(self, full_text="", name=None, hidden=False):
         widget_id = "{}::{}".format(self.name, len(self.widgets()))
-        widget = core.widget.Widget(full_text=full_text, name=name, widget_id=widget_id)
+        widget = core.widget.Widget(full_text=full_text, name=name, widget_id=widget_id, hidden=hidden)
         self.widgets().append(widget)
         widget.module = self
         return widget
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index e3ec476..1760309 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -216,6 +216,8 @@ class i3(object):
                     continue
             if module.hidden():
                 continue
+            if widget.hidden:
+                continue
             if "critical" in widget.state() and self.__config.errorhide(widget.module.name):
                 continue
             blocks.extend(self.separator_block(module, widget))
diff --git a/bumblebee_status/core/widget.py b/bumblebee_status/core/widget.py
index b1c3b4e..5d823ea 100644
--- a/bumblebee_status/core/widget.py
+++ b/bumblebee_status/core/widget.py
@@ -10,12 +10,13 @@ log = logging.getLogger(__name__)
 
 
 class Widget(util.store.Store, core.input.Object):
-    def __init__(self, full_text="", name=None, widget_id=None):
+    def __init__(self, full_text="", name=None, widget_id=None, hidden=False):
         super(Widget, self).__init__()
         self.__full_text = full_text
         self.module = None
         self.name = name
         self.id = widget_id or self.id
+        self.hidden = hidden
 
     @property
     def module(self):
diff --git a/themes/gruvbox-powerline.json b/themes/gruvbox-powerline.json
index 3481dbc..d199243 100644
--- a/themes/gruvbox-powerline.json
+++ b/themes/gruvbox-powerline.json
@@ -44,29 +44,44 @@
 			"bg": "#b8bb26"
 		}
 	},
-  "bluetooth": {
-      "ON": {
-			    "fg": "#1d2021",
-			    "bg": "#b8bb26"
-      }
-  },
-  "git": {
-	"modified": { "bg": "#458588" },
-	"deleted": { "bg": "#9d0006" },
-	"new": { "bg": "#b16286" }
-  },
-    "pomodoro": {
-        "paused": {
-            "fg": "#1d2021",
-            "bg": "#d79921"
-        },
-        "work": {
-            "fg": "#1d2021",
-            "bg": "#b8bb26"
-        },
-        "break": {
-            "fg": "#002b36",
-            "bg": "#859900"
-        }
-    }
+	"bluetooth": {
+		"ON": {
+			"fg": "#1d2021",
+			"bg": "#b8bb26"
+		}
+	},
+	"git": {
+		"modified": { "bg": "#458588" },
+		"deleted": { "bg": "#9d0006" },
+		"new": { "bg": "#b16286" }
+	},
+	"pomodoro": {
+		"paused": {
+			"fg": "#1d2021",
+			"bg": "#d79921"
+		},
+		"work": {
+			"fg": "#1d2021",
+			"bg": "#b8bb26"
+		},
+		"break": {
+			"fg": "#002b36",
+			"bg": "#859900"
+		}
+	},
+	"keys": {
+		"Key.cmd": {
+			"bg": "#8ec07c",
+			"full_text": "***"
+		},
+		"Key.shift": {
+			"bg": "#fabd2f"
+		},
+		"Key.ctrl": {
+			"bg": "#83a598"
+		},
+		"Key.alt": {
+			"bg": "#f28019"
+		}
+	}
 }

From 868502d62e9a7aaa1fd7b9bf75030dfa359436b3 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 13 Mar 2021 14:04:42 +0100
Subject: [PATCH 200/506] [modules/keys] add missing modules

forgot to add in the previous commit
---
 bumblebee_status/modules/core/keys.py | 56 +++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 bumblebee_status/modules/core/keys.py

diff --git a/bumblebee_status/modules/core/keys.py b/bumblebee_status/modules/core/keys.py
new file mode 100644
index 0000000..a579c7d
--- /dev/null
+++ b/bumblebee_status/modules/core/keys.py
@@ -0,0 +1,56 @@
+# pylint: disable=C0111,R0903
+
+"""Shows when a key is pressed
+
+Parameters:
+    * keys.keys: Comma-separated list of keys to monitor (defaults to "")
+"""
+
+import core.module
+import core.widget
+import core.decorators
+import core.event
+
+import util.format
+
+from pynput.keyboard import Listener
+
+NAMES = {
+    "Key.cmd": "cmd",
+    "Key.ctrl": "ctrl",
+    "Key.shift": "shift",
+    "Key.alt": "alt",
+}
+
+class Module(core.module.Module):
+    @core.decorators.never
+    def __init__(self, config, theme):
+        super().__init__(config, theme, [])
+
+        self._listener = Listener(on_press=self._key_press, on_release=self._key_release)
+
+        self._keys = util.format.aslist(self.parameter("keys", "Key.cmd,Key.ctrl,Key.alt,Key.shift"))
+
+        for k in self._keys:
+            self.add_widget(name=k, full_text=self._display_name(k), hidden=True)
+        self._listener.start()
+
+    def _display_name(self, key):
+        return NAMES.get(key, key)
+
+    def _key_press(self, key):
+        key = str(key)
+        if not key in self._keys: return
+        self.widget(key).hidden = False
+        core.event.trigger("update", [self.id], redraw_only=False)
+
+    def _key_release(self, key):
+        key = str(key)
+        if not key in self._keys: return
+        self.widget(key).hidden = True
+        core.event.trigger("update", [self.id], redraw_only=False)
+    
+    def state(self, widget):
+        return widget.name
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 9f89e3a657abfe26d664387723ca112749a2e33e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 13 Mar 2021 14:09:42 +0100
Subject: [PATCH 201/506] [core] make bumblebee more reactive

- set default delay to 0
- split input reading into 2 threads
- get rid of polling
---
 bumblebee-status               | 74 +++++++++++++++++-----------------
 bumblebee_status/core/event.py |  7 ++++
 bumblebee_status/core/input.py |  4 +-
 3 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index a0f2fad..698bcf8 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -6,7 +6,6 @@ import json
 import time
 import signal
 import socket
-import select
 import logging
 import threading
 
@@ -39,45 +38,40 @@ class CommandSocket(object):
         self.__socket.close()
         os.unlink(self.__name)
 
+def process_event(event_line, config, update_lock):
+    modules = {}
+    try:
+        event = json.loads(event_line)
+        core.input.trigger(event)
+        if "name" in event:
+            modules[event["name"]] = True
+    except ValueError:
+        pass
 
-def handle_input(output, config, update_lock):
+    delay = float(config.get("engine.input_delay", 0.0))
+    if delay > 0:
+        time.sleep(delay)
+    if update_lock.acquire(blocking=False) == True:
+        core.event.trigger("update", modules.keys(), force=True)
+        core.event.trigger("draw")
+        update_lock.release()
+
+def handle_commands(config, update_lock):
     with CommandSocket() as cmdsocket:
-        poll = select.poll()
-        poll.register(sys.stdin.fileno(), select.POLLIN)
-        poll.register(cmdsocket, select.POLLIN)
-
         while True:
-            events = poll.poll()
+            tmp, _ = cmdsocket.accept()
+            line = tmp.recv(4096).decode()
+            tmp.close()
+            logging.debug("socket event  {}".format(line))
+            process_event(line, config, update_lock)
 
-            modules = {}
-            for fileno, event in events:
-                if fileno == cmdsocket.fileno():
-                    tmp, _ = cmdsocket.accept()
-                    line = tmp.recv(4096).decode()
-                    tmp.close()
-                    logging.debug("socket event  {}".format(line))
-                else:
-                    line = "["
-                    while line.startswith("["):
-                        line = sys.stdin.readline().strip(",").strip()
-                    logging.info("input event: {}".format(line))
-                try:
-                    event = json.loads(line)
-                    core.input.trigger(event)
-                    if "name" in event:
-                        modules[event["name"]] = True
-                except ValueError:
-                    pass
 
-            delay = float(config.get("engine.input_delay", 0.2))
-            if delay > 0:
-                time.sleep(delay)
-            if update_lock.acquire(blocking=False) == True:
-                core.event.trigger("update", modules.keys(), force=True)
-                core.event.trigger("draw")
-                update_lock.release()
-
-        poll.unregister(sys.stdin.fileno())
+def handle_events(config, update_lock):
+    while True:
+        line = sys.stdin.readline().strip(",").strip()
+        if line == "[": continue
+        logging.info("input event: {}".format(line))
+        process_event(line, config, update_lock)
 
 
 def main():
@@ -104,9 +98,13 @@ def main():
     core.input.register(None, core.input.WHEEL_DOWN, "i3-msg workspace next_on_output")
 
     update_lock = threading.Lock()
-    input_thread = threading.Thread(target=handle_input, args=(output, config, update_lock, ))
-    input_thread.daemon = True
-    input_thread.start()
+    event_thread = threading.Thread(target=handle_events, args=(config, update_lock, ))
+    event_thread.daemon = True
+    event_thread.start()
+
+    cmd_thread = threading.Thread(target=handle_commands, args=(config, update_lock, ))
+    cmd_thread.daemon = True
+    cmd_thread.start()
 
     def sig_USR1_handler(signum,stack):
         if update_lock.acquire(blocking=False) == True:
diff --git a/bumblebee_status/core/event.py b/bumblebee_status/core/event.py
index 8e969f0..70b6b0c 100644
--- a/bumblebee_status/core/event.py
+++ b/bumblebee_status/core/event.py
@@ -8,6 +8,13 @@ def register(event, callback, *args, **kwargs):
 
     __callbacks.setdefault(event, []).append(cb)
 
+def register_exclusive(event, callback, *args, **kwargs):
+    cb = callback
+    if args or kwargs:
+        cb = lambda: callback(*args, **kwargs)
+
+    __callbacks[event] = [cb]
+
 def unregister(event):
     if event in __callbacks:
         del __callbacks[event]
diff --git a/bumblebee_status/core/input.py b/bumblebee_status/core/input.py
index 9dbc2a6..b0d9f23 100644
--- a/bumblebee_status/core/input.py
+++ b/bumblebee_status/core/input.py
@@ -52,9 +52,9 @@ def register(obj, button=None, cmd=None, wait=False):
     logging.debug("registering callback {}".format(event_id))
     core.event.unregister(event_id) # make sure there's always only one input event
     if callable(cmd):
-        core.event.register(event_id, cmd)
+        core.event.register_exclusive(event_id, cmd)
     else:
-        core.event.register(event_id, lambda event: __execute(event, cmd, wait))
+        core.event.register_exclusive(event_id, lambda event: __execute(event, cmd, wait))
 
 
 def trigger(event):

From 38613495f2c649dae7e8872caede1c4ddf3cbcee Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 13 Mar 2021 20:44:36 +0100
Subject: [PATCH 202/506] [tests] Adjust for widget hiding

---
 tests/core/test_output.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/core/test_output.py b/tests/core/test_output.py
index 4e0d905..870ded8 100644
--- a/tests/core/test_output.py
+++ b/tests/core/test_output.py
@@ -26,6 +26,7 @@ def module_a(mocker):
     widget = mocker.MagicMock()
     widget.full_text.return_value = "test"
     widget.id = "a"
+    widget.hidden = False
     return SampleModule(config=core.config.Config([]), widgets=[widget, widget, widget])
 
 @pytest.fixture

From 65da1e2246efe2c157446be85ed0d452131f782d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 13 Mar 2021 20:45:56 +0100
Subject: [PATCH 203/506] [doc] migrate to travis.com

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 25d32b4..848434e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # bumblebee-status
 
-[![Build Status](https://travis-ci.org/tobi-wan-kenobi/bumblebee-status.svg?branch=main)](https://travis-ci.org/tobi-wan-kenobi/bumblebee-status)
+[![Build Status](https://travis-ci.com/tobi-wan-kenobi/bumblebee-status.svg?branch=main)](https://travis-ci.com/tobi-wan-kenobi/bumblebee-status)
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)

From 4187bddad6bc34cb2120f7827a5ed4e0dde27400 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 18 Mar 2021 15:29:06 +0100
Subject: [PATCH 204/506] [modules/shell] do not default to "makewide"

to avoid unnecessarily wide shell modules, set "makewide" to false, if
it is not set at all.

fixes #775
---
 bumblebee_status/modules/contrib/shell.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index cb7bc38..9d75a60 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -47,6 +47,9 @@ class Module(core.module.Module):
             self.__output = "please wait..."
             self.__current_thread = threading.Thread()
 
+        if self.parameter("scrolling.makewide") is None:
+            self.set("scrolling.makewide", False)
+
         # LMB and RMB will update output regardless of timer
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.update)
         core.input.register(self, button=core.input.RIGHT_MOUSE, cmd=self.update)

From e5606495314d9db78257b13525b8147c44f3bb16 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 18 Mar 2021 15:30:03 +0100
Subject: [PATCH 205/506] [modules/shell] remove obsolete event handlers

modules are now automatically updated when clicked.

fixes #776
---
 bumblebee_status/modules/contrib/shell.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index 9d75a60..566de42 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -50,10 +50,6 @@ class Module(core.module.Module):
         if self.parameter("scrolling.makewide") is None:
             self.set("scrolling.makewide", False)
 
-        # LMB and RMB will update output regardless of timer
-        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.update)
-        core.input.register(self, button=core.input.RIGHT_MOUSE, cmd=self.update)
-
     def set_output(self, value):
         self.__output = value
 

From 7756eaaa31523111df898e4af506c66b4b43c0f4 Mon Sep 17 00:00:00 2001
From: jslabik <jarek.slabik.trash@gmail.com>
Date: Sat, 20 Mar 2021 01:18:46 +0100
Subject: [PATCH 206/506] Adding the ability to change the editor to module
 todo

---
 bumblebee_status/modules/contrib/todo.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/todo.py b/bumblebee_status/modules/contrib/todo.py
index 878b63f..df2d788 100644
--- a/bumblebee_status/modules/contrib/todo.py
+++ b/bumblebee_status/modules/contrib/todo.py
@@ -21,9 +21,10 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.output))
 
         self.__doc = os.path.expanduser(self.parameter("file", "~/Documents/todo.txt"))
+        self.__editor = self.parameter("editor", "xdg-open")
         self.__todos = self.count_items()
         core.input.register(
-            self, button=core.input.LEFT_MOUSE, cmd="xdg-open {}".format(self.__doc)
+            self, button=core.input.LEFT_MOUSE, cmd="{} {}".format(self.__editor, self.__doc)
         )
 
     def output(self, widget):

From 10c9321c24ff0f0ca1056d5c34ed74c57e0fc14b Mon Sep 17 00:00:00 2001
From: Marcos Gabriel Miller <marcosgabrielmiller@gmail.com>
Date: Sat, 27 Mar 2021 17:22:10 -0300
Subject: [PATCH 207/506] [themes] add albiceleste-powerline

---
 themes/albiceleste-powerline.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 themes/albiceleste-powerline.json

diff --git a/themes/albiceleste-powerline.json b/themes/albiceleste-powerline.json
new file mode 100644
index 0000000..e046882
--- /dev/null
+++ b/themes/albiceleste-powerline.json
@@ -0,0 +1,20 @@
+{
+	"icons": [ "awesome-fonts" ],
+	"defaults": {
+		"separator-block-width": 0,
+		"warning": {
+            "fg": "#000000",
+            "bg": "#ffff00"
+		},
+		"critical": {
+            "fg": "#000000",
+            "bg": "#ffff00"
+
+		}
+	},
+	"cycle": [
+		{"fg": "#000000", "bg": "#87ceeb"},
+        {"fg": "#000000", "bg": "#FFFFFF"}
+	]
+
+}

From abcf861fcbfbaaf1d615f154dfcfa75e938bd377 Mon Sep 17 00:00:00 2001
From: Marcos Gabriel Miller <marcosgabrielmiller@gmail.com>
Date: Sat, 27 Mar 2021 17:22:35 -0300
Subject: [PATCH 208/506] [themes] add rastafari-powerline

---
 themes/rastafari-powerline.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 themes/rastafari-powerline.json

diff --git a/themes/rastafari-powerline.json b/themes/rastafari-powerline.json
new file mode 100644
index 0000000..b7c8c21
--- /dev/null
+++ b/themes/rastafari-powerline.json
@@ -0,0 +1,21 @@
+{
+	"icons": [ "awesome-fonts" ],
+	"defaults": {
+		"separator-block-width": 0,
+		"warning": {
+			"fg": "#000000",
+			"bg": "#FFFFFF"
+		},
+		"critical": {
+			"fg": "#000000",
+			"bg": "#FFFFFF"
+		}
+	},
+	"cycle": [
+		{"fg": "#FFFFFF", "bg": "#008000"},
+		{"fg": "#000000", "bg": "#ffff00"},
+		{"fg": "#000000", "bg": "#ff0000"}
+		
+	]
+
+}
\ No newline at end of file

From 527d1706c2b842bdebf9a83224dc76619d7f6ffc Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 2 Apr 2021 03:30:09 +0000
Subject: [PATCH 209/506] [core/module] add fallback for module loading

Looks like some Python versions work with find_spec(), others with
spec_from_file_location(), so add find_spec() as fallback.

fixes #779
---
 bumblebee_status/core/module.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 5be7a4f..c4b66a4 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -27,10 +27,16 @@ def import_user(module_short, config, theme):
             return getattr(mod, "Module")(config, theme)
         else:
             log.debug("importing {} from user via importlib.util".format(module_short))
-            spec = importlib.util.spec_from_file_location("modules.{}".format(module_short), usermod)
-            mod = importlib.util.module_from_spec(spec)
-            spec.loader.exec_module(mod)
-            return mod.Module(config, theme)
+            try:
+                spec = importlib.util.spec_from_file_location("modules.{}".format(module_short), usermod)
+                mod = importlib.util.module_from_spec(spec)
+                spec.loader.exec_module(mod)
+                return mod.Module(config, theme)
+            except Exception as e:
+                spec = importlib.util.find_spec("modules.{}".format(module_short), usermod)
+                mod = importlib.util.module_from_spec(spec)
+                spec.loader.exec_module(mod)
+                return mod.Module(config, theme)
     raise ImportError("not found")
 
 """Loads a module by name

From 0410ac9c6b2860a0bb077d384f8da07ba37d15ce Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 3 Apr 2021 19:24:01 +0000
Subject: [PATCH 210/506] [doc/shortcut] better example for shortcut module

---
 bumblebee_status/modules/contrib/shortcut.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/shortcut.py b/bumblebee_status/modules/contrib/shortcut.py
index 129bfdc..ff5b47f 100644
--- a/bumblebee_status/modules/contrib/shortcut.py
+++ b/bumblebee_status/modules/contrib/shortcut.py
@@ -9,7 +9,7 @@ a delimiter (; semicolon by default).
 For example in order to create two shortcuts labeled A and B with commands
 cmdA and cmdB you could do:
 
- ./bumblebee-status -m shortcut -p shortcut.cmd='ls;ps' shortcut.label='A;B'
+ ./bumblebee-status -m shortcut -p shortcut.cmd='firefox https://www.google.com;google-chrome https://google.com' shortcut.label='Google (Firefox);Google (Chrome)'
 
 Parameters:
     * shortcut.cmds  : List of commands to execute

From 4a6be622a88668cab02790191c312323a848fbbe Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 3 Apr 2021 19:29:40 +0000
Subject: [PATCH 211/506] [modules/rotation] fix widget creation

each iteration of the rotation module created new/duplicate widgets,
causing a status bar of infinite length.

fixes #782
---
 bumblebee_status/modules/contrib/rotation.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/rotation.py b/bumblebee_status/modules/contrib/rotation.py
index 13f656e..d05c463 100644
--- a/bumblebee_status/modules/contrib/rotation.py
+++ b/bumblebee_status/modules/contrib/rotation.py
@@ -31,14 +31,13 @@ class Module(core.module.Module):
                     orientation = curr_orient
                     break
 
-            widget = self.widget(display)
+            widget = self.widget(name=display)
             if not widget:
                 widget = self.add_widget(full_text=display, name=display)
                 core.input.register(
                     widget, button=core.input.LEFT_MOUSE, cmd=self.__toggle
                 )
             widget.set("orientation", orientation)
-            widgets.append(widget)
 
     def state(self, widget):
         return widget.get("orientation", "normal")

From 8001ed3ada13eb9799442a258d7c1a5f17633029 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:16:54 +0200
Subject: [PATCH 212/506] [modules/cpu] Add per-cpu mode

By explicitly setting "cpu.percpu=True" as parameter, it is now possible
to get the CPU utilization on a per-cpu basis.

Future extension: One widget per CPU (add ID of CPU and add
warning/error state on a per CPU basis)

see #785
---
 bumblebee_status/modules/core/cpu.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/bumblebee_status/modules/core/cpu.py b/bumblebee_status/modules/core/cpu.py
index 59c6e71..51dc695 100644
--- a/bumblebee_status/modules/core/cpu.py
+++ b/bumblebee_status/modules/core/cpu.py
@@ -12,6 +12,7 @@ Parameters:
     * cpu.warning : Warning threshold in % of CPU usage (defaults to 70%)
     * cpu.critical: Critical threshold in % of CPU usage (defaults to 80%)
     * cpu.format  : Format string (defaults to '{:.01f}%')
+    * cpu.percpu  : If set to true, show each individual cpu (defaults to false)
 """
 
 import psutil
@@ -20,28 +21,37 @@ import core.module
 import core.widget
 import core.input
 
+import util.format
+
 
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.utilization))
-        self.widget().set("theme.minwidth", self._format.format(100.0 - 10e-20))
-        self._utilization = psutil.cpu_percent(percpu=False)
+        self._percpu = util.format.asbool(self.parameter("percpu", False))
+        self.update()
+        self.widget().set("theme.minwidth", self._format.format(*[100.0 - 10e-20]*len(self._utilization)))
         core.input.register(
             self, button=core.input.LEFT_MOUSE, cmd="gnome-system-monitor"
         )
 
     @property
     def _format(self):
-        return self.parameter("format", "{:.01f}%")
+        fmt = self.parameter("format", "{:.01f}%")
+        if self._percpu:
+            fmt = [fmt]*len(self._utilization)
+            fmt = " ".join(fmt)
+        return fmt
 
     def utilization(self, _):
-        return self._format.format(self._utilization)
+        return self._format.format(*self._utilization)
 
     def update(self):
-        self._utilization = psutil.cpu_percent(percpu=False)
+        self._utilization = psutil.cpu_percent(percpu=self._percpu)
+        if not self._percpu:
+            self._utilization = [self._utilization]
 
     def state(self, _):
-        return self.threshold_state(self._utilization, 70, 80)
+        return self.threshold_state(sum(self._utilization)/len(self._utilization), 70, 80)
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 10c169af8a7035d1d7bf450adede183bbfab8f3c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:17:13 +0200
Subject: [PATCH 213/506] [modules/core/cpu] optionally add per-cpu widget

if the parameter "percpu" is set to true, create one widget per cpu, and
also handle warning/error state on a per-widget basis.

see #785
---
 bumblebee_status/modules/core/cpu.py | 33 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/bumblebee_status/modules/core/cpu.py b/bumblebee_status/modules/core/cpu.py
index 51dc695..77ac20a 100644
--- a/bumblebee_status/modules/core/cpu.py
+++ b/bumblebee_status/modules/core/cpu.py
@@ -26,32 +26,35 @@ import util.format
 
 class Module(core.module.Module):
     def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.utilization))
+        super().__init__(config, theme, [])
         self._percpu = util.format.asbool(self.parameter("percpu", False))
-        self.update()
-        self.widget().set("theme.minwidth", self._format.format(*[100.0 - 10e-20]*len(self._utilization)))
+
+        for idx, cpu_perc in enumerate(self.cpu_utilization()):
+            widget = self.add_widget(name="cpu#{}".format(idx), full_text=self.utilization)
+            widget.set("utilization", cpu_perc)
+            widget.set("theme.minwidth", self._format.format(100.0 - 10e-20))
+
         core.input.register(
             self, button=core.input.LEFT_MOUSE, cmd="gnome-system-monitor"
         )
 
     @property
     def _format(self):
-        fmt = self.parameter("format", "{:.01f}%")
-        if self._percpu:
-            fmt = [fmt]*len(self._utilization)
-            fmt = " ".join(fmt)
-        return fmt
+        return self.parameter("format", "{:.01f}%")
 
-    def utilization(self, _):
-        return self._format.format(*self._utilization)
+    def utilization(self, widget):
+        return self._format.format(widget.get("utilization", 0.0))
+
+    def cpu_utilization(self):
+        tmp = psutil.cpu_percent(percpu=self._percpu)
+        return tmp if self._percpu else [tmp]
 
     def update(self):
-        self._utilization = psutil.cpu_percent(percpu=self._percpu)
-        if not self._percpu:
-            self._utilization = [self._utilization]
+        for idx, cpu_perc in enumerate(self.cpu_utilization()):
+            self.widgets()[idx].set("utilization", cpu_perc)
 
-    def state(self, _):
-        return self.threshold_state(sum(self._utilization)/len(self._utilization), 70, 80)
+    def state(self, widget):
+        return self.threshold_state(widget.get("utilization", 0.0), 70, 80)
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From fb6be007e590a48fbcb8ef623943118323b56ddf Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:17:28 +0200
Subject: [PATCH 214/506] [core/output] fix minimum width with padding

when calculating the minimum width of a widget, also take the padding
into consideration.

see #785
---
 bumblebee_status/core/output.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 1760309..9c032d6 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -57,6 +57,9 @@ class block(object):
     def set(self, key, value):
         self.__attributes[key] = value
 
+    def get(self, key, default=None):
+        return self.__attributes.get(key, default)
+
     def is_pango(self, attr):
         if isinstance(attr, dict) and "pango" in attr:
             return True
@@ -91,9 +94,17 @@ class block(object):
             assign(self.__attributes, result, "background", "bg")
 
         if "full_text" in self.__attributes:
+            prefix = self.__pad(self.pangoize(self.__attributes.get("prefix")))
+            suffix = self.__pad(self.pangoize(self.__attributes.get("suffix")))
+            self.set("_prefix", prefix)
+            self.set("_suffix", suffix)
+            self.set("_raw", self.get("full_text"))
             result["full_text"] = self.pangoize(result["full_text"])
             result["full_text"] = self.__format(self.__attributes["full_text"])
 
+        if "min-width" in self.__attributes and "padding" in self.__attributes:
+            self.set("min-width", self.__format(self.get("min-width")))
+
         for k in [
             "name",
             "instance",
@@ -123,11 +134,8 @@ class block(object):
     def __format(self, text):
         if text is None:
             return None
-        prefix = self.__pad(self.pangoize(self.__attributes.get("prefix")))
-        suffix = self.__pad(self.pangoize(self.__attributes.get("suffix")))
-        self.set("_prefix", prefix)
-        self.set("_suffix", suffix)
-        self.set("_raw", text)
+        prefix = self.get("_prefix")
+        suffix = self.get("_suffix")
         return "{}{}{}".format(prefix, text, suffix)
 
 

From 028932a560a87f12829324c2565be6664cce1e26 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:17:55 +0200
Subject: [PATCH 215/506] [tests/cpu] adapt tests and add per-cpu tests

fixes #785
---
 tests/modules/core/test_cpu.py | 37 +++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/tests/modules/core/test_cpu.py b/tests/modules/core/test_cpu.py
index eca2362..d1a015e 100644
--- a/tests/modules/core/test_cpu.py
+++ b/tests/modules/core/test_cpu.py
@@ -7,8 +7,9 @@ import modules.core.cpu
 
 pytest.importorskip("psutil")
 
-def build_module():
-    config = core.config.Config([])
+def build_module(percpu=False):
+    config = core.config.Config(["-p", "percpu={}".format(percpu)])
+    config.set("cpu.percpu", percpu)
     return modules.core.cpu.Module(config=config, theme=None)
 
 def cpu_widget(module):
@@ -42,21 +43,47 @@ class TestCPU(TestCase):
         cpu_percent_mock.return_value = 50
         module = build_module()
 
-        assert module.state(None) == None
+        assert module.state(module.widget()) == None
 
     @mock.patch('psutil.cpu_percent')
     def test_warning_state(self, cpu_percent_mock):
         cpu_percent_mock.return_value = 75
         module = build_module()
 
-        assert module.state(None) == 'warning'
+        assert module.state(module.widget()) == 'warning'
 
     @mock.patch('psutil.cpu_percent')
     def test_critical_state(self, cpu_percent_mock):
         cpu_percent_mock.return_value = 82
         module = build_module()
 
-        assert module.state(None) == 'critical'
+        assert module.state(module.widget()) == 'critical'
+
+    @mock.patch('psutil.cpu_percent')
+    def test_healthy_state_percpu(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = [50,42,47]
+        module = build_module(percpu=True)
+
+        for widget in module.widgets():
+            assert module.state(widget) == None
+
+    @mock.patch('psutil.cpu_percent')
+    def test_warning_state_percpu(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = [50,72,47]
+        module = build_module(percpu=True)
+
+        assert module.state(module.widgets()[0]) == None
+        assert module.state(module.widgets()[1]) == "warning"
+        assert module.state(module.widgets()[2]) == None
+
+    @mock.patch('psutil.cpu_percent')
+    def test_warning_state_percpu(self, cpu_percent_mock):
+        cpu_percent_mock.return_value = [50,72,99]
+        module = build_module(percpu=True)
+
+        assert module.state(module.widgets()[0]) == None
+        assert module.state(module.widgets()[1]) == "warning"
+        assert module.state(module.widgets()[2]) == "critical" 
 
     @mock.patch('core.input.register')
     def test_register_left_mouse_action(self, input_register_mock):

From 1e13798c958e2ddbd33aba70dfed09204ab5f925 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 28 Apr 2021 12:41:04 +0200
Subject: [PATCH 216/506] [core/input] add pseudo-event "update" to selectively
 update modules

to trigger an update of a module (without actually triggering a mouse
interaction), use the special event "update":

bumblebee-ctl -m <module> -b update

see #784
---
 bumblebee-ctl                  | 3 ++-
 bumblebee_status/core/input.py | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bumblebee-ctl b/bumblebee-ctl
index b1c0f37..435162d 100755
--- a/bumblebee-ctl
+++ b/bumblebee-ctl
@@ -12,6 +12,7 @@ button = {
     "right-mouse": 3,
     "wheel-up": 4,
     "wheel-down": 5,
+    "update": -1,
 }
 
 
@@ -20,7 +21,7 @@ def main():
     parser.add_argument(
         "-b",
         "--button",
-        choices=["left-mouse", "right-mouse", "middle-mouse", "wheel-up", "wheel-down"],
+        choices=["left-mouse", "right-mouse", "middle-mouse", "wheel-up", "wheel-down", "update"],
         help="button to emulate",
         default="left-mouse",
     )
diff --git a/bumblebee_status/core/input.py b/bumblebee_status/core/input.py
index b0d9f23..2f9fdfc 100644
--- a/bumblebee_status/core/input.py
+++ b/bumblebee_status/core/input.py
@@ -10,6 +10,7 @@ MIDDLE_MOUSE = 2
 RIGHT_MOUSE = 3
 WHEEL_UP = 4
 WHEEL_DOWN = 5
+UPDATE = -1
 
 
 def button_name(button):
@@ -23,6 +24,8 @@ def button_name(button):
         return "wheel-up"
     if button == WHEEL_DOWN:
         return "wheel-down"
+    if button == UPDATE:
+        return "update"
     return "n/a"
 
 

From 9553bec7db7113dd82c443d57a6a722a222e6d07 Mon Sep 17 00:00:00 2001
From: Edward <57063825+solar-core@users.noreply.github.com>
Date: Wed, 28 Apr 2021 20:48:49 +0300
Subject: [PATCH 217/506] Update modules.rst

---
 docs/modules.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/modules.rst b/docs/modules.rst
index 87a80ad..440a0a3 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -22,6 +22,7 @@ Parameters:
     * cpu.warning : Warning threshold in % of CPU usage (defaults to 70%)
     * cpu.critical: Critical threshold in % of CPU usage (defaults to 80%)
     * cpu.format  : Format string (defaults to '{:.01f}%')
+    * cpu.percpu  : If set to true, show each individual cpu (defaults to false)
 
 .. image:: ../screenshots/cpu.png
 

From 046b950b8a0c9c5bd91b40b1d5b1ceeb4f7ef939 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Mon, 10 May 2021 14:35:34 +0200
Subject: [PATCH 218/506] Fix parameters name for the sun module

---
 bumblebee_status/modules/contrib/sun.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/sun.py b/bumblebee_status/modules/contrib/sun.py
index 6b0734d..e9eefd2 100644
--- a/bumblebee_status/modules/contrib/sun.py
+++ b/bumblebee_status/modules/contrib/sun.py
@@ -8,8 +8,8 @@ Requires the following python packages:
     * python-dateutil
 
 Parameters:
-    * cpu.lat : Latitude of your location
-    * cpu.lon : Longitude of your location
+    * sun.lat : Latitude of your location
+    * sun.lon : Longitude of your location
 
 (if none of those are set, location is determined automatically via location APIs)
 

From 7f03c9ce2d075ca42385fd8c5a9ed1804ecda211 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 10 May 2021 17:48:23 +0000
Subject: [PATCH 219/506] [doc] update module documentation

---
 docs/modules.rst | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index 440a0a3..0e166e6 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -85,6 +85,14 @@ Requires:
 
 .. image:: ../screenshots/git.png
 
+keys
+~~~~
+
+Shows when a key is pressed
+
+Parameters:
+    * keys.keys: Comma-separated list of keys to monitor (defaults to "")
+
 layout-xkb
 ~~~~~~~~~~
 
@@ -1238,7 +1246,7 @@ a delimiter (; semicolon by default).
 For example in order to create two shortcuts labeled A and B with commands
 cmdA and cmdB you could do:
 
- ./bumblebee-status -m shortcut -p shortcut.cmd='ls;ps' shortcut.label='A;B'
+ ./bumblebee-status -m shortcut -p shortcut.cmd='firefox https://www.google.com;google-chrome https://google.com' shortcut.label='Google (Firefox);Google (Chrome)'
 
 Parameters:
     * shortcut.cmds  : List of commands to execute
@@ -1321,9 +1329,6 @@ stock
 
 Display a stock quote from finance.yahoo.com
 
-Requires the following python packages:
-    * requests
-
 Parameters:
     * stock.symbols : Comma-separated list of symbols to fetch
     * stock.change : Should we fetch change in stock value (defaults to True)
@@ -1344,8 +1349,8 @@ Requires the following python packages:
     * python-dateutil
 
 Parameters:
-    * cpu.lat : Latitude of your location
-    * cpu.lon : Longitude of your location
+    * sun.lat : Latitude of your location
+    * sun.lon : Longitude of your location
 
 (if none of those are set, location is determined automatically via location APIs)
 

From 902288f30d5f5cdcf619950ebc5acc1976486f72 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 11 May 2021 11:23:06 +0200
Subject: [PATCH 220/506] [modules/sensors] do not truncate temperature

use strip() instead of a sub-list to get the value for the temperature.

fixes #787
---
 bumblebee_status/modules/contrib/sensors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/sensors.py b/bumblebee_status/modules/contrib/sensors.py
index 68b792a..8164f00 100644
--- a/bumblebee_status/modules/contrib/sensors.py
+++ b/bumblebee_status/modules/contrib/sensors.py
@@ -98,7 +98,7 @@ class Module(core.module.Module):
             try:
                 temperature = open(
                     self.parameter("path", "/sys/class/thermal/thermal_zone0/temp")
-                ).read()[:2]
+                ).read().strip()
                 log.debug("retrieved temperature from /sys/class/")
                 # TODO: Iterate through all thermal zones to determine the correct one and use its value
                 # https://unix.stackexchange.com/questions/304845/discrepancy-between-number-of-cores-and-thermal-zones-in-sys-class-thermal

From dfd23a44de8964dcd4ae9e1971c24c6efed71664 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 16 May 2021 21:09:58 +0200
Subject: [PATCH 221/506] [modules/layout] add a new - generic - layout module

Add a new module "layout" that will eventually evolve into the only
keyboard layout module.

Right now, it uses an external binary (get-kbd-layout) to determine the
layout of a keyboard device (because I did not manage to call libX11
with ctypes correctly).

see #788
see #790
---
 .gitignore                              |   2 ++
 bin/get-kbd-layout                      | Bin 0 -> 21512 bytes
 bumblebee_status/modules/core/layout.py |  39 ++++++++++++++++++++++++
 util/Makefile                           |  13 ++++++++
 util/layout.c                           |  39 ++++++++++++++++++++++++
 5 files changed, 93 insertions(+)
 create mode 100755 bin/get-kbd-layout
 create mode 100644 bumblebee_status/modules/core/layout.py
 create mode 100644 util/Makefile
 create mode 100644 util/layout.c

diff --git a/.gitignore b/.gitignore
index 2bf1ac8..c21fe43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.o
+
 # Vim swap files
 *swp
 *~
diff --git a/bin/get-kbd-layout b/bin/get-kbd-layout
new file mode 100755
index 0000000000000000000000000000000000000000..7ce6ccf1f0f105b58ed302f5950b540abfcf4a6f
GIT binary patch
literal 21512
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
P{XP9kW1GvsC5rzBp!`HM

literal 0
HcmV?d00001

diff --git a/bumblebee_status/modules/core/layout.py b/bumblebee_status/modules/core/layout.py
new file mode 100644
index 0000000..3ebeeb5
--- /dev/null
+++ b/bumblebee_status/modules/core/layout.py
@@ -0,0 +1,39 @@
+# pylint: disable=C0111,R0903
+
+"""Displays the current keyboard layout
+
+Parameters:
+    * layout.device: The device ID of the keyboard (as reported by `xinput -list`), defaults to the core device
+"""
+
+import re
+
+import core.widget
+import core.module
+
+import util.cli
+
+from bumblebee_status.discover import utility
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config=config, theme=theme, widgets=core.widget.Widget(self.get_layout))
+
+        self._cmd = utility("get-kbd-layout")
+        keyboard = self.parameter("device", None)
+        if keyboard:
+            self._cmd += " {}".format(keyboard)
+
+    def get_layout(self, widget):
+        result = util.cli.execute(self._cmd, ignore_errors=True)
+
+        m = re.search("([a-zA-Z]+_)?([a-zA-Z]+)(\(([\w-]+)\))?", result)
+
+        if m:
+            layout = m.group(2)
+            variant = m.group(3)
+            return layout if not variant else "{} {}".format(layout, variant)
+
+        return "n/a"
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/util/Makefile b/util/Makefile
new file mode 100644
index 0000000..1e187c2
--- /dev/null
+++ b/util/Makefile
@@ -0,0 +1,13 @@
+CC=gcc
+CFLAGS=
+
+%.o: %.c
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+../bin/get-kbd-layout: layout.o
+	$(CC) -o $@ layout.o -lX11
+
+.PHONY: clean
+
+clean:
+	rm -f *.o
diff --git a/util/layout.c b/util/layout.c
new file mode 100644
index 0000000..21aac1f
--- /dev/null
+++ b/util/layout.c
@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <X11/XKBlib.h>
+
+void err_if(int condition, const char* msg)
+{
+	if (condition) {
+		fprintf(stderr, "fatal: %s\n", msg);
+		exit(1);
+	}
+}
+
+int main(int argc, char** argv)
+{
+	Display* display = XOpenDisplay(NULL);
+	err_if(!display, "unable to open display");
+
+	int kbd = argc == 1 ? XkbUseCoreKbd : atoi(argv[1]);
+
+	XkbStateRec state;
+	XkbGetState(display, kbd, &state);
+
+	XkbDescPtr desc = XkbGetKeyboard(display, XkbAllComponentsMask, kbd);
+	char* symbols = XGetAtomName(display, desc->names->symbols);
+	printf("%s\n", symbols);
+
+#if 0
+	char *group = XGetAtomName(display, desc->names->groups[state.group]);
+	XFree(group);
+#endif
+	XFree(symbols);
+	XFree(desc);
+
+	XCloseDisplay(display);
+
+	return 0;
+}
+

From 4b6b4b905217893a27bb5e336114ea78fa43e799 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 24 May 2021 12:56:02 +0200
Subject: [PATCH 222/506] [core] add custom minimizer capability

Add a new set of parameters to allow modules to be customly minimized.

It works like this: If a module has the parameter "minimize" set to a
true value, it will *not* use the built-in minimizer, and instead look
for "minimized" parameters (e.g. if date has the "format" parameter, it
would look for "minimized.format" when in minimized state). This allows
the user to have different parametrization for different states.

Also, using the "start-minimized" parameter allows for modules to start
minimized.

Note: This is hinging off the *module*, not the *widget* (the current,
hard-coded hiding is per-widget). This means that modules using this
method will only show a single widget - the first one - when in
minimized state. The module author has to account for that.

see #791
---
 bumblebee_status/core/module.py           |  4 ++++
 bumblebee_status/core/output.py           | 10 ++++++++++
 bumblebee_status/modules/core/datetime.py |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index c4b66a4..312862d 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -95,6 +95,8 @@ class Module(core.input.Object):
         self.alias = self.__config.get("__alias__", None)
         self.id = self.alias if self.alias else self.name
         self.next_update = None
+        self.minimized = False
+        self.minimized = self.parameter("start-minimized", False)
 
         self.theme = theme
 
@@ -126,6 +128,8 @@ class Module(core.input.Object):
 
         for prefix in [self.name, self.module_name, self.alias]:
             value = self.__config.get("{}.{}".format(prefix, key), value)
+            if self.minimized:
+                value = self.__config.get("{}.minimized.{}".format(prefix, key), value)
         return value
 
     """Set a parameter for this module
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 9c032d6..121df27 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -166,6 +166,12 @@ class i3(object):
     def toggle_minimize(self, event):
         widget_id = event["instance"]
 
+        for module in self.__modules:
+            if module.widget(widget_id=widget_id) and util.format.asbool(module.parameter("minimize", False)) == True:
+                # this module can customly minimize
+                module.minimized = not module.minimized
+                return
+
         if widget_id in self.__content:
             self.__content[widget_id]["minimized"] = not self.__content[widget_id]["minimized"]
 
@@ -216,6 +222,10 @@ class i3(object):
 
     def blocks(self, module):
         blocks = []
+        if module.minimized:
+            blocks.extend(self.separator_block(module, module.widgets()[0]))
+            blocks.append(self.__content_block(module, module.widgets()[0]))
+            return blocks
         for widget in module.widgets():
             if widget.module and self.__config.autohide(widget.module.name):
                 if not any(
diff --git a/bumblebee_status/modules/core/datetime.py b/bumblebee_status/modules/core/datetime.py
index f421e15..febb5fb 100644
--- a/bumblebee_status/modules/core/datetime.py
+++ b/bumblebee_status/modules/core/datetime.py
@@ -21,7 +21,6 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.full_text))
 
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd="calendar")
-        self._fmt = self.parameter("format", self.default_format())
         l = locale.getdefaultlocale()
         if not l or l == (None, None):
             l = ("en_US", "UTF-8")
@@ -36,7 +35,8 @@ class Module(core.module.Module):
 
     def full_text(self, widget):
         enc = locale.getpreferredencoding()
-        retval = datetime.datetime.now().strftime(self._fmt)
+        fmt = self.parameter("format", self.default_format())
+        retval = datetime.datetime.now().strftime(fmt)
         if hasattr(retval, "decode"):
             return retval.decode(enc)
         return retval

From 51f68addcdb3dbf266a89c1510935ad230eacb5a Mon Sep 17 00:00:00 2001
From: Yufan You <ouuansteve@gmail.com>
Date: Fri, 11 Jun 2021 17:34:46 +0800
Subject: [PATCH 223/506] [modules/playerctl]: BREAKING: use `playerctl -f` and
 add `playerctl.args`

1. Use `playerctl -f` to format, which is more powerful. This also fixes
   #767, which is caused by missing a few fields of the metadata.
2. Add `playerctl.args`, so that users can choose a specific player,
   etc.
3. Display nothing when there's no running player.

This is a breaking change. Users need to change `{title}` to
`{{title}}`.
---
 bumblebee_status/modules/contrib/playerctl.py | 65 +++++++++----------
 docs/modules.rst                              |  8 ++-
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index 3a0d7e5..d370df4 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -6,12 +6,14 @@ Requires the following executable:
     * playerctl
 
 Parameters:
-    * playerctl.format:   Format string (defaults to '{artist} - {title}')
-      Available values are: {album}, {title}, {artist}, {trackNumber}
+    * playerctl.format:   Format string (defaults to '{{artist}} - {{title}}  {{duration(position)}}/{{duration(mpris:length)}}')
+      The format string is passed to 'playerctl -f' as an argument. See the 'Format Strings' section of 'man playerctl' for more information.
     * playerctl.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
+    * playerctl.args:     The arguments added to playerctl.
+      You can check 'playerctl --help' or `its README <https://github.com/altdesktop/playerctl#using-the-cli>`_. For example, it could be '-p vlc,%any'.
 
-Parameters are inherited from `spotify` module, many thanks to its developers!
+Parameters are inspired by the `spotify` module, many thanks to its developers!
 
 contributed by `smitajit <https://github.com/smitajit>`_ - many thanks!
 """
@@ -36,9 +38,8 @@ class Module(core.module.Module):
             )
         )
 
-        self.__song = ""
-        self.__cmd = "playerctl "
-        self.__format = self.parameter("format", "{artist} - {title}")
+        self.__cmd = "playerctl " + self.parameter("args", "") + " "
+        self.__format = self.parameter("format", "{{artist}} - {{title}}  {{duration(position)}}/{{duration(mpris:length)}}")
 
         widget_map = {}
         for widget_name in self.__layout:
@@ -48,7 +49,6 @@ class Module(core.module.Module):
                     "button": core.input.LEFT_MOUSE,
                     "cmd": self.__cmd + "previous",
                 }
-                widget.set("state", "prev")
             elif widget_name == "playerctl.pause":
                 widget_map[widget] = {
                     "button": core.input.LEFT_MOUSE,
@@ -59,7 +59,6 @@ class Module(core.module.Module):
                     "button": core.input.LEFT_MOUSE,
                     "cmd": self.__cmd + "next",
                 }
-                widget.set("state", "next")
             elif widget_name == "playerctl.song":
                 widget_map[widget] = [
                     {
@@ -86,32 +85,32 @@ class Module(core.module.Module):
 
     def update(self):
         try:
-            self.__get_song()
-
-            for widget in self.widgets():
-                if widget.name == "playerctl.pause":
-                    playback_status = str(util.cli.execute(self.__cmd + "status")).strip()
-                    if playback_status != "":
-                        if playback_status == "Playing":
-                            widget.set("state", "playing")
-                        else:
-                            widget.set("state", "paused")
-                elif widget.name == "playerctl.song":
-                    widget.set("state", "song")
-                    widget.full_text(self.__song)
+            playback_status = str(util.cli.execute(self.__cmd + "status")).strip()
         except Exception as e:
             logging.exception(e)
-            self.__song = ""
+            playback_status = None
+        for widget in self.widgets():
+            if playback_status:
+                if widget.name == "playerctl.pause":
+                    if playback_status == "Playing":
+                        widget.set("state", "playing")
+                    elif playback_status == "Paused":
+                        widget.set("state", "paused")
+                    else:
+                        widget.set("state", "")
+                elif widget.name == "playerctl.next":
+                    widget.set("state", "next")
+                elif widget.name == "playerctl.prev":
+                    widget.set("state", "prev")
+                elif widget.name == "playerctl.song":
+                    widget.full_text(self.__get_song())
+            else:
+                widget.set("state", "")
+                widget.full_text(" ")
 
     def __get_song(self):
-        album = str(util.cli.execute(self.__cmd + "metadata xesam:album")).strip()
-        title = str(util.cli.execute(self.__cmd + "metadata xesam:title")).strip()
-        artist = str(util.cli.execute(self.__cmd + "metadata xesam:albumArtist")).strip()
-        track_number = str(util.cli.execute(self.__cmd + "metadata xesam:trackNumber")).strip()
-
-        self.__song = self.__format.format(
-            album = album,
-            title = title,
-            artist = artist,
-            trackNumber = track_number
-        )
+        try:
+            return str(util.cli.execute(self.__cmd + "metadata -f '" + self.__format + "'")).strip()
+        except Exception as e:
+            logging.exception(e)
+            return " "
diff --git a/docs/modules.rst b/docs/modules.rst
index 0e166e6..25952d8 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1060,12 +1060,14 @@ Requires the following executable:
     * playerctl
 
 Parameters:
-    * playerctl.format:   Format string (defaults to '{artist} - {title}')
-      Available values are: {album}, {title}, {artist}, {trackNumber}
+    * playerctl.format:   Format string (defaults to '{{artist}} - {{title}}  {{duration(position)}}/{{duration(mpris:length)}}')
+      The format string is passed to 'playerctl -f' as an argument. See the 'Format Strings' section of 'man playerctl' for more information.
     * playerctl.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
+    * playerctl.args:     The arguments added to playerctl.
+      You can check 'playerctl --help' or `its readme <https://github.com/altdesktop/playerctl#using-the-cli>`_. For example, it could be '-p vlc,%any'.
 
-Parameters are inherited from `spotify` module, many thanks to its developers!
+Parameters are inspired by the `spotify` module, many thanks to its developers!
 
 contributed by `smitajit <https://github.com/smitajit>`_ - many thanks!
 

From c4046d0cd22f3d238d63dd751cd7dd625a7d361e Mon Sep 17 00:00:00 2001
From: Yufan You <ouuansteve@gmail.com>
Date: Fri, 11 Jun 2021 18:12:13 +0800
Subject: [PATCH 224/506] [doc]: link to the README instead of manpage

---
 bumblebee_status/modules/contrib/playerctl.py | 4 ++--
 docs/modules.rst                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index d370df4..ad3cfc0 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -6,8 +6,8 @@ Requires the following executable:
     * playerctl
 
 Parameters:
-    * playerctl.format:   Format string (defaults to '{{artist}} - {{title}}  {{duration(position)}}/{{duration(mpris:length)}}')
-      The format string is passed to 'playerctl -f' as an argument. See the 'Format Strings' section of 'man playerctl' for more information.
+    * playerctl.format:   Format string (defaults to '{{artist}} - {{title}}  {{duration(position)}}/{{duration(mpris:length)}}').
+      The format string is passed to 'playerctl -f' as an argument. Read `the README <https://github.com/altdesktop/playerctl#printing-properties-and-metadata>`_ for more information.
     * playerctl.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
     * playerctl.args:     The arguments added to playerctl.
diff --git a/docs/modules.rst b/docs/modules.rst
index 25952d8..49e509b 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1060,8 +1060,8 @@ Requires the following executable:
     * playerctl
 
 Parameters:
-    * playerctl.format:   Format string (defaults to '{{artist}} - {{title}}  {{duration(position)}}/{{duration(mpris:length)}}')
-      The format string is passed to 'playerctl -f' as an argument. See the 'Format Strings' section of 'man playerctl' for more information.
+    * playerctl.format:   Format string (defaults to '{{artist}} - {{title}}  {{duration(position)}}/{{duration(mpris:length)}}').
+      The format string is passed to 'playerctl -f' as an argument. Read `the README <https://github.com/altdesktop/playerctl#printing-properties-and-metadata>`_ for more information.
     * playerctl.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
     * playerctl.args:     The arguments added to playerctl.

From e5007a5729fdf6cdd743b247cb0ab65613f90656 Mon Sep 17 00:00:00 2001
From: Sayan <sayan227sil@ymail.com>
Date: Thu, 24 Jun 2021 23:17:35 +0530
Subject: [PATCH 225/506] Add active gpu module using optimus-manager

---
 bumblebee_status/modules/contrib/optman.py | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/optman.py

diff --git a/bumblebee_status/modules/contrib/optman.py b/bumblebee_status/modules/contrib/optman.py
new file mode 100644
index 0000000..c928f24
--- /dev/null
+++ b/bumblebee_status/modules/contrib/optman.py
@@ -0,0 +1,36 @@
+"""Displays currently active gpu by optimus-manager
+Requires the following packages:
+
+    * optimus-manager
+
+"""
+
+import subprocess
+
+import core.module
+import core.widget
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.output))
+        self.__gpumode = ""
+
+    def output(self, _):
+        return "GPU: {}".format(self.__gpumode)
+
+    def update(self):
+        cmd = ["optimus-manager", "--print-mode"]
+        output = (
+            subprocess.Popen(cmd, stdout=subprocess.PIPE)
+            .communicate()[0]
+            .decode("utf-8")
+            .lower()
+        )
+
+        if "intel" in output:
+            self.__gpumode = "Intel"
+        elif "nvidia" in output:
+            self.__gpumode = "Nvidia"
+        elif "amd" in output:
+            self.__gpumode = "AMD"

From 37ccbd7f4a1e7aa359de4b437eaf58f035673ed9 Mon Sep 17 00:00:00 2001
From: Yufan You <ouuansteve@gmail.com>
Date: Sat, 26 Jun 2021 18:19:12 +0800
Subject: [PATCH 226/506] [modules/playerctl]: support the stopped status

---
 bumblebee_status/modules/contrib/playerctl.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index ad3cfc0..e02fa84 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -96,6 +96,8 @@ class Module(core.module.Module):
                         widget.set("state", "playing")
                     elif playback_status == "Paused":
                         widget.set("state", "paused")
+                    elif playback_status == "Stopped":
+                        widget.set("state", "stopped")
                     else:
                         widget.set("state", "")
                 elif widget.name == "playerctl.next":

From 4485b65722645d6c9617b5ff4aea6d62ee8a9adf Mon Sep 17 00:00:00 2001
From: Sayan Sil <sayan227sil@ymail.com>
Date: Wed, 30 Jun 2021 11:31:42 +0530
Subject: [PATCH 227/506] Use the existing util.cli module

---
 bumblebee_status/modules/contrib/optman.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bumblebee_status/modules/contrib/optman.py b/bumblebee_status/modules/contrib/optman.py
index c928f24..337003c 100644
--- a/bumblebee_status/modules/contrib/optman.py
+++ b/bumblebee_status/modules/contrib/optman.py
@@ -5,11 +5,10 @@ Requires the following packages:
 
 """
 
-import subprocess
-
 import core.module
 import core.widget
 
+import util.cli
 
 class Module(core.module.Module):
     def __init__(self, config, theme):
@@ -20,13 +19,8 @@ class Module(core.module.Module):
         return "GPU: {}".format(self.__gpumode)
 
     def update(self):
-        cmd = ["optimus-manager", "--print-mode"]
-        output = (
-            subprocess.Popen(cmd, stdout=subprocess.PIPE)
-            .communicate()[0]
-            .decode("utf-8")
-            .lower()
-        )
+        cmd = "optimus-manager --print-mode"
+        output = util.cli.execute(cmd).strip()
 
         if "intel" in output:
             self.__gpumode = "Intel"

From 1232c4d96092be16c76a9baac35a8c4bb4868683 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Mon, 5 Jul 2021 07:55:47 -0500
Subject: [PATCH 228/506] Initial commit -- give basic message about interface
 being used

---
 bumblebee_status/modules/contrib/network.py | 48 +++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/network.py

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
new file mode 100644
index 0000000..37115e1
--- /dev/null
+++ b/bumblebee_status/modules/contrib/network.py
@@ -0,0 +1,48 @@
+"""
+A module to show currently active network connection (ethernet or wifi)
+and connection strength.
+"""
+
+import subprocess
+import os
+
+import core.module
+import core.widget
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.network))
+        self._is_wireless = True
+        self._interface = None
+        self._message = None
+
+    def network(self, widgets):
+        # start subprocess to get networked data
+        std_out = os.popen("ip route get 8.8.8.8")
+        route_str = " ".join(std_out.read().split())
+        route_tokens = route_str.split(" ")
+
+        try:
+            self._interface = route_tokens[route_tokens.index("dev") + 1] + ":"
+        except ValueError:
+            self._interface = None
+
+        with open("/proc/net/wireless", "r") as f:
+            if self._interface:
+                self._is_wireless = self._interface in f.read()
+
+        # setup message to send to bar
+        if self._interface is None:
+            self._message = "Not connected to a network"
+        elif self._is_wireless:
+            self._message = "Connected to WiFi"
+        else:
+            # self._message = "Connected to Ethernet"
+            self._message = self._message
+            
+
+        return self._message
+
+
+

From f141b95d8f7dd53e86b1e9aff3ce9b12a0178be8 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Mon, 5 Jul 2021 10:29:37 -0500
Subject: [PATCH 229/506] Basic functionaly for dealingn with signal strength

---
 bumblebee_status/modules/contrib/network.py | 49 ++++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index 37115e1..c40d0d8 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -3,8 +3,9 @@ A module to show currently active network connection (ethernet or wifi)
 and connection strength.
 """
 
-import subprocess
-import os
+
+import util.cli
+import util.format
 
 import core.module
 import core.widget
@@ -18,31 +19,55 @@ class Module(core.module.Module):
         self._message = None
 
     def network(self, widgets):
-        # start subprocess to get networked data
-        std_out = os.popen("ip route get 8.8.8.8")
-        route_str = " ".join(std_out.read().split())
+        # run ip route command, tokenize output
+        cmd = "ip route get 8.8.8.8"
+        std_out = util.cli.execute(cmd)
+        route_str = " ".join(std_out.split())
         route_tokens = route_str.split(" ")
 
+        # Attempt to extract a valid network interface device
         try:
-            self._interface = route_tokens[route_tokens.index("dev") + 1] + ":"
+            self._interface = route_tokens[route_tokens.index("dev") + 1]
         except ValueError:
             self._interface = None
 
-        with open("/proc/net/wireless", "r") as f:
-            if self._interface:
+        # Check to see if the interface (if it exists) is wireless
+        if self._interface:
+            with open("/proc/net/wireless", "r") as f:
                 self._is_wireless = self._interface in f.read()
+        f.close()
 
-        # setup message to send to bar
+        # setup message to send to the user
         if self._interface is None:
             self._message = "Not connected to a network"
         elif self._is_wireless:
-            self._message = "Connected to WiFi"
+            cmd = "iwgetid"
+            iw_dat = util.cli.execute(cmd)
+            has_ssid = "ESSID" in iw_dat
+            ssid = iw_dat[iw_dat.index(":") + 2: -2] if has_ssid else "Unknown"
+
+            # Get connection strength
+            cmd = "iwconfig {}".format(self._interface)
+            config_dat = " ".join(util.cli.execute(cmd).split())
+            config_tokens = config_dat.replace("=", " ").split()
+            strength = config_tokens[config_tokens.index("level") + 1]
+            strength = util.format.asint(strength, minimum=-110, maximum=-30)
+
+            self._message = self.__generate_wireless_message(ssid, strength)
         else:
-            # self._message = "Connected to Ethernet"
             self._message = self._message
-            
 
         return self._message
 
 
+    def __generate_wireless_message(self, ssid, strength):
+        computed_strength = 100 * (strength + 110) / 70.0
+        if computed_strength < 25:
+            return ssid + " poor" 
+        if computed_strength < 50:
+            return ssid + " fair"
+        if computed_strength < 75:
+            return ssid + " good"
+
+        return ssid + " excellent"
 

From 4987c7d3e2fa1152224c3d7d540f56dbfdf315dc Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Mon, 5 Jul 2021 11:26:46 -0500
Subject: [PATCH 230/506] added stateful behavior

---
 bumblebee_status/modules/contrib/network.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index c40d0d8..30601b5 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -17,6 +17,7 @@ class Module(core.module.Module):
         self._is_wireless = True
         self._interface = None
         self._message = None
+        self.__signal = -110
 
     def network(self, widgets):
         # run ip route command, tokenize output
@@ -51,19 +52,27 @@ class Module(core.module.Module):
             config_dat = " ".join(util.cli.execute(cmd).split())
             config_tokens = config_dat.replace("=", " ").split()
             strength = config_tokens[config_tokens.index("level") + 1]
-            strength = util.format.asint(strength, minimum=-110, maximum=-30)
+            self.__signal = util.format.asint(strength, minimum=-110, maximum=-30)
 
-            self._message = self.__generate_wireless_message(ssid, strength)
+            self._message = self.__generate_wireless_message(ssid, self.__signal)
         else:
             self._message = self._message
 
         return self._message
 
 
+    def state(self, widget):
+        if self.__signal < -65:
+            return "warning"
+        if self.__signal < -80:
+            return "critical"
+        return None
+
+
     def __generate_wireless_message(self, ssid, strength):
-        computed_strength = 100 * (strength + 110) / 70.0
-        if computed_strength < 25:
-            return ssid + " poor" 
+        computed_strength = 100 * ((strength + 100) / 70.0)
+        if computed_strength < 30:
+            return ssid + " poor"
         if computed_strength < 50:
             return ssid + " fair"
         if computed_strength < 75:

From 448ab6de836b0eedcc7250c0aa97104f3df0c696 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Mon, 5 Jul 2021 12:34:42 -0500
Subject: [PATCH 231/506] Functional display for wireless connection

---
 bumblebee_status/modules/contrib/network.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index 30601b5..f91073e 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -9,9 +9,11 @@ import util.format
 
 import core.module
 import core.widget
+import core.input
 
 
 class Module(core.module.Module):
+    @core.decorators.every(seconds=10)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.network))
         self._is_wireless = True
@@ -19,6 +21,9 @@ class Module(core.module.Module):
         self._message = None
         self.__signal = -110
 
+        # Set up event handler for left mouse click
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd="nm-connection-editor")
+
     def network(self, widgets):
         # run ip route command, tokenize output
         cmd = "ip route get 8.8.8.8"
@@ -71,12 +76,7 @@ class Module(core.module.Module):
 
     def __generate_wireless_message(self, ssid, strength):
         computed_strength = 100 * ((strength + 100) / 70.0)
-        if computed_strength < 30:
-            return ssid + " poor"
-        if computed_strength < 50:
-            return ssid + " fair"
-        if computed_strength < 75:
-            return ssid + " good"
+        return " {} {}%".format(ssid, int(computed_strength))
+
 
-        return ssid + " excellent"
 

From c7df1926dce8fdf3fb0427d79e802955a60694d6 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Mon, 5 Jul 2021 13:09:17 -0500
Subject: [PATCH 232/506] Formatting fixes, fixed state management and added
 some icons

---
 bumblebee_status/modules/contrib/network.py | 36 +++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index f91073e..924c7f4 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -16,9 +16,9 @@ class Module(core.module.Module):
     @core.decorators.every(seconds=10)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.network))
-        self._is_wireless = True
-        self._interface = None
-        self._message = None
+        self.__is_wireless = True
+        self.__interface = None
+        self.__message = None
         self.__signal = -110
 
         # Set up event handler for left mouse click
@@ -33,48 +33,50 @@ class Module(core.module.Module):
 
         # Attempt to extract a valid network interface device
         try:
-            self._interface = route_tokens[route_tokens.index("dev") + 1]
+             self.__interface = route_tokens[route_tokens.index("dev") + 1]  
         except ValueError:
-            self._interface = None
+            self.__interface = None
 
         # Check to see if the interface (if it exists) is wireless
-        if self._interface:
+        if self.__interface:
             with open("/proc/net/wireless", "r") as f:
-                self._is_wireless = self._interface in f.read()
+                self.__is_wireless = self.__interface in f.read()
         f.close()
 
         # setup message to send to the user
-        if self._interface is None:
-            self._message = "Not connected to a network"
-        elif self._is_wireless:
+        if self.__interface is None:
+            self.__message = " No connection"
+        elif self.__is_wireless:
             cmd = "iwgetid"
             iw_dat = util.cli.execute(cmd)
             has_ssid = "ESSID" in iw_dat
             ssid = iw_dat[iw_dat.index(":") + 2: -2] if has_ssid else "Unknown"
 
             # Get connection strength
-            cmd = "iwconfig {}".format(self._interface)
+            cmd = "iwconfig {}".format(self.__interface)
             config_dat = " ".join(util.cli.execute(cmd).split())
             config_tokens = config_dat.replace("=", " ").split()
             strength = config_tokens[config_tokens.index("level") + 1]
             self.__signal = util.format.asint(strength, minimum=-110, maximum=-30)
 
-            self._message = self.__generate_wireless_message(ssid, self.__signal)
+            self.__message = self.__generate_wireles_message(ssid, self.__signal)
         else:
-            self._message = self._message
+            self.__signal = -30
+            self.__message = " Ethernet" 
 
-        return self._message
+        return self.__message
 
 
     def state(self, widget):
-        if self.__signal < -65:
-            return "warning"
         if self.__signal < -80:
             return "critical"
+        if self.__signal < -65:
+            return "warning"
+
         return None
 
 
-    def __generate_wireless_message(self, ssid, strength):
+    def __generate_wireles_message(self, ssid, strength):
         computed_strength = 100 * ((strength + 100) / 70.0)
         return " {} {}%".format(ssid, int(computed_strength))
 

From 911230c65998ac8969eba88507c09b8de463373e Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Mon, 5 Jul 2021 13:54:28 -0500
Subject: [PATCH 233/506] first complete implementation of the network module

---
 bumblebee_status/modules/contrib/network.py | 34 ++++++++++++---------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index 924c7f4..0c366d6 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -1,6 +1,8 @@
 """
-A module to show currently active network connection (ethernet or wifi)
-and connection strength.
+A module to show currently active network connection (ethernet or wifi) and connection strength if the connection is wireless.
+
+Dependencies: nm-connection-editor if users would like a graphical
+network manager when left-clicking the module
 """
 
 
@@ -16,14 +18,17 @@ class Module(core.module.Module):
     @core.decorators.every(seconds=10)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.network))
-        self.__is_wireless = True
+        self.__is_wireless = False
         self.__interface = None
         self.__message = None
         self.__signal = -110
 
         # Set up event handler for left mouse click
-        core.input.register(self, button=core.input.LEFT_MOUSE, cmd="nm-connection-editor")
+        core.input.register(
+            self, button=core.input.LEFT_MOUSE, cmd="nm-connection-editor"
+        )
 
+    # Get network information to display to the user
     def network(self, widgets):
         # run ip route command, tokenize output
         cmd = "ip route get 8.8.8.8"
@@ -33,7 +38,7 @@ class Module(core.module.Module):
 
         # Attempt to extract a valid network interface device
         try:
-             self.__interface = route_tokens[route_tokens.index("dev") + 1]  
+            self.__interface = route_tokens[route_tokens.index("dev") + 1]
         except ValueError:
             self.__interface = None
 
@@ -47,10 +52,13 @@ class Module(core.module.Module):
         if self.__interface is None:
             self.__message = " No connection"
         elif self.__is_wireless:
-            cmd = "iwgetid"
-            iw_dat = util.cli.execute(cmd)
+            iw_dat = util.cli.execute("iwgetid")
             has_ssid = "ESSID" in iw_dat
-            ssid = iw_dat[iw_dat.index(":") + 2: -2] if has_ssid else "Unknown"
+            ssid = (
+                iw_dat[iw_dat.index(":") + 1 :].replace('"', "").strip()
+                if has_ssid
+                else "Unknown"
+            )
 
             # Get connection strength
             cmd = "iwconfig {}".format(self.__interface)
@@ -61,12 +69,13 @@ class Module(core.module.Module):
 
             self.__message = self.__generate_wireles_message(ssid, self.__signal)
         else:
+            # Set signal to -30 as ethernet shouldn't have signal issues
             self.__signal = -30
-            self.__message = " Ethernet" 
+            self.__message = " Ethernet"
 
         return self.__message
 
-
+    # The signal is measured in decibels/milliwatt, hence the weird numbers
     def state(self, widget):
         if self.__signal < -80:
             return "critical"
@@ -75,10 +84,7 @@ class Module(core.module.Module):
 
         return None
 
-
+    # manually done for better granularity / ease of parsing strength data
     def __generate_wireles_message(self, ssid, strength):
         computed_strength = 100 * ((strength + 100) / 70.0)
         return " {} {}%".format(ssid, int(computed_strength))
-
-
-

From 3f524ab371a1780619914c12fbb7d87836a57f92 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Thu, 8 Jul 2021 09:04:40 -0500
Subject: [PATCH 234/506] Refactoring, making use of netifaces

---
 bumblebee_status/modules/contrib/network.py | 82 +++++++++++----------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index 0c366d6..d90a21b 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -13,78 +13,84 @@ import core.module
 import core.widget
 import core.input
 
+import netifaces
+import socket
+
 
 class Module(core.module.Module):
     @core.decorators.every(seconds=10)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.network))
         self.__is_wireless = False
+        self.__is_connected = False
         self.__interface = None
         self.__message = None
         self.__signal = -110
 
-        # Set up event handler for left mouse click
-        core.input.register(
-            self, button=core.input.LEFT_MOUSE, cmd="nm-connection-editor"
-        )
-
     # Get network information to display to the user
     def network(self, widgets):
-        # run ip route command, tokenize output
-        cmd = "ip route get 8.8.8.8"
-        std_out = util.cli.execute(cmd)
-        route_str = " ".join(std_out.split())
-        route_tokens = route_str.split(" ")
+        # Determine whether there is an internet connection
+        try:
+            socket.create_connection(("1.1.1.1", 53))
+            self.__is_connected = True
+        except OSError:
+            self.__is_connected = False
 
         # Attempt to extract a valid network interface device
-        try:
-            self.__interface = route_tokens[route_tokens.index("dev") + 1]
-        except ValueError:
-            self.__interface = None
+        self.__interface = netifaces.gateways()["default"][netifaces.AF_INET][1]
 
-        # Check to see if the interface (if it exists) is wireless
-        if self.__interface:
+        # Check to see if the interface (if connected to the internet) is wireless
+        if self.__is_connected:
             with open("/proc/net/wireless", "r") as f:
                 self.__is_wireless = self.__interface in f.read()
-        f.close()
+            f.close()
 
         # setup message to send to the user
-        if self.__interface is None:
-            self.__message = " No connection"
-        elif self.__is_wireless:
+        if not self.__is_connected:
+            self.__message = "No connection"
+        elif not self.__is_wireless:
+            # Assuming that if user is connected via non-wireless means that it will be ethernet
+            self.__signal = -30
+            self.__message = "Ethernet"
+        else:
+            # We have a wireless connection
             iw_dat = util.cli.execute("iwgetid")
             has_ssid = "ESSID" in iw_dat
+            signal = self.__compute_signal(self.__interface)
+            self.__signal = util.format.asint(signal, minimum=-110, maximum=-30)
+
             ssid = (
                 iw_dat[iw_dat.index(":") + 1 :].replace('"', "").strip()
                 if has_ssid
                 else "Unknown"
             )
-
-            # Get connection strength
-            cmd = "iwconfig {}".format(self.__interface)
-            config_dat = " ".join(util.cli.execute(cmd).split())
-            config_tokens = config_dat.replace("=", " ").split()
-            strength = config_tokens[config_tokens.index("level") + 1]
-            self.__signal = util.format.asint(strength, minimum=-110, maximum=-30)
-
             self.__message = self.__generate_wireles_message(ssid, self.__signal)
-        else:
-            # Set signal to -30 as ethernet shouldn't have signal issues
-            self.__signal = -30
-            self.__message = " Ethernet"
 
         return self.__message
 
-    # The signal is measured in decibels/milliwatt, hence the weird numbers
+    # State determined by signal strength
     def state(self, widget):
-        if self.__signal < -80:
+        if self.__compute_strength(self.__signal) < 50:
             return "critical"
-        if self.__signal < -65:
+        if self.__compute_strength(self.__signal) < 75:
             return "warning"
 
         return None
 
     # manually done for better granularity / ease of parsing strength data
-    def __generate_wireles_message(self, ssid, strength):
-        computed_strength = 100 * ((strength + 100) / 70.0)
-        return " {} {}%".format(ssid, int(computed_strength))
+    def __generate_wireles_message(self, ssid, signal):
+        computed_strength = self.__compute_strength(signal)
+        return "{} {}%".format(ssid, int(computed_strength))
+
+    def __compute_strength(self, signal):
+        return 100 * ((signal + 100) / 70.0)
+
+    # get signal strength in decibels/milliwat
+    def __compute_signal(self, interface):
+        # Get connection strength
+        cmd = "iwconfig {}".format(interface)
+        config_dat = " ".join(util.cli.execute(cmd).split())
+        config_tokens = config_dat.replace("=", " ").split()
+        signal = config_tokens[config_tokens.index("level") + 1]
+
+        return signal

From 2100a7cfdbb5b768136c5c5c01a087f8541229db Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Thu, 8 Jul 2021 12:10:46 -0500
Subject: [PATCH 235/506] Set up initial testing framework for network module

---
 bumblebee_status/modules/contrib/network.py |  2 +-
 tests/modules/contrib/test_network.py       | 65 +++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/contrib/test_network.py

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index d90a21b..26c7889 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -33,7 +33,7 @@ class Module(core.module.Module):
         try:
             socket.create_connection(("1.1.1.1", 53))
             self.__is_connected = True
-        except OSError:
+        except:
             self.__is_connected = False
 
         # Attempt to extract a valid network interface device
diff --git a/tests/modules/contrib/test_network.py b/tests/modules/contrib/test_network.py
new file mode 100644
index 0000000..e171d69
--- /dev/null
+++ b/tests/modules/contrib/test_network.py
@@ -0,0 +1,65 @@
+import pytest
+from unittest import TestCase, mock
+
+import core.config
+import core.widget
+import modules.contrib.network
+
+def build_module():
+    config = core.config.Config([])
+    return modules.contrib.network.Module(config=config, theme=None)
+
+def wireless_default():
+    return {
+        "default": {
+            1: ('10.0.1.12', 'wlan0')
+        }
+    }
+
+def wired_default():
+    return {
+        'default': {
+            18: ('10.0.1.12', 'eth0')
+        }
+    }
+
+def exec_side_effect(*args, **kwargs):
+    if args[0] == "iwgetid":
+        return "ESSID: bumblefoo"
+    elif "iwconfig" in args[0]:
+        return "level=-30"
+
+    return "default"
+
+
+class TestNetworkUnit(TestCase):
+    def test_load_module(self):
+        __import__("modules.contrib.network")
+
+    @pytest.mark.allow_hosts(['127.0.0.1'])
+    def test_no_internet(self):
+        module = build_module()
+        assert module.widgets()[0].full_text() == "No connection"
+
+    @mock.patch('util.cli.execute')
+    @mock.patch('netifaces.gateways')
+    @mock.patch('netifaces.AF_INET', 1)
+    def test_wireless_connection(self, gateways_mock, execute_mock):
+        fake_ssid = "bumblefoo"
+        gateways_mock.return_value = wireless_default()
+        execute_mock.side_effect = exec_side_effect
+
+        module = build_module()
+
+        assert fake_ssid in module.widgets()[0].full_text()
+
+    @mock.patch('util.cli.execute')
+    @mock.patch('netifaces.gateways')
+    @mock.patch('netifaces.AF_INET', 18)
+    def test_wired_connection(self, gateways_mock, execute_mock):
+        gateways_mock.return_value = wired_default()
+        execute_mock.side_effect = exec_side_effect
+
+        module = build_module()
+
+        assert module.widgets()[0].full_text() == "Ethernet"

From f9017c3a38e94d8ab67cc15d71e12bf0a63ca3e0 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Thu, 8 Jul 2021 22:55:23 -0500
Subject: [PATCH 236/506] Added more tests and exception handling

---
 bumblebee_status/modules/contrib/network.py | 43 ++++++----
 tests/modules/contrib/test_network.py       | 92 +++++++++++++++------
 2 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index 26c7889..6c35ee4 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -1,8 +1,6 @@
 """
 A module to show currently active network connection (ethernet or wifi) and connection strength if the connection is wireless.
 
-Dependencies: nm-connection-editor if users would like a graphical
-network manager when left-clicking the module
 """
 
 
@@ -18,7 +16,7 @@ import socket
 
 
 class Module(core.module.Module):
-    @core.decorators.every(seconds=10)
+    @core.decorators.every(seconds=5)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.network))
         self.__is_wireless = False
@@ -33,20 +31,26 @@ class Module(core.module.Module):
         try:
             socket.create_connection(("1.1.1.1", 53))
             self.__is_connected = True
-        except:
+        except Exception:
             self.__is_connected = False
 
         # Attempt to extract a valid network interface device
-        self.__interface = netifaces.gateways()["default"][netifaces.AF_INET][1]
+        try:
+            self.__interface = netifaces.gateways()["default"][netifaces.AF_INET][1]
+        except Exception:
+            self.__interface = None
 
         # Check to see if the interface (if connected to the internet) is wireless
-        if self.__is_connected:
-            with open("/proc/net/wireless", "r") as f:
-                self.__is_wireless = self.__interface in f.read()
-            f.close()
+        if self.__is_connected and self.__interface:
+            try:
+                with open("/proc/net/wireless", "r") as f:
+                    self.__is_wireless = self.__interface in f.read()
+                f.close()
+            except Exception:
+                self.__is_wireless = False
 
         # setup message to send to the user
-        if not self.__is_connected:
+        if not self.__is_connected or not self.__interface:
             self.__message = "No connection"
         elif not self.__is_wireless:
             # Assuming that if user is connected via non-wireless means that it will be ethernet
@@ -57,7 +61,11 @@ class Module(core.module.Module):
             iw_dat = util.cli.execute("iwgetid")
             has_ssid = "ESSID" in iw_dat
             signal = self.__compute_signal(self.__interface)
-            self.__signal = util.format.asint(signal, minimum=-110, maximum=-30)
+
+            # If signal is None, that means that we can't compute the default interface's signal strength
+            self.__signal = (
+                util.format.asint(signal, minimum=-110, maximum=-30) if signal else None
+            )
 
             ssid = (
                 iw_dat[iw_dat.index(":") + 1 :].replace('"', "").strip()
@@ -80,10 +88,12 @@ class Module(core.module.Module):
     # manually done for better granularity / ease of parsing strength data
     def __generate_wireles_message(self, ssid, signal):
         computed_strength = self.__compute_strength(signal)
-        return "{} {}%".format(ssid, int(computed_strength))
+        strength_str = str(computed_strength) if computed_strength else "?"
+
+        return "{} {}%".format(ssid, strength_str)
 
     def __compute_strength(self, signal):
-        return 100 * ((signal + 100) / 70.0)
+        return int(100 * ((signal + 100) / 70.0)) if signal else None
 
     # get signal strength in decibels/milliwat
     def __compute_signal(self, interface):
@@ -91,6 +101,11 @@ class Module(core.module.Module):
         cmd = "iwconfig {}".format(interface)
         config_dat = " ".join(util.cli.execute(cmd).split())
         config_tokens = config_dat.replace("=", " ").split()
-        signal = config_tokens[config_tokens.index("level") + 1]
+
+        # handle weird output
+        try:
+            signal = config_tokens[config_tokens.index("level") + 1]
+        except Exception:
+            signal = None
 
         return signal
diff --git a/tests/modules/contrib/test_network.py b/tests/modules/contrib/test_network.py
index e171d69..9b270bf 100644
--- a/tests/modules/contrib/test_network.py
+++ b/tests/modules/contrib/test_network.py
@@ -1,65 +1,107 @@
-import pytest
 from unittest import TestCase, mock
+import pytest
 
 import core.config
 import core.widget
 import modules.contrib.network
 
+import socket
+
+pytest.importorskip("netifaces")
+
+
 def build_module():
     config = core.config.Config([])
     return modules.contrib.network.Module(config=config, theme=None)
 
+
 def wireless_default():
-    return {
-        "default": {
-            1: ('10.0.1.12', 'wlan0')
-        }
-    }
+    return {"default": {1: ("10.0.1.12", "wlan3")}}
+
 
 def wired_default():
-    return {
-        'default': {
-            18: ('10.0.1.12', 'eth0')
-        }
-    }
+    return {"default": {18: ("10.0.1.12", "eth3")}}
 
-def exec_side_effect(*args, **kwargs):
+
+def exec_side_effect_valid(*args, **kwargs):
     if args[0] == "iwgetid":
         return "ESSID: bumblefoo"
-    elif "iwconfig" in args[0]:
+    if "iwconfig" in args[0]:
         return "level=-30"
+    return mock.DEFAULT
 
-    return "default"
+
+def exec_side_effect_invalid(*args, **kwargs):
+    return "invalid gibberish, can't parse for info"
 
 
 class TestNetworkUnit(TestCase):
     def test_load_module(self):
         __import__("modules.contrib.network")
 
-    @pytest.mark.allow_hosts(['127.0.0.1'])
+    @pytest.mark.allow_hosts(["127.0.0.1"])
     def test_no_internet(self):
         module = build_module()
         assert module.widgets()[0].full_text() == "No connection"
 
-    @mock.patch('util.cli.execute')
-    @mock.patch('netifaces.gateways')
-    @mock.patch('netifaces.AF_INET', 1)
-    def test_wireless_connection(self, gateways_mock, execute_mock):
+    @mock.patch("util.cli.execute")
+    @mock.patch("netifaces.gateways")
+    @mock.patch("socket.create_connection")
+    @mock.patch("netifaces.AF_INET", 1)
+    @mock.patch("builtins.open", mock.mock_open(read_data="wlan3"))
+    def test_valid_wireless_connection(self, socket_mock, gateways_mock, execute_mock):
+        socket_mock.return_value = mock.MagicMock()
         fake_ssid = "bumblefoo"
         gateways_mock.return_value = wireless_default()
-        execute_mock.side_effect = exec_side_effect
+        execute_mock.side_effect = exec_side_effect_valid
 
         module = build_module()
 
         assert fake_ssid in module.widgets()[0].full_text()
 
-    @mock.patch('util.cli.execute')
-    @mock.patch('netifaces.gateways')
-    @mock.patch('netifaces.AF_INET', 18)
-    def test_wired_connection(self, gateways_mock, execute_mock):
+    @mock.patch("netifaces.gateways")
+    @mock.patch("socket.create_connection")
+    @mock.patch("netifaces.AF_INET", 18)
+    @mock.patch("builtins.open", mock.mock_open(read_data="wlan3"))
+    def test_valid_wired_connection(self, socket_mock, gateways_mock):
         gateways_mock.return_value = wired_default()
-        execute_mock.side_effect = exec_side_effect
+        socket_mock.return_value = mock.MagicMock()
 
         module = build_module()
 
         assert module.widgets()[0].full_text() == "Ethernet"
+
+    @mock.patch("netifaces.gateways")
+    @mock.patch("socket.create_connection")
+    def test_invalid_gateways(self, socket_mock, gateways_mock):
+        socket_mock.return_value = mock.Mock()
+        gateways_mock.return_value = {"xyz": "abc"}
+
+        module = build_module()
+        assert module.widgets()[0].full_text() == "No connection"
+
+    @mock.patch("util.cli.execute")
+    @mock.patch("socket.create_connection")
+    @mock.patch("netifaces.gateways")
+    @mock.patch("netifaces.AF_INET", 1)
+    @mock.patch("builtins.open", mock.mock_open(read_data="wlan3"))
+    def test_invalid_execs(self, gateways_mock, socket_mock, execute_mock):
+        execute_mock.side_effect = exec_side_effect_invalid
+        socket_mock.return_value = mock.MagicMock()
+        gateways_mock.return_value = wireless_default()
+
+        module = build_module()
+
+        assert module.widgets()[0].full_text() == "Unknown ?%"
+
+    @mock.patch("builtins.open", **{"return_value.raiseError.side_effect": Exception()})
+    @mock.patch("socket.create_connection")
+    @mock.patch("netifaces.gateways")
+    @mock.patch("netifaces.AF_INET", 18)
+    @mock.patch("builtins.open", mock.mock_open(read_data="wlan3"))
+    def test_no_wireless_file(self, gateways_mock, socket_mock, mock_open):
+        gateways_mock.return_value = wired_default()
+        socket_mock.return_value = mock.MagicMock()
+        module = build_module()
+
+        assert module.widgets()[0].full_text() == "Ethernet"

From 48501fa53478075ed0d6ce5d66ddb3499264bb86 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Thu, 8 Jul 2021 23:00:57 -0500
Subject: [PATCH 237/506] Updated docstring

---
 bumblebee_status/modules/contrib/network.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index 6c35ee4..b8d16a4 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -1,5 +1,9 @@
 """
-A module to show currently active network connection (ethernet or wifi) and connection strength if the connection is wireless.
+A module to show the currently active network connection (ethernet or wifi) and connection strength if the connection is wireless.
+
+Requires the Python netifaces package and iw installed on Linux.
+
+A simpler take on nic and network_traffic. No extra config necessary!
 
 """
 

From 5d80a5a1a0470b72a79608d1952eb126f7d37ab4 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Fri, 9 Jul 2021 00:28:00 -0500
Subject: [PATCH 238/506] Slight refactoring to try and break apart
 networkmethod

---
 bumblebee_status/modules/contrib/network.py | 35 ++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/bumblebee_status/modules/contrib/network.py b/bumblebee_status/modules/contrib/network.py
index b8d16a4..a91c947 100644
--- a/bumblebee_status/modules/contrib/network.py
+++ b/bumblebee_status/modules/contrib/network.py
@@ -32,11 +32,7 @@ class Module(core.module.Module):
     # Get network information to display to the user
     def network(self, widgets):
         # Determine whether there is an internet connection
-        try:
-            socket.create_connection(("1.1.1.1", 53))
-            self.__is_connected = True
-        except Exception:
-            self.__is_connected = False
+        self.__is_connected = self.__attempt_connection()
 
         # Attempt to extract a valid network interface device
         try:
@@ -46,12 +42,7 @@ class Module(core.module.Module):
 
         # Check to see if the interface (if connected to the internet) is wireless
         if self.__is_connected and self.__interface:
-            try:
-                with open("/proc/net/wireless", "r") as f:
-                    self.__is_wireless = self.__interface in f.read()
-                f.close()
-            except Exception:
-                self.__is_wireless = False
+            self.__is_wireless = self.__interface_is_wireless(self.__interface)
 
         # setup message to send to the user
         if not self.__is_connected or not self.__interface:
@@ -113,3 +104,25 @@ class Module(core.module.Module):
             signal = None
 
         return signal
+
+    def __attempt_connection(self):
+        can_connect = False
+        try:
+            socket.create_connection(("1.1.1.1", 53))
+            can_connect = True
+        except Exception:
+            can_connect = False
+
+        return can_connect
+
+    def __interface_is_wireless(self, interface):
+        is_wireless = False
+        try:
+            with open("/proc/net/wireless", "r") as f:
+                is_wireless = interface in f.read()
+                f.close()
+        except Exception:
+            is_wireless = False
+
+        return is_wireless
+

From 5a2dfc226b5350f70adc790f9650217351540121 Mon Sep 17 00:00:00 2001
From: nepoz <bishrutbhattarai@gmail.com>
Date: Fri, 9 Jul 2021 00:58:09 -0500
Subject: [PATCH 239/506] Removed dependency on pytest-socket for the Network
 module's unit tests.

---
 tests/modules/contrib/test_network.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/modules/contrib/test_network.py b/tests/modules/contrib/test_network.py
index 9b270bf..05ec3b1 100644
--- a/tests/modules/contrib/test_network.py
+++ b/tests/modules/contrib/test_network.py
@@ -39,8 +39,9 @@ class TestNetworkUnit(TestCase):
     def test_load_module(self):
         __import__("modules.contrib.network")
 
-    @pytest.mark.allow_hosts(["127.0.0.1"])
-    def test_no_internet(self):
+    @mock.patch("socket.create_connection")
+    def test_no_internet(self, socket_mock):
+        socket_mock.side_effect = Exception()
         module = build_module()
         assert module.widgets()[0].full_text() == "No connection"
 

From 98c92bb78facdf0d8456127a437d7fa4b2014839 Mon Sep 17 00:00:00 2001
From: Tom Saleeba <tom.saleeba@gmail.com>
Date: Sat, 24 Jul 2021 15:18:04 -0600
Subject: [PATCH 240/506] feat: add GPU usage % and GPU memory usage % to
 nvidiagpu

---
 bumblebee_status/modules/contrib/nvidiagpu.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/nvidiagpu.py b/bumblebee_status/modules/contrib/nvidiagpu.py
index 4aa9de9..2731314 100644
--- a/bumblebee_status/modules/contrib/nvidiagpu.py
+++ b/bumblebee_status/modules/contrib/nvidiagpu.py
@@ -4,7 +4,7 @@
 
 Parameters:
    * nvidiagpu.format: Format string (defaults to '{name}: {temp}°C %{usedmem}/{totalmem} MiB')
-     Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem}
+     Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem} {gpu_usage_pct} {mem_usage_pct}
 
 Requires nvidia-smi
 
@@ -41,6 +41,8 @@ class Module(core.module.Module):
         clockMem = ""
         clockGpu = ""
         fanspeed = ""
+        gpuUsagePct = ""
+        memPct = ""
         for item in sp.split("\n"):
             try:
                 key, val = item.split(":")
@@ -61,6 +63,11 @@ class Module(core.module.Module):
                     name = val
                 elif key == "Fan Speed":
                     fanspeed = val.split(" ")[0]
+                elif title == "Utilization":
+                    if key == "Gpu":
+                        gpuUsagePct = val.split(" ")[0]
+                    elif key == "Memory":
+                        memPct = val.split(" ")[0]
 
             except:
                 title = item.strip()
@@ -76,6 +83,8 @@ class Module(core.module.Module):
             clock_gpu=clockGpu,
             clock_mem=clockMem,
             fanspeed=fanspeed,
+            gpu_usage_pct=gpuUsagePct,
+            mem_usage_pct=memPct,
         )
 
 

From f98053371e6fd297346c6c74522a1eb913fd2732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Soykan=20Ert=C3=BCrk?= <soykanerturk@gmail.com>
Date: Tue, 10 Aug 2021 20:19:30 +0300
Subject: [PATCH 241/506] Dependency for powerline themes

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 848434e..4727ebc 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,8 @@ There is also a SlackBuild available here: [slackbuilds:bumblebee-status](http:/
 [Available modules](https://bumblebee-status.readthedocs.io/en/main/modules.html) lists the dependencies (Python modules and external executables)
 for each module. If you are not using a module, you don't need the dependencies.
 
+Some themes (e.g. all ‘powerline’ themes) require Font Awesome http://fontawesome.io/ and a powerline-compatible font (powerline-fonts) https://github.com/powerline/fonts
+
 # Usage
 ## Normal usage
 In your i3wm configuration, modify the *status_command* for your i3bar like this:

From 473d2fbd1403bb475587a058ac9827202c7f4d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Soykan=20Ert=C3=BCrk?= <soykanerturk@gmail.com>
Date: Thu, 12 Aug 2021 22:54:34 +0300
Subject: [PATCH 242/506] Improving docs

I added tkinter as dependency in requirements.
---
 bumblebee_status/modules/contrib/system.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bumblebee_status/modules/contrib/system.py b/bumblebee_status/modules/contrib/system.py
index e96ee3f..cc46ef8 100644
--- a/bumblebee_status/modules/contrib/system.py
+++ b/bumblebee_status/modules/contrib/system.py
@@ -21,6 +21,9 @@ Parameters:
         * system.suspend: specify a command for suspending (defaults to 'i3exit suspend')
         * system.hibernate: specify a command for hibernating (defaults to 'i3exit hibernate')
 
+Requirements:
+	tkinter (python3-tk package on debian based systems either you can install it as python package)
+
 contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 """
 

From 8be9f1a05ca411a14e192df9e08313ea9eccaa5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Soykan=20Ert=C3=BCrk?= <soykanerturk@gmail.com>
Date: Thu, 12 Aug 2021 23:15:09 +0300
Subject: [PATCH 243/506] system module requirement

added tkinter as requirement
---
 docs/modules.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/modules.rst b/docs/modules.rst
index 49e509b..5b9b075 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1380,6 +1380,9 @@ Parameters:
         * system.lock: specify a command for locking the screen (defaults to 'i3exit lock')
         * system.suspend: specify a command for suspending (defaults to 'i3exit suspend')
         * system.hibernate: specify a command for hibernating (defaults to 'i3exit hibernate')
+        
+Requirements:
+        tkinter (python3-tk package on debian based systems either you can install it as python package)
 
 contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 

From 5a1addec7f26e0eac294842a91cc4125f9520e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Soykan=20Ert=C3=BCrk?= <soykanerturk@gmail.com>
Date: Sat, 14 Aug 2021 20:14:54 +0300
Subject: [PATCH 244/506] Fixing a small bug on todo module

todo counts new lines (blank lines) as todo and increments todo count. After my fix todo doesn't counts blank lines.
---
 bumblebee_status/modules/contrib/todo.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/modules/contrib/todo.py b/bumblebee_status/modules/contrib/todo.py
index df2d788..6c69f10 100644
--- a/bumblebee_status/modules/contrib/todo.py
+++ b/bumblebee_status/modules/contrib/todo.py
@@ -25,7 +25,7 @@ class Module(core.module.Module):
         self.__todos = self.count_items()
         core.input.register(
             self, button=core.input.LEFT_MOUSE, cmd="{} {}".format(self.__editor, self.__doc)
-        )
+        )      
 
     def output(self, widget):
         return str(self.__todos)
@@ -40,11 +40,12 @@ class Module(core.module.Module):
 
     def count_items(self):
         try:
-            i = -1
+            i = 0
             with open(self.__doc) as f:
-                for i, l in enumerate(f):
-                    pass
-            return i + 1
+                for l in f.readlines():
+                    if l.strip() != '':
+                        i += 1
+            return i
         except Exception:
             return 0
 

From 05f76c0d9a236426f6e99a48c6b685f375395280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Soykan=20Ert=C3=BCrk?= <soykanerturk@gmail.com>
Date: Sat, 14 Aug 2021 20:16:45 +0300
Subject: [PATCH 245/506] Update todo.py

---
 bumblebee_status/modules/contrib/todo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/todo.py b/bumblebee_status/modules/contrib/todo.py
index 6c69f10..76e289e 100644
--- a/bumblebee_status/modules/contrib/todo.py
+++ b/bumblebee_status/modules/contrib/todo.py
@@ -25,7 +25,7 @@ class Module(core.module.Module):
         self.__todos = self.count_items()
         core.input.register(
             self, button=core.input.LEFT_MOUSE, cmd="{} {}".format(self.__editor, self.__doc)
-        )      
+        )
 
     def output(self, widget):
         return str(self.__todos)

From d4339f6e43359cf536a897f33353840a39e9312b Mon Sep 17 00:00:00 2001
From: Tom Saleeba <tom.saleeba@gmail.com>
Date: Sun, 15 Aug 2021 22:27:44 -0600
Subject: [PATCH 246/506] fix: correct mem usage to be mem *io* usage

---
 bumblebee_status/modules/contrib/nvidiagpu.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/nvidiagpu.py b/bumblebee_status/modules/contrib/nvidiagpu.py
index 2731314..3b929a2 100644
--- a/bumblebee_status/modules/contrib/nvidiagpu.py
+++ b/bumblebee_status/modules/contrib/nvidiagpu.py
@@ -4,11 +4,15 @@
 
 Parameters:
    * nvidiagpu.format: Format string (defaults to '{name}: {temp}°C %{usedmem}/{totalmem} MiB')
-     Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem} {gpu_usage_pct} {mem_usage_pct}
+     Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem} {gpu_usage_pct} {mem_usage_pct} {mem_io_pct}
 
 Requires nvidia-smi
 
 contributed by `RileyRedpath <https://github.com/RileyRedpath>`_ - many thanks!
+
+Note: mem_io_pct is (from `man nvidia-smi`):
+> Percent of time over the past sample period during which global (device)
+> memory was being read or written.
 """
 
 import core.module
@@ -42,7 +46,8 @@ class Module(core.module.Module):
         clockGpu = ""
         fanspeed = ""
         gpuUsagePct = ""
-        memPct = ""
+        memIoPct = ""
+        memUsage = "not found"
         for item in sp.split("\n"):
             try:
                 key, val = item.split(":")
@@ -67,11 +72,14 @@ class Module(core.module.Module):
                     if key == "Gpu":
                         gpuUsagePct = val.split(" ")[0]
                     elif key == "Memory":
-                        memPct = val.split(" ")[0]
+                        memIoPct = val.split(" ")[0]
 
             except:
                 title = item.strip()
 
+        if totalMem and usedMem:
+            memUsage = int(int(usedMem) / int(totalMem) * 100)
+
         str_format = self.parameter(
             "format", "{name}: {temp}°C {mem_used}/{mem_total} MiB"
         )
@@ -84,7 +92,8 @@ class Module(core.module.Module):
             clock_mem=clockMem,
             fanspeed=fanspeed,
             gpu_usage_pct=gpuUsagePct,
-            mem_usage_pct=memPct,
+            mem_io_pct=memIoPct,
+            mem_usage_pct=memUsage,
         )
 
 

From ed5a4e61e482d8e20ea0319cdb6c58f3d78083eb Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 10 Sep 2021 12:45:11 +0200
Subject: [PATCH 247/506] [modules/bluetooth] Add more error checking

Do not kill the bar when the dbus-send command fails.

see #818
---
 bumblebee_status/modules/contrib/bluetooth.py  | 2 +-
 bumblebee_status/modules/contrib/bluetooth2.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/bluetooth.py b/bumblebee_status/modules/contrib/bluetooth.py
index b565494..481ae88 100644
--- a/bumblebee_status/modules/contrib/bluetooth.py
+++ b/bumblebee_status/modules/contrib/bluetooth.py
@@ -106,7 +106,7 @@ class Module(core.module.Module):
         )
 
         logging.debug("bt: toggling bluetooth")
-        util.cli.execute(cmd)
+        util.cli.execute(cmd, ignore_errors=True)
 
     def state(self, widget):
         """Get current state."""
diff --git a/bumblebee_status/modules/contrib/bluetooth2.py b/bumblebee_status/modules/contrib/bluetooth2.py
index 52474b9..22eae88 100644
--- a/bumblebee_status/modules/contrib/bluetooth2.py
+++ b/bumblebee_status/modules/contrib/bluetooth2.py
@@ -69,7 +69,7 @@ class Module(core.module.Module):
         )
 
         logging.debug("bt: toggling bluetooth")
-        util.cli.execute(cmd)
+        util.cli.execute(cmd, ignore_errors=True)
 
     def state(self, widget):
         """Get current state."""

From c96d119b0e3b2550c709bc789f495c660599403c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 7 Oct 2021 15:39:29 +0200
Subject: [PATCH 248/506] [core/config] add autohide to configuration file

make it possible to configure a list of automatically hidden modules in
the configuration file (+ add documentation for it).

fixes #822
---
 bumblebee_status/core/config.py | 2 +-
 docs/features.rst               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index b5fd5ef..69a4ac6 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -328,7 +328,7 @@ class Config(util.store.Store):
     """
 
     def autohide(self, name):
-        return name in self.__args.autohide
+        return name in self.__args.autohide or self.get("autohide")
 
     """Returns which modules should be hidden if they are in state error
 
diff --git a/docs/features.rst b/docs/features.rst
index f167033..3c7fe6e 100644
--- a/docs/features.rst
+++ b/docs/features.rst
@@ -160,6 +160,7 @@ Configuration files have the following format:
 
    [core]
    modules = <comma-separated list of modules to load>
+   autohid = <comma-separated list of modules to hide, unless in warning/error state>
    theme = <theme to use by default>
 
    [module-parameters]

From b5395fe764c8b580475459e073a480f27525bb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Mon, 11 Oct 2021 19:07:28 -0300
Subject: [PATCH 249/506] chore: public toggle method

---
 bumblebee_status/modules/contrib/dunstctl.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/dunstctl.py b/bumblebee_status/modules/contrib/dunstctl.py
index 3c803a4..f082f1b 100644
--- a/bumblebee_status/modules/contrib/dunstctl.py
+++ b/bumblebee_status/modules/contrib/dunstctl.py
@@ -24,12 +24,12 @@ import util.cli
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(""))
-        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__toggle_state)
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.toggle_state)
         self.__states = {"unknown": ["unknown", "critical"],
                          "true": ["muted", "warning"],
                          "false": ["unmuted"]}
 
-    def __toggle_state(self, event):
+    def toggle_state(self, event):
         util.cli.execute("dunstctl set-paused toggle", ignore_errors=True)
 
     def state(self, widget):

From 40de07ba2ed659abaa417ab7d76dff54c423b6e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Mon, 11 Oct 2021 19:08:46 -0300
Subject: [PATCH 250/506] chore: create dunst tests

---
 tests/modules/contrib/test_dunst.py | 53 +++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/tests/modules/contrib/test_dunst.py b/tests/modules/contrib/test_dunst.py
index 2ca2d40..75e3151 100644
--- a/tests/modules/contrib/test_dunst.py
+++ b/tests/modules/contrib/test_dunst.py
@@ -1,5 +1,58 @@
 import pytest
 
+import core.config
+import modules.contrib.dunst
+
+
+def build_module():
+    return modules.contrib.dunst.Module(
+        config=core.config.Config([]),
+        theme=None
+    )
+
+
 def test_load_module():
     __import__("modules.contrib.dunst")
 
+def test_input_registration(mocker):
+   input_register = mocker.patch('core.input.register')
+
+   module = build_module()
+
+   input_register.assert_called_with(
+       module,
+       button=core.input.LEFT_MOUSE,
+       cmd=module.toggle_status
+   )
+
+def test_dunst_toggle(mocker):
+    start_command = mocker.patch('util.cli.execute')
+
+    module = build_module()
+    start_command.assert_called_with('killall -s SIGUSR2 dunst', ignore_errors=True)
+
+    toggle_command = mocker.patch('util.cli.execute')
+    module.toggle_status(None)
+    toggle_command.assert_called_with('killall -s SIGUSR1 dunst')
+
+    widget = module.widget()
+    actual = module.state(widget)
+    assert actual == ['muted', 'warning']
+
+    module.toggle_status(None)
+    toggle_command.assert_called_with('killall -s SIGUSR2 dunst')
+
+    widget = module.widget()
+    actual = module.state(widget)
+    assert actual == ['unmuted']
+
+def test_dunst_toggle_exception(mocker):
+    module = build_module()
+
+    toggle_command = mocker.patch('util.cli.execute', side_effect=Exception)
+    module.toggle_status(None)
+    toggle_command.assert_called_with('killall -s SIGUSR1 dunst')
+
+    widget = module.widget()
+    actual = module.state(widget)
+    assert actual == ['unmuted']

From 15809514740dcf0848b15e0328ff12f7d02420d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Mon, 11 Oct 2021 19:09:15 -0300
Subject: [PATCH 251/506] chore: create missing dunstctl tests

---
 tests/modules/contrib/test_dunstctl.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/modules/contrib/test_dunstctl.py b/tests/modules/contrib/test_dunstctl.py
index db77fe3..2391f7e 100644
--- a/tests/modules/contrib/test_dunstctl.py
+++ b/tests/modules/contrib/test_dunstctl.py
@@ -1,6 +1,5 @@
 import pytest
 
-import util.cli
 import core.config
 import modules.contrib.dunstctl
 
@@ -13,6 +12,25 @@ def build_module():
 def test_load_module():
     __import__("modules.contrib.dunstctl")
 
+def test_input_registration(mocker):
+   input_register = mocker.patch('core.input.register')
+
+   module = build_module()
+
+   input_register.assert_called_with(
+       module,
+       button=core.input.LEFT_MOUSE,
+       cmd=module.toggle_state
+   )
+
+def test_dunst_toggle_state(mocker):
+    command = mocker.patch('util.cli.execute')
+
+    module = build_module()
+
+    module.toggle_state(None)
+    command.assert_called_with('dunstctl set-paused toggle', ignore_errors=True)
+
 def test_dunst_running(mocker):
     command = mocker.patch('util.cli.execute', return_value=(0, "false"))
 

From 4007517e45a589e10a6111d5066f0a96694e2d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Tue, 12 Oct 2021 11:24:43 -0300
Subject: [PATCH 252/506] chore: create libvirtvms tests

---
 tests/modules/contrib/test_libvirtvms.py | 43 +++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/tests/modules/contrib/test_libvirtvms.py b/tests/modules/contrib/test_libvirtvms.py
index efa5880..48ba72c 100644
--- a/tests/modules/contrib/test_libvirtvms.py
+++ b/tests/modules/contrib/test_libvirtvms.py
@@ -1,7 +1,48 @@
+import sys
 import pytest
+from unittest.mock import Mock
 
-pytest.importorskip("libvirt")
+import core.config
+
+sys.modules['libvirt'] = Mock()
+
+import modules.contrib.libvirtvms
+
+def build_module():
+    return modules.contrib.libvirtvms.Module(
+        config=core.config.Config([]),
+        theme=None
+    )
 
 def test_load_module():
     __import__("modules.contrib.libvirtvms")
 
+def test_input_registration(mocker):
+   input_register = mocker.patch('core.input.register')
+
+   module = build_module()
+
+   input_register.assert_called_with(
+       module,
+       button=core.input.LEFT_MOUSE,
+       cmd="virt-manager"
+   )
+
+def test_status_failed(mocker):
+    mocker.patch('libvirt.openReadOnly', return_value=None)
+
+    module = build_module()
+    status = module.status(None)
+
+    assert status == "Failed to open connection to the hypervisor"
+
+def test_status(mocker):
+    virtMock = mocker.Mock()
+    virtMock.numOfDomains = mocker.Mock(return_value=10)
+
+    mocker.patch('libvirt.openReadOnly', return_value=virtMock)
+
+    module = build_module()
+    status = module.status(None)
+
+    assert status == "VMs 10"

From 0dc6a95ac284f105b534a546b5e244b161c84694 Mon Sep 17 00:00:00 2001
From: alexcoder04 <ailyushonak@gmail.com>
Date: Thu, 21 Oct 2021 13:45:40 +0200
Subject: [PATCH 253/506] [modules/sensors] auto-determine the correct thermal
 zone

---
 bumblebee_status/modules/contrib/sensors.py | 69 +++++++++++++--------
 docs/modules.rst                            |  2 +
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/bumblebee_status/modules/contrib/sensors.py b/bumblebee_status/modules/contrib/sensors.py
index 8164f00..d023d6a 100644
--- a/bumblebee_status/modules/contrib/sensors.py
+++ b/bumblebee_status/modules/contrib/sensors.py
@@ -18,6 +18,7 @@ contributed by `mijoharas <https://github.com/mijoharas>`_ - many thanks!
 """
 
 import re
+import os
 import json
 import logging
 
@@ -49,19 +50,25 @@ class Module(core.module.Module):
         self.determine_method()
 
     def determine_method(self):
+        if self.parameter("use_sensors") == "True":
+            self.use_sensors = True
+            return
+        if self.parameter("use_sensors") == "False":
+            self.use_sensors = False
+            return
         if self.parameter("path") != None and self._json == False:
-            self.use_sensors = False  # use thermal zone
-        else:
-            # try to use output of sensors -u
-            try:
-                output = util.cli.execute("sensors -u")
-                self.use_sensors = True
-                log.debug("Sensors command available")
-            except FileNotFoundError as e:
-                log.info(
-                    "Sensors command not available, using /sys/class/thermal/thermal_zone*/"
-                )
-                self.use_sensors = False
+            self.use_sensors = False # use thermal zone
+            return
+        # try to use output of sensors -u
+        try:
+            output = util.cli.execute("sensors -u")
+            self.use_sensors = True
+            log.debug("Sensors command available")
+        except FileNotFoundError as e:
+            log.info(
+                "Sensors command not available, using /sys/class/thermal/thermal_zone*/"
+            )
+            self.use_sensors = False
 
     def _get_temp_from_sensors(self):
         if self._json == True:
@@ -92,22 +99,30 @@ class Module(core.module.Module):
 
     def get_temp(self):
         if self.use_sensors:
-            temperature = self._get_temp_from_sensors()
             log.debug("Retrieve temperature from sensors -u")
-        else:
-            try:
-                temperature = open(
-                    self.parameter("path", "/sys/class/thermal/thermal_zone0/temp")
-                ).read().strip()
-                log.debug("retrieved temperature from /sys/class/")
-                # TODO: Iterate through all thermal zones to determine the correct one and use its value
-                # https://unix.stackexchange.com/questions/304845/discrepancy-between-number-of-cores-and-thermal-zones-in-sys-class-thermal
-
-            except IOError:
-                temperature = "unknown"
-                log.info("Can not determine temperature, please install lm-sensors")
-
-        return temperature
+            return self._get_temp_from_sensors()
+        try:
+            path = None
+            # use path provided by the user
+            if self.parameter("path") is not None:
+                path = self.parameter("path")
+            # find the thermal zone that provides cpu temperature
+            for zone in os.listdir("/sys/class/thermal"):
+                if not zone.startswith("thermal_zone"):
+                    continue
+                if open(f"/sys/class/thermal/{zone}/type").read().strip() != "x86_pkg_temp":
+                    continue
+                path = f"/sys/class/thermal/{zone}/temp"
+            # use zone 0 as fallback
+            if path is None:
+                log.info("Can not determine temperature path, using thermal_zone0")
+                path = "/sys/class/thermal/thermal_zone0/temp"
+            log.debug(f"retrieving temperature from {path}")
+            # the values are t°C * 1000, so divide by 1000
+            return str(int(open(path).read()) / 1000)
+        except IOError:
+            log.info("Can not determine temperature, please install lm-sensors")
+            return "unknown"
 
     def get_mhz(self):
         mhz = None
diff --git a/docs/modules.rst b/docs/modules.rst
index 5b9b075..ded47dc 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1195,6 +1195,8 @@ sensors
 Displays sensor temperature
 
 Parameters:
+    * sensors.use_sensors (True/False): whether to use the 'sensors' command.
+      If set to 'False', the sysfs-interface at '/sys/class/thermal' is used
     * sensors.path: path to temperature file (default /sys/class/thermal/thermal_zone0/temp).
     * sensors.json: if set to 'true', interpret sensors.path as JSON 'path' in the output
       of 'sensors -j' (i.e. <key1>/<key2>/.../<value>), for example, path could

From 6b31cdb698e4086dd07c769d11ebbec8f6c84425 Mon Sep 17 00:00:00 2001
From: alexcoder04 <ailyushonak@gmail.com>
Date: Thu, 21 Oct 2021 14:43:15 +0200
Subject: [PATCH 254/506] [modules/sensors] use util.format.asbool() +
 auto-check only if no path is specified

---
 bumblebee_status/modules/contrib/sensors.py | 35 ++++++++++-----------
 docs/modules.rst                            |  5 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bumblebee_status/modules/contrib/sensors.py b/bumblebee_status/modules/contrib/sensors.py
index d023d6a..7d42c83 100644
--- a/bumblebee_status/modules/contrib/sensors.py
+++ b/bumblebee_status/modules/contrib/sensors.py
@@ -4,6 +4,7 @@
 """Displays sensor temperature
 
 Parameters:
+    * sensors.use_sensors: whether to use the sensors command
     * sensors.path: path to temperature file (default /sys/class/thermal/thermal_zone0/temp).
     * sensors.json: if set to 'true', interpret sensors.path as JSON 'path' in the output
       of 'sensors -j' (i.e. <key1>/<key2>/.../<value>), for example, path could
@@ -47,28 +48,25 @@ class Module(core.module.Module):
         self._json = util.format.asbool(self.parameter("json", False))
         self._freq = util.format.asbool(self.parameter("show_freq", True))
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd="xsensors")
-        self.determine_method()
+        self.use_sensors = self.determine_method()
 
     def determine_method(self):
-        if self.parameter("use_sensors") == "True":
-            self.use_sensors = True
-            return
-        if self.parameter("use_sensors") == "False":
-            self.use_sensors = False
-            return
+        if util.format.asbool(self.parameter("use_sensors")) == True:
+            return True
+        if util.format.asbool(self.parameter("use_sensors")) == False:
+            return False
         if self.parameter("path") != None and self._json == False:
-            self.use_sensors = False # use thermal zone
-            return
+            return False
         # try to use output of sensors -u
         try:
-            output = util.cli.execute("sensors -u")
-            self.use_sensors = True
+            _ = util.cli.execute("sensors -u")
             log.debug("Sensors command available")
+            return True
         except FileNotFoundError as e:
             log.info(
                 "Sensors command not available, using /sys/class/thermal/thermal_zone*/"
             )
-            self.use_sensors = False
+            return False
 
     def _get_temp_from_sensors(self):
         if self._json == True:
@@ -107,12 +105,13 @@ class Module(core.module.Module):
             if self.parameter("path") is not None:
                 path = self.parameter("path")
             # find the thermal zone that provides cpu temperature
-            for zone in os.listdir("/sys/class/thermal"):
-                if not zone.startswith("thermal_zone"):
-                    continue
-                if open(f"/sys/class/thermal/{zone}/type").read().strip() != "x86_pkg_temp":
-                    continue
-                path = f"/sys/class/thermal/{zone}/temp"
+            else:
+                for zone in os.listdir("/sys/class/thermal"):
+                    if not zone.startswith("thermal_zone"):
+                        continue
+                    if open(f"/sys/class/thermal/{zone}/type").read().strip() != "x86_pkg_temp":
+                        continue
+                    path = f"/sys/class/thermal/{zone}/temp"
             # use zone 0 as fallback
             if path is None:
                 log.info("Can not determine temperature path, using thermal_zone0")
diff --git a/docs/modules.rst b/docs/modules.rst
index ded47dc..442d461 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1195,8 +1195,9 @@ sensors
 Displays sensor temperature
 
 Parameters:
-    * sensors.use_sensors (True/False): whether to use the 'sensors' command.
-      If set to 'False', the sysfs-interface at '/sys/class/thermal' is used
+    * sensors.use_sensors: whether to use the 'sensors' command.
+      If set to 'false', the sysfs-interface at '/sys/class/thermal' is used.
+      If not set, 'sensors' will be used if available.
     * sensors.path: path to temperature file (default /sys/class/thermal/thermal_zone0/temp).
     * sensors.json: if set to 'true', interpret sensors.path as JSON 'path' in the output
       of 'sensors -j' (i.e. <key1>/<key2>/.../<value>), for example, path could

From 876774ce406f2fe55a49667c73e2ad8a7628a0e2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 23 Oct 2021 13:43:08 +0200
Subject: [PATCH 255/506] [travis] removing python 3.4 and 3.5

Since 3.4 and 3.5 are both not supported anymore, do not do unit tests
for them.
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 369aeb7..c59ad53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ env:
   global:
     - CC_TEST_REPORTER_ID=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf 
 python:
-  - "3.4"
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"

From 99bb5e99aa052788f9a382a21d465ffe676445e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sat, 23 Oct 2021 10:12:49 -0300
Subject: [PATCH 256/506] Fix Travis CI build URL

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4727ebc..4511a7d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # bumblebee-status
 
-[![Build Status](https://travis-ci.com/tobi-wan-kenobi/bumblebee-status.svg?branch=main)](https://travis-ci.com/tobi-wan-kenobi/bumblebee-status)
+[![Build Status](https://app.travis-ci.com/tobi-wan-kenobi/bumblebee-status.svg?branch=main)](https://app.travis-ci.com/tobi-wan-kenobi/bumblebee-status)
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)

From 7542a47dbc97e92b1c19e12d6bf588ef59fd78b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thayn=C3=A3=20Moretti?= <moretty@gmail.com>
Date: Sat, 23 Oct 2021 11:02:46 -0300
Subject: [PATCH 257/506] fix: generate coverage xml before cc report

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c59ad53..b05ac86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,4 +26,5 @@ install:
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:
+  - coverage xml
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

From d8216a5e2c05d9480faae0334216f22111bd3ae8 Mon Sep 17 00:00:00 2001
From: Kushagra Jain <kush99jain@gmail.com>
Date: Tue, 26 Oct 2021 13:54:35 +0530
Subject: [PATCH 258/506] added new theme

---
 themes/nord-colorful.json | 59 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 themes/nord-colorful.json

diff --git a/themes/nord-colorful.json b/themes/nord-colorful.json
new file mode 100644
index 0000000..acd334b
--- /dev/null
+++ b/themes/nord-colorful.json
@@ -0,0 +1,59 @@
+{
+    "icons": [ "awesome-fonts" ],
+    "colors": [{
+        "red": "#BF616A",
+        "orange": "#D08770",
+        "yellow": "#EBCB8B",
+        "green": "#A3BE8C"
+    }],
+    "defaults": {
+        "separator-block-width": 0,
+        "warning": {
+            "fg": "#2E3440",
+            "bg": "#D08770"
+        },
+        "critical": {
+            "fg": "#2E3440",
+            "bg": "#BF616A"
+        }
+    },
+    "cycle": [
+        { "fg": "#000000", "bg": "#8FBCBB"},
+        { "fg": "#000000", "bg": "#A3BE8C"},
+        { "fg": "#000000", "bg": "#EBCB8B"},
+        { "fg": "#000000", "bg": "#BF616A"},
+        { "fg": "#000000", "bg": "#B48EAD"}
+    ],
+    "dnf": {
+        "good": {
+            "fg": "#A3BE8C",
+            "bg": "#2E3440"
+        }
+    },
+    "apt": {
+        "good": {
+            "fg": "#A3BE8C",
+            "bg": "#2E3440"
+        }
+    },
+    "pacman": {
+        "good": {
+            "fg": "#A3BE8C",
+            "bg": "#2E3440"
+        }
+    },
+    "pomodoro": {
+        "paused": {
+            "fg": "#2E3440",
+            "bg": "#D08770"
+        },
+        "work": {
+            "fg": "#2E3440",
+            "bg": "#EBCB8B"
+        },
+        "break": {
+            "fg": "#A3BE8C",
+            "bg": "#2E3440"
+        }
+    }
+}

From fdc9b7896715d3bfd918f9ec0a264fbd35c52af5 Mon Sep 17 00:00:00 2001
From: Jan Fader <jan.fader@web.de>
Date: Tue, 26 Oct 2021 19:27:02 +0200
Subject: [PATCH 259/506] add new solaar.py for logitech's unifying devices

---
 bumblebee_status/modules/contrib/solaar.py | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/solaar.py

diff --git a/bumblebee_status/modules/contrib/solaar.py b/bumblebee_status/modules/contrib/solaar.py
new file mode 100644
index 0000000..a718fb2
--- /dev/null
+++ b/bumblebee_status/modules/contrib/solaar.py
@@ -0,0 +1,58 @@
+"""Shows status and load percentage of logitech's unifying device
+
+Requires the following executable:
+    * solaar (from community)
+
+contributed by `cambid <https://github.com/cambid>`_ - many thanks!
+"""
+
+import logging
+
+import core.module
+import core.widget
+import core.decorators
+
+import util.cli
+
+
+class Module(core.module.Module):
+    @core.decorators.every(seconds=30)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.utilization))
+        self.__battery = self.parameter("device", "")
+        self.background = True
+        self.__battery_status = ""
+        self.__error = False
+
+    @property
+    def __format(self):
+        return self.parameter("format", "{}")
+
+    def utilization(self, widget):
+        return self.__format.format(self.__battery_status)
+
+    def update(self):
+        self.__error = False
+        if self.__battery != "":
+            cmd = f"solaar show '{self.__battery}'"
+        else:
+            cmd = "solaar show"
+        code, result = util.cli.execute(
+            cmd, ignore_errors=True, return_exitcode=True
+        )
+
+        if code == 0:
+            for line in result.split('\n'):
+                if line.count('Battery') > 0:
+                    self.__battery_status = line.split(':')[1].strip()
+        else:
+            self.__error = True
+            logging.error(f"solaar exited with {code}: {result}")
+
+    def state(self, widget):
+        if self.__error:
+            return "warning"
+        return "okay"
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From dced20bf892dbe68565ebc59ae0c41b2131de203 Mon Sep 17 00:00:00 2001
From: Jan Fader <jan.fader@web.de>
Date: Tue, 26 Oct 2021 19:52:42 +0200
Subject: [PATCH 260/506] refactor code to decrease cognitive complexity in
 update

---
 bumblebee_status/modules/contrib/solaar.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/modules/contrib/solaar.py b/bumblebee_status/modules/contrib/solaar.py
index a718fb2..b7396f3 100644
--- a/bumblebee_status/modules/contrib/solaar.py
+++ b/bumblebee_status/modules/contrib/solaar.py
@@ -23,6 +23,10 @@ class Module(core.module.Module):
         self.background = True
         self.__battery_status = ""
         self.__error = False
+        if self.__battery != "":
+            self.__cmd = f"solaar show '{self.__battery}'"
+        else:
+            self.__cmd = "solaar show"
 
     @property
     def __format(self):
@@ -33,12 +37,8 @@ class Module(core.module.Module):
 
     def update(self):
         self.__error = False
-        if self.__battery != "":
-            cmd = f"solaar show '{self.__battery}'"
-        else:
-            cmd = "solaar show"
         code, result = util.cli.execute(
-            cmd, ignore_errors=True, return_exitcode=True
+            self.__cmd, ignore_errors=True, return_exitcode=True
         )
 
         if code == 0:

From 2cb72fcc3027fc74a4d9df2d76b1f0cf1a55be57 Mon Sep 17 00:00:00 2001
From: Jan Fader <jan.fader@web.de>
Date: Tue, 26 Oct 2021 21:52:15 +0200
Subject: [PATCH 261/506] add tests for solaar.py

---
 tests/modules/contrib/test_solaar.py | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tests/modules/contrib/test_solaar.py

diff --git a/tests/modules/contrib/test_solaar.py b/tests/modules/contrib/test_solaar.py
new file mode 100644
index 0000000..9c5fe33
--- /dev/null
+++ b/tests/modules/contrib/test_solaar.py
@@ -0,0 +1,32 @@
+import pytest
+
+import util.cli
+import core.config
+import modules.contrib.solaar
+
+
+@pytest.fixture
+def module():
+    module = modules.contrib.solaar.Module(
+        config=core.config.Config([]),
+        theme=None
+    )
+
+    yield module
+
+
+def test_load_module():
+    __import__("modules.contrib.solaar")
+
+
+def test_with_unknown_code(module, mocker):
+    mocker.patch('util.cli.execute', return_value=(99, 'error'))
+    logger = mocker.patch('logging.error')
+
+    module.update()
+
+    logger.assert_called_with('solaar exited with {}: {}'.format(99, 'error'))
+
+    widget = module.widget()
+    assert module.state(widget) == 'warning'
+    assert module.hidden() == False

From c7f58ae2a4412eb4cd8c017fca7b544ff87a3a11 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 5 Nov 2021 08:43:33 +0100
Subject: [PATCH 262/506] [doc] fix typo (autohid vs. autohide)

see #835
---
 docs/features.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features.rst b/docs/features.rst
index 3c7fe6e..603c7fe 100644
--- a/docs/features.rst
+++ b/docs/features.rst
@@ -160,7 +160,7 @@ Configuration files have the following format:
 
    [core]
    modules = <comma-separated list of modules to load>
-   autohid = <comma-separated list of modules to hide, unless in warning/error state>
+   autohide = <comma-separated list of modules to hide, unless in warning/error state>
    theme = <theme to use by default>
 
    [module-parameters]

From f0ab3ef03a9f993adb0ff48479b405d9dcfe9832 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 5 Nov 2021 13:57:05 +0100
Subject: [PATCH 263/506] [core/config] fix autohide parameter from
 configuration file

Need to parse the config parameter "autohide" into a list and actually
check whether the current module is in the list.

see #835
---
 bumblebee_status/core/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index 69a4ac6..f191673 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -328,7 +328,7 @@ class Config(util.store.Store):
     """
 
     def autohide(self, name):
-        return name in self.__args.autohide or self.get("autohide")
+        return name in self.__args.autohide or name in util.format.aslist(self.get("autohide", []))
 
     """Returns which modules should be hidden if they are in state error
 

From cbd989309d39db1c35c56b3c7884dc3c42a3f679 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 5 Nov 2021 14:00:34 +0100
Subject: [PATCH 264/506] [contrib/progress] allow hiding of inactive state

Add a new "hide-able" state "mayhide" that can be utilized by modules
without warning state. This state indicates that the module *may* be
hidden by autohide, if the user configures it like this.

see #835
---
 bumblebee_status/core/output.py              | 2 +-
 bumblebee_status/modules/contrib/progress.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 121df27..cf79f2f 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -229,7 +229,7 @@ class i3(object):
         for widget in module.widgets():
             if widget.module and self.__config.autohide(widget.module.name):
                 if not any(
-                    state in widget.state() for state in ["warning", "critical"]
+                    state in widget.state() for state in ["warning", "critical", "mayhide"]
                 ):
                     continue
             if module.hidden():
diff --git a/bumblebee_status/modules/contrib/progress.py b/bumblebee_status/modules/contrib/progress.py
index a1938d2..e818197 100644
--- a/bumblebee_status/modules/contrib/progress.py
+++ b/bumblebee_status/modules/contrib/progress.py
@@ -102,7 +102,7 @@ class Module(core.module.Module):
     def state(self, widget):
         if self.__active:
             return "copying"
-        return "pending"
+        return ["pending", "mayhide"]
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 74ecbb6ca8e3202cafc69bfbf332081a5eec85cb Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 5 Nov 2021 19:11:45 +0100
Subject: [PATCH 265/506] [core/output] fix logic error when using "autohide"

- when state is critical or warning -> *show* the module
- when state is mayhide -> *hide* the module

see #835
---
 bumblebee_status/core/output.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index cf79f2f..47283eb 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -229,9 +229,11 @@ class i3(object):
         for widget in module.widgets():
             if widget.module and self.__config.autohide(widget.module.name):
                 if not any(
-                    state in widget.state() for state in ["warning", "critical", "mayhide"]
+                    state in widget.state() for state in ["warning", "critical"]
                 ):
                     continue
+                if "mayhide" in widget.state():
+                    continue
             if module.hidden():
                 continue
             if widget.hidden:

From 6a3e4761bf7d09e786dd3e0cf43e1f826db47278 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 6 Nov 2021 08:17:11 +0100
Subject: [PATCH 266/506] Revert "[core/output] fix logic error when using
 "autohide""

This reverts commit 74ecbb6ca8e3202cafc69bfbf332081a5eec85cb.
---
 bumblebee_status/core/output.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 47283eb..cf79f2f 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -229,11 +229,9 @@ class i3(object):
         for widget in module.widgets():
             if widget.module and self.__config.autohide(widget.module.name):
                 if not any(
-                    state in widget.state() for state in ["warning", "critical"]
+                    state in widget.state() for state in ["warning", "critical", "mayhide"]
                 ):
                     continue
-                if "mayhide" in widget.state():
-                    continue
             if module.hidden():
                 continue
             if widget.hidden:

From 5ad211f86206181ee8b6284d195185065b55916b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 6 Nov 2021 08:17:18 +0100
Subject: [PATCH 267/506] Revert "[contrib/progress] allow hiding of inactive
 state"

This reverts commit cbd989309d39db1c35c56b3c7884dc3c42a3f679.
---
 bumblebee_status/core/output.py              | 2 +-
 bumblebee_status/modules/contrib/progress.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index cf79f2f..121df27 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -229,7 +229,7 @@ class i3(object):
         for widget in module.widgets():
             if widget.module and self.__config.autohide(widget.module.name):
                 if not any(
-                    state in widget.state() for state in ["warning", "critical", "mayhide"]
+                    state in widget.state() for state in ["warning", "critical"]
                 ):
                     continue
             if module.hidden():
diff --git a/bumblebee_status/modules/contrib/progress.py b/bumblebee_status/modules/contrib/progress.py
index e818197..a1938d2 100644
--- a/bumblebee_status/modules/contrib/progress.py
+++ b/bumblebee_status/modules/contrib/progress.py
@@ -102,7 +102,7 @@ class Module(core.module.Module):
     def state(self, widget):
         if self.__active:
             return "copying"
-        return ["pending", "mayhide"]
+        return "pending"
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 26e4bdd7eb9fd8c8509693cd7d061e065c4f348f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 6 Nov 2021 08:21:08 +0100
Subject: [PATCH 268/506] [modules/progress] improved autohide functionality

Simplify the previous autohide functionality by adding a flag that lets
a module (e.g. progress) indicate that the current state should be
"revealed" (not auto-hidden).

This vastly simplifies the implementation.

see #835
---
 bumblebee_status/core/output.py              | 2 +-
 bumblebee_status/modules/contrib/progress.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 121df27..cee579f 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -229,7 +229,7 @@ class i3(object):
         for widget in module.widgets():
             if widget.module and self.__config.autohide(widget.module.name):
                 if not any(
-                    state in widget.state() for state in ["warning", "critical"]
+                    state in widget.state() for state in ["warning", "critical", "no-autohide"]
                 ):
                     continue
             if module.hidden():
diff --git a/bumblebee_status/modules/contrib/progress.py b/bumblebee_status/modules/contrib/progress.py
index a1938d2..7e148b3 100644
--- a/bumblebee_status/modules/contrib/progress.py
+++ b/bumblebee_status/modules/contrib/progress.py
@@ -101,7 +101,7 @@ class Module(core.module.Module):
 
     def state(self, widget):
         if self.__active:
-            return "copying"
+            return ["copying", "no-autohide"]
         return "pending"
 
 

From a84b4f9a65cceb92f274c1a3ba275105abc820a2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 7 Nov 2021 13:46:52 +0100
Subject: [PATCH 269/506] [docs] fix docs build

pin docutils to < 0.18 as per https://github.com/readthedocs/readthedocs.org/issues/8616#issuecomment-952034858
---
 .readthedocs.yaml     | 6 ++++++
 docs/requirements.txt | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 .readthedocs.yaml
 create mode 100644 docs/requirements.txt

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000..6823857
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,6 @@
+version: 2
+
+python:
+   install:
+   - requirements: docs/requirements.txt
+
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000..93120e6
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+docutils<0.18

From 6ce761695af9107c5ca3ca3e1679295545bc40ef Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 7 Nov 2021 13:50:44 +0100
Subject: [PATCH 270/506] [doc] remove "master" branch

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4511a7d..2f7bd86 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,7 @@ Supported FontAwesome version: 4 (free version of 5 doesn't include some of the
 ---
 ***NOTE***
 
-The default branch for this project is `main` - I'm keeping `master` around for backwards compatibility (I do not want to break anybody's setup), but the default branch is now `main`!
-
-If you are curious why: [ZDNet:github-master-alternative](https://www.zdnet.com/article/github-to-replace-master-with-alternative-term-to-avoid-slavery-references/)
+The default branch for this project is `main`. If you are curious why: [ZDNet:github-master-alternative](https://www.zdnet.com/article/github-to-replace-master-with-alternative-term-to-avoid-slavery-references/)
 
 ---
 

From 973dd6117e273828c963697a9a56c95b132cb64f Mon Sep 17 00:00:00 2001
From: Yufan You <ouuansteve@gmail.com>
Date: Fri, 17 Dec 2021 18:07:45 +0800
Subject: [PATCH 271/506] [contrib/playerctl]: don't log when no player is
 found

`playerctl status` returns 1 when no player is found, which caused
contrib/playerctl to log many times when there's no player.
---
 bumblebee_status/modules/contrib/playerctl.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index e02fa84..56af426 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -85,7 +85,9 @@ class Module(core.module.Module):
 
     def update(self):
         try:
-            playback_status = str(util.cli.execute(self.__cmd + "status")).strip()
+            playback_status = str(util.cli.execute(self.__cmd + "status 2>&1 || true", shell = True)).strip()
+            if playback_status == "No players found":
+                playback_status = None
         except Exception as e:
             logging.exception(e)
             playback_status = None

From 8991bba90e6427e3fbc4da328303e7b09178362a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20L=C3=BCftinger?= <lukas.lueftinger@outlook.com>
Date: Tue, 28 Dec 2021 00:34:10 +0100
Subject: [PATCH 272/506] Silence exceptions in the spotify module which may
 write large amounts of logs to ~/.xsession-errors

---
 bumblebee_status/modules/contrib/spotify.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 7544b48..1c7f7e2 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -159,7 +159,6 @@ class Module(core.module.Module):
                     widget.full_text(self.__song)
 
         except Exception as e:
-            logging.exception(e)
             self.__song = ""
 
     @property

From d430f904341360222f7ad51080aa7c3fe47044b2 Mon Sep 17 00:00:00 2001
From: Marco Genasci <fedeliallalinea@gmail.com>
Date: Wed, 5 Jan 2022 09:34:27 +0100
Subject: [PATCH 273/506] Excluding the tests folder from the installation

Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2e5bafb..1f6c203 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Setup file for bumbleestatus bar to allow pip install of full package"""
 # -*- coding: utf8 - *-
-from setuptools import setup
+from setuptools import setup, find_packages
 import versioneer
 
 with open("requirements/base.txt") as f:
@@ -57,4 +57,5 @@ setup(
         ("share/bumblebee-status/themes/icons", glob.glob("themes/icons/*.json")),
         ("share/bumblebee-status/utility", glob.glob("bin/*")),
     ],
+    packages=find_packages(exclude=["tests", "tests.*"])
 )

From 51c3805f7f8cc1c064c183e1c5b122cae2b568f7 Mon Sep 17 00:00:00 2001
From: Marco Genasci <fedeliallalinea@gmail.com>
Date: Wed, 5 Jan 2022 09:34:38 +0100
Subject: [PATCH 274/506] Change deprecated dash-separated with underscore in
 setup.cfg

Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
---
 setup.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 081fab6..d417aa6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,8 +31,8 @@ keywords = bumblebee-status
 
 [options]
 include_package_data = True
-allow-all-external = yes
-trusted-host =
+allow_all_external = yes
+trusted_host =
     gitlab.*
     bitbucket.org
     github.com

From 8a50eb6f81ee31764950d70ecd47cb0ae17a784b Mon Sep 17 00:00:00 2001
From: Marco Genasci <fedeliallalinea@gmail.com>
Date: Thu, 6 Jan 2022 08:06:57 +0100
Subject: [PATCH 275/506] New module emerge_status

Display information about the currently running emerge process.

Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
---
 .../modules/contrib/emerge_status.py          | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/emerge_status.py

diff --git a/bumblebee_status/modules/contrib/emerge_status.py b/bumblebee_status/modules/contrib/emerge_status.py
new file mode 100644
index 0000000..3758585
--- /dev/null
+++ b/bumblebee_status/modules/contrib/emerge_status.py
@@ -0,0 +1,113 @@
+"""Display information about the currently running emerge process.
+
+Requires the following executable:
+    * emerge
+
+Parameters:
+    * emerge_status.format: Format string (defaults to '{current}/{total} {action} {category}/{pkg}')
+
+This code is based on emerge_status module from p3status [1] original created by AnwariasEu.
+
+[1] https://github.com/ultrabug/py3status/blob/master/py3status/modules/emerge_status.py 
+"""
+
+import re
+import copy
+
+import core.module
+import core.widget
+import core.decorators
+
+import util.cli
+import util.format
+
+
+class Module(core.module.Module):
+    @core.decorators.every(seconds=10)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, [])
+        self.__format = self.parameter(
+            "format", "{current}/{total} {action} {category}/{pkg}"
+        )
+        self.__ret_default = {
+            "action": "",
+            "category": "",
+            "current": 0,
+            "pkg": "",
+            "total": 0,
+        }
+
+    def update(self):
+        response = {}
+        ret = copy.deepcopy(self.__ret_default)
+        if self.__emerge_running():
+            ret = self.__get_progress()
+
+            widget = self.widget("status")
+            if not widget:
+                widget = self.add_widget(name="status")
+
+            if ret["total"] == 0:
+                widget.full_text("emrg calculating...")
+            else:
+                widget.full_text(
+                    " ".join(
+                        self.__format.format(
+                            current=ret["current"],
+                            total=ret["total"],
+                            action=ret["action"],
+                            category=ret["category"],
+                            pkg=ret["pkg"],
+                        ).split()
+                    )
+                )
+        else:
+            self.clear_widgets()
+
+    def __emerge_running(self):
+        """
+        Check if emerge is running.
+        Returns true if at least one instance of emerge is running.
+        """
+        try:
+            util.cli.execute("pgrep emerge")
+            return True
+        except Exception:
+            return False
+
+    def __get_progress(self):
+        """
+        Get current progress of emerge.
+        Returns a dict containing current and total value.
+        """
+        input_data = []
+        ret = {}
+
+        # traverse emerge.log from bottom up to get latest information
+        last_lines = util.cli.execute("tail -50 /var/log/emerge.log")
+        input_data = last_lines.split("\n")
+        input_data.reverse()
+
+        for line in input_data:
+            if "*** terminating." in line:
+                # copy content of ret_default, not only the references
+                ret = copy.deepcopy(self.__ret_default)
+                break
+            else:
+                status_re = re.compile(
+                    r"\((?P<cu>[\d]+) of (?P<t>[\d]+)\) "
+                    r"(?P<a>[a-zA-Z/]+( [a-zA-Z]+)?) "
+                    r"\((?P<ca>[\w\-]+)/(?P<p>[\w.]+)"
+                )
+                res = status_re.search(line)
+                if res is not None:
+                    ret["action"] = res.group("a").lower()
+                    ret["category"] = res.group("ca")
+                    ret["current"] = res.group("cu")
+                    ret["pkg"] = res.group("p")
+                    ret["total"] = res.group("t")
+                    break
+        return ret
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From f4ca5eaa3b177a874da07cc0946fd99b4016f239 Mon Sep 17 00:00:00 2001
From: Marco Genasci <fedeliallalinea@gmail.com>
Date: Thu, 6 Jan 2022 08:07:49 +0100
Subject: [PATCH 276/506] Added documentation and screenshot for emerge_status
 module

Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
---
 docs/modules.rst              |  15 +++++++++++++++
 screenshots/emerge_status.png | Bin 0 -> 9403 bytes
 2 files changed, 15 insertions(+)
 create mode 100644 screenshots/emerge_status.png

diff --git a/docs/modules.rst b/docs/modules.rst
index 442d461..413f6cf 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -725,6 +725,21 @@ contributed by `joachimmathes <https://github.com/joachimmathes>`_ - many thanks
 
 .. image:: ../screenshots/dunstctl.png
 
+emerge_status
+~~~~~~~~~~~~~
+
+Display information about the currently running emerge process.
+
+Requires the following executable:
+    * emerge
+
+Parameters:
+    * emerge_status.format: Format string (defaults to '{current}/{total} {action} {category}/{pkg}')
+
+This code is based on `emerge_status module from p3status <https://github.com/ultrabug/py3status/blob/master/py3status/modules/emerge_status.py>`_ original created by `AnwariasEu <https://github.com/AnwariasEu>`_.
+
+.. image:: ../screenshots/emerge_status.png
+
 getcrypto
 ~~~~~~~~~
 
diff --git a/screenshots/emerge_status.png b/screenshots/emerge_status.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e2a93aed29e07ccee8e56e98310c5b6d73b3217
GIT binary patch
literal 9403
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

literal 0
HcmV?d00001


From 5d1059ba63b112c5dd5fced753eec1f9adae0077 Mon Sep 17 00:00:00 2001
From: Marco Genasci <fedeliallalinea@gmail.com>
Date: Thu, 6 Jan 2022 10:13:40 +0100
Subject: [PATCH 277/506] Added ebuild link on README.md

Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 2f7bd86..59533bc 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,8 @@ pip install --user bumblebee-status
 
 There is also a SlackBuild available here: [slackbuilds:bumblebee-status](http://slackbuilds.org/repository/14.2/desktop/bumblebee-status/) - many thanks to [@Tonus1](https://github.com/Tonus1)!
 
+An ebuild, for Gentoo Linux, is available on [gallifrey overlay](https://github.com/fedeliallalinea/gallifrey/tree/master/x11-misc/bumblebee-status). Instructions for adding the overlay can be found [here](https://github.com/fedeliallalinea/gallifrey/blob/master/README.md).
+
 # Dependencies
 [Available modules](https://bumblebee-status.readthedocs.io/en/main/modules.html) lists the dependencies (Python modules and external executables)
 for each module. If you are not using a module, you don't need the dependencies.

From 30dd0f2efb6778924f4d9d9fd34a61d32d2fc51c Mon Sep 17 00:00:00 2001
From: Frank Scherrer <frank.scherrer@biotronik.com>
Date: Thu, 13 Jan 2022 11:05:01 +0100
Subject: [PATCH 278/506] add updating view on apt-cache on click

---
 bumblebee_status/modules/contrib/apt.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bumblebee_status/modules/contrib/apt.py b/bumblebee_status/modules/contrib/apt.py
index b7200bb..575968f 100644
--- a/bumblebee_status/modules/contrib/apt.py
+++ b/bumblebee_status/modules/contrib/apt.py
@@ -14,6 +14,7 @@ import threading
 import core.module
 import core.widget
 import core.decorators
+import core.input
 
 import util.cli
 
@@ -56,6 +57,8 @@ class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.updates))
         self.__thread = None
+        core.input.register(self, button=core.input.RIGHT_MOUSE,
+                            cmd=self.updates)
 
     def updates(self, widget):
         if widget.get("error"):

From 8bde6378d4db1ae17f749bc3c5c7559184cacb94 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 14 Jan 2022 13:29:29 +0100
Subject: [PATCH 279/506] [modules/arandr] handle case of "no layouts exist

To ensure that arandr works also if no layouts are available, add some
(very simplistic) exception handling.

see #844
---
 bumblebee_status/modules/contrib/arandr.py | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/bumblebee_status/modules/contrib/arandr.py b/bumblebee_status/modules/contrib/arandr.py
index 7af565d..fd9ad9e 100644
--- a/bumblebee_status/modules/contrib/arandr.py
+++ b/bumblebee_status/modules/contrib/arandr.py
@@ -136,16 +136,19 @@ class Module(core.module.Module):
     def _get_layouts():
         """Loads and parses the arandr screen layout scripts."""
         layouts = {}
-        for filename in os.listdir(__screenlayout_dir__):
-            if fnmatch.fnmatch(filename, '*.sh'):
-                fullpath = os.path.join(__screenlayout_dir__, filename)
-                with open(fullpath, "r") as file:
-                    for line in file:
-                        s_line = line.strip()
-                        if "xrandr" not in s_line:
-                            continue
-                        displays_in_file = Module._parse_layout(line)
-                        layouts[filename] = displays_in_file
+        try:
+            for filename in os.listdir(__screenlayout_dir__):
+                if fnmatch.fnmatch(filename, '*.sh'):
+                    fullpath = os.path.join(__screenlayout_dir__, filename)
+                    with open(fullpath, "r") as file:
+                        for line in file:
+                            s_line = line.strip()
+                            if "xrandr" not in s_line:
+                                continue
+                            displays_in_file = Module._parse_layout(line)
+                            layouts[filename] = displays_in_file
+        except Exception as e:
+            log.error(str(e))
         return layouts
 
     @staticmethod

From 08b5386140fb14ecbccdf9eb7520f597967dee4d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 14 Jan 2022 13:39:04 +0100
Subject: [PATCH 280/506] [util/popup] fix endless loop on "close on leave"

When closing a popup window when the mouse leave the area (default
behaviour, unfortunately), the main "show()" got stuck in an infinite
loop.

Fix that by setting running to False when exiting.

fixes #844
---
 bumblebee_status/modules/contrib/arandr.py | 11 ++++++-----
 bumblebee_status/util/popup.py             |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/modules/contrib/arandr.py b/bumblebee_status/modules/contrib/arandr.py
index fd9ad9e..b207524 100644
--- a/bumblebee_status/modules/contrib/arandr.py
+++ b/bumblebee_status/modules/contrib/arandr.py
@@ -54,7 +54,7 @@ class Module(core.module.Module):
     def activate_layout(layout_path):
         log.debug("activating layout")
         log.debug(layout_path)
-        execute(layout_path)
+        execute(layout_path, ignore_errors=True)
 
     def popup(self, widget):
         """Create Popup that allows the user to control their displays in one
@@ -64,7 +64,7 @@ class Module(core.module.Module):
         menu = popup.menu()
         menu.add_menuitem(
             "arandr",
-            callback=partial(execute, self.manager)
+            callback=partial(execute, self.manager, ignore_errors=True)
         )
         menu.add_separator()
 
@@ -105,11 +105,12 @@ class Module(core.module.Module):
             if count_on == 1:
                 log.info("attempted to turn off last display")
                 return
-            execute("{} --output {} --off".format(self.toggle_cmd, display))
+            execute("{} --output {} --off".format(self.toggle_cmd, display), ignore_errors=True)
         else:
             log.debug("toggling on {}".format(display))
             execute(
-                "{} --output {} --auto".format(self.toggle_cmd, display)
+                "{} --output {} --auto".format(self.toggle_cmd, display),
+                ignore_errors=True
             )
 
     @staticmethod
@@ -120,7 +121,7 @@ class Module(core.module.Module):
         connected).
         """
         displays = {}
-        for line in execute("xrandr -q").split("\n"):
+        for line in execute("xrandr -q", ignore_errors=True).split("\n"):
             if "connected" not in line:
                 continue
             is_on = bool(re.search(r"\d+x\d+\+(\d+)\+\d+", line))
diff --git a/bumblebee_status/util/popup.py b/bumblebee_status/util/popup.py
index bbabe66..784a037 100644
--- a/bumblebee_status/util/popup.py
+++ b/bumblebee_status/util/popup.py
@@ -49,6 +49,7 @@ class menu(object):
         return self._menu
 
     def __on_focus_out(self, event=None):
+        self.running = False
         self._root.destroy()
 
     def __on_click(self, callback):

From 8867f4f188141a07d3e6d8ee157472cf99a60129 Mon Sep 17 00:00:00 2001
From: Dhananjay Tanpure <dtan13@pm.me>
Date: Thu, 20 Jan 2022 21:06:17 +0000
Subject: [PATCH 281/506] added module for blugon

---
 bumblebee_status/modules/contrib/blugon.py | 97 ++++++++++++++++++++++
 tests/modules/contrib/test_blugon.py       |  2 +
 2 files changed, 99 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/blugon.py
 create mode 100644 tests/modules/contrib/test_blugon.py

diff --git a/bumblebee_status/modules/contrib/blugon.py b/bumblebee_status/modules/contrib/blugon.py
new file mode 100644
index 0000000..4fa0079
--- /dev/null
+++ b/bumblebee_status/modules/contrib/blugon.py
@@ -0,0 +1,97 @@
+"""Displays temperature of blugon and Controls it.
+
+Use wheel up and down to change temperature, middle click to toggle and right click to reset temprature.
+
+Default Values:
+    * Minimum temperature: 1000 (red)
+    * Maximum temperature: 20000 (blue)
+    * Default temperature: 6600
+
+Requires the following executable:
+    * blugon
+
+Parameters:
+    * blugon.step: The amount of increase/decrease on scroll (default: 200)
+
+contributed by `DTan13 <https://github.com/DTan13>`
+"""
+
+import core.module
+import core.widget
+
+import util.cli
+import util.format
+
+import os
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.full_text))
+        self.__state = True
+        self.__default = 6600
+        self.__step = (
+            util.format.asint(self.parameter("step")) if self.parameter("step") else 200
+        )
+        self.__max, self.__min = 20000, 1000
+
+        file = open(os.path.expanduser("~/.config/blugon/current"))
+        self.__current = int(float(file.read()))
+
+        events = [
+            {
+                "type": "toggle",
+                "action": self.toggle,
+                "button": core.input.MIDDLE_MOUSE,
+            },
+            {
+                "type": "blue",
+                "action": self.blue,
+                "button": core.input.WHEEL_UP,
+            },
+            {
+                "type": "red",
+                "action": self.red,
+                "button": core.input.WHEEL_DOWN,
+            },
+            {
+                "type": "reset",
+                "action": self.reset,
+                "button": core.input.RIGHT_MOUSE,
+            },
+        ]
+
+        for event in events:
+            core.input.register(self, button=event["button"], cmd=event["action"])
+
+    def set_temp(self):
+        temp = self.__current if self.__state else self.__default
+        util.cli.execute("blugon --setcurrent={}".format(temp))
+
+    def full_text(self, widget):
+        return self.__current if self.__state else self.__default
+
+    def state(self, widget):
+        if not self.__state:
+            return ["critical"]
+
+    def toggle(self, event):
+        self.__state = not self.__state
+        self.set_temp()
+
+    def reset(self, event):
+        self.__current = 6600
+        self.set_temp()
+
+    def blue(self, event):
+        if self.__state and (self.__current < self.__max):
+            self.__current += self.__step
+        self.set_temp()
+
+    def red(self, event):
+        if self.__state and (self.__current > self.__min):
+            self.__current -= self.__step
+        self.set_temp()
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/modules/contrib/test_blugon.py b/tests/modules/contrib/test_blugon.py
new file mode 100644
index 0000000..6c9dd9b
--- /dev/null
+++ b/tests/modules/contrib/test_blugon.py
@@ -0,0 +1,2 @@
+def test_load_module():
+    __import__("modules.contrib.zpool")

From c40a1744637b84682731d015420456d35b004182 Mon Sep 17 00:00:00 2001
From: Logan Connolly <logan.connolly@protonmail.com>
Date: Tue, 25 Jan 2022 17:50:25 +0100
Subject: [PATCH 282/506] feat(theme): add rose pine theme

---
 themes/rose-pine.json | 54 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 themes/rose-pine.json

diff --git a/themes/rose-pine.json b/themes/rose-pine.json
new file mode 100644
index 0000000..e1ce49b
--- /dev/null
+++ b/themes/rose-pine.json
@@ -0,0 +1,54 @@
+{
+  "icons": ["awesome-fonts"],
+  "defaults": {
+    "separator-block-width": 0,
+    "warning": {
+      "fg": "#232136",
+      "bg": "#f6c177"
+    },
+    "critical": {
+      "fg": "#232136",
+      "bg": "#eb6f92"
+    }
+  },
+  "cycle": [
+    { "fg": "#232136", "bg": "#ea9a97" },
+    { "fg": "#e0def4", "bg": "#393552" }
+  ],
+  "dnf": {
+    "good": {
+      "fg": "#232136",
+      "bg": "#9ccfd8"
+    }
+  },
+  "pacman": {
+    "good": {
+      "fg": "#232136",
+      "bg": "#9ccfd8"
+    }
+  },
+  "battery": {
+    "charged": {
+      "fg": "#232136",
+      "bg": "#9ccfd8"
+    },
+    "AC": {
+      "fg": "#232136",
+      "bg": "#9ccfd8"
+    }
+  },
+  "pomodoro": {
+    "paused": {
+      "fg": "#232136",
+      "bg": "#f6c177"
+    },
+    "work": {
+      "fg": "#232136",
+      "bg": "#9ccfd8"
+    },
+    "break": {
+      "fg": "#232136",
+      "bg": "#c4a7e7"
+    }
+  }
+}

From 4c08cd812e7c436113c7e88245ea929dc35fef44 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 9 Feb 2022 21:15:08 +0100
Subject: [PATCH 283/506] Create codeql-analysis.yml

Trying out CodeQL
---
 .github/workflows/codeql-analysis.yml | 70 +++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..5e39422
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '31 0 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

From 8458eef1e60fa19d862977b2b08c484e0261d55c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 9 Feb 2022 21:24:35 +0100
Subject: [PATCH 284/506] [doc] add codeql badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 59533bc..ba6261f 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 [![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
+[![CodeQL](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml)
 ![License](https://img.shields.io/github/license/tobi-wan-kenobi/bumblebee-status)
 
 **Many, many thanks to all contributors! I am still amazed by and deeply grateful for how many PRs this project gets.**

From 4f9553f7ea4ca9d9166980384669c451b74cd019 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 11 Feb 2022 13:44:10 +0100
Subject: [PATCH 285/506] [modules/rss] fix insecure use of tempfile

fixes #850
---
 bumblebee_status/modules/contrib/rss.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/rss.py b/bumblebee_status/modules/contrib/rss.py
index 7b8c032..7824e2e 100644
--- a/bumblebee_status/modules/contrib/rss.py
+++ b/bumblebee_status/modules/contrib/rss.py
@@ -55,7 +55,7 @@ class Module(core.module.Module):
 
         self._state = []
 
-        self._newspaper_filename = tempfile.mktemp(".html")
+        self._newspaper_file = tempfile.NamedTemporaryFile(mode="w", suffix=".html")
 
         self._last_refresh = 0
         self._last_update = 0
@@ -308,10 +308,11 @@ class Module(core.module.Module):
 
         while newspaper_items:
             content += self._create_news_section(newspaper_items)
-        open(self._newspaper_filename, "w").write(
+        self._newspaper_file.write(
             HTML_TEMPLATE.replace("[[CONTENT]]", content)
         )
-        webbrowser.open("file://" + self._newspaper_filename)
+        self._newspaper_file.flush()
+        webbrowser.open("file://" + self._newspaper_file.name)
         self._update_history("newspaper")
         self._save_history()
 

From 5c390be25cba3338c858e0fb77e4d446515fd5b1 Mon Sep 17 00:00:00 2001
From: Christopher Kepes <c.kepes@posteo.net>
Date: Sat, 12 Feb 2022 11:06:10 +0100
Subject: [PATCH 286/506] [modules/nic] Added strength indicator for wifi
 signals

---
 bumblebee_status/modules/core/nic.py | 46 ++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 7dde2f0..591fe1c 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -13,7 +13,9 @@ Parameters:
     * nic.exclude: Comma-separated list of interface prefixes (supporting regular expressions) to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br,.*:avahi')
     * nic.include: Comma-separated list of interfaces to include
     * nic.states: Comma-separated list of states to show (prefix with '^' to invert - i.e. ^down -> show all devices that are not in state down)
-    * nic.format: Format string (defaults to '{intf} {state} {ip} {ssid}')
+    * nic.format: Format string (defaults to '{intf} {state} {ip} {ssid} {strength}')
+    * nic.strength_warning: Integer to set the threshold for warning state (defaults to 50)
+    * nic.strength_critical: Integer to set the threshold for critical state (defaults to 30)
 """
 
 import re
@@ -28,7 +30,7 @@ import util.format
 
 
 class Module(core.module.Module):
-    @core.decorators.every(seconds=10)
+    @core.decorators.every(seconds=5)
     def __init__(self, config, theme):
         widgets = []
         super().__init__(config, theme, widgets)
@@ -45,7 +47,15 @@ class Module(core.module.Module):
                 self._states["exclude"].append(state[1:])
             else:
                 self._states["include"].append(state)
-        self._format = self.parameter("format", "{intf} {state} {ip} {ssid}")
+        self._format = self.parameter("format", "{intf} {state} {ip} {ssid} {strength}")
+
+        self._strength_threshold_critical = self.parameter("strength_critical", 30)
+        self._strength_threshold_warning = self.parameter("strength_warning", 50)
+
+        # Limits for the accepted dBm values of wifi strength
+        self.__strength_dbm_lower_bound = -110
+        self.__strength_dbm_upper_bound = -30
+
         self.iw = shutil.which("iw")
         self._update_widgets(widgets)
 
@@ -64,6 +74,13 @@ class Module(core.module.Module):
         iftype = "wireless" if self._iswlan(intf) else "wired"
         iftype = "tunnel" if self._istunnel(intf) else iftype
 
+        # "strength" is none if interface type is not wlan
+        if self._iswlan(intf):
+            if widget.get("strength") < self._strength_threshold_critical:
+                states.append("critical")
+            elif widget.get("strength") < self._strength_threshold_warning:
+                states.append("warning")
+
         states.append("{}-{}".format(iftype, widget.get("state")))
 
         return states
@@ -116,6 +133,9 @@ class Module(core.module.Module):
             ):
                 continue
 
+            strength_dbm = self.get_strength_dbm(intf)
+            strength_percent = self.convert_strength_dbm_percent(strength_dbm)
+
             widget = self.widget(intf)
             if not widget:
                 widget = self.add_widget(name=intf)
@@ -126,12 +146,14 @@ class Module(core.module.Module):
                         ip=", ".join(addr),
                         intf=intf,
                         state=state,
+                        strength=str(strength_percent) + "%" if strength_percent else "",
                         ssid=self.get_ssid(intf),
                     ).split()
                 )
             )
             widget.set("intf", intf)
             widget.set("state", state)
+            widget.set("strength", strength_percent)
 
     def get_ssid(self, intf):
         if not self._iswlan(intf) or self._istunnel(intf) or not self.iw:
@@ -145,5 +167,23 @@ class Module(core.module.Module):
 
         return ""
 
+    def get_strength_dbm(self, intf):
+        if not self._iswlan(intf) or self._istunnel(intf) or not self.iw:
+            return None
+
+        with open("/proc/net/wireless", "r") as file:
+            for line in file:
+                if intf in line:
+                    # Remove trailing . by slicing it off ;)
+                    strength_dbm = line.split()[3][:-1]
+                    return util.format.asint(strength_dbm,
+                                minium=self.__strength_dbm_lower_bound,
+                                maximum=self.__strength_dbm_upper_bound)
+
+        return None
+
+    def convert_strength_dbm_percent(self, signal):
+        return int(100 * ((signal + 100) / 70.0)) if signal else None
+
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 4784be40762601c656ce8964c15c11d556ab8b0d Mon Sep 17 00:00:00 2001
From: Pi-Yueh Chuang <pychuang@pm.me>
Date: Sat, 12 Feb 2022 12:54:31 -0500
Subject: [PATCH 287/506] typo in nic.py: minium -> minimum

---
 bumblebee_status/modules/core/nic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 591fe1c..94a9e20 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -177,7 +177,7 @@ class Module(core.module.Module):
                     # Remove trailing . by slicing it off ;)
                     strength_dbm = line.split()[3][:-1]
                     return util.format.asint(strength_dbm,
-                                minium=self.__strength_dbm_lower_bound,
+                                minimum=self.__strength_dbm_lower_bound,
                                 maximum=self.__strength_dbm_upper_bound)
 
         return None

From 2a77e3a85c1f59318a7538028314e0edde9c3b57 Mon Sep 17 00:00:00 2001
From: Mihai Morariu <mihaimorariu@gmail.com>
Date: Mon, 14 Feb 2022 15:36:24 +0200
Subject: [PATCH 288/506] Fix exception in location.py.

---
 bumblebee_status/modules/contrib/sun.py | 10 +++++++++-
 bumblebee_status/util/location.py       |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/sun.py b/bumblebee_status/modules/contrib/sun.py
index e9eefd2..34a4b71 100644
--- a/bumblebee_status/modules/contrib/sun.py
+++ b/bumblebee_status/modules/contrib/sun.py
@@ -39,7 +39,11 @@ class Module(core.module.Module):
         self.__sun = None
 
         if not lat or not lon:
-            lat, lon = util.location.coordinates()
+            try:
+                lat, lon = util.location.coordinates()
+            except Exception:
+                pass
+
         if lat and lon:
             self.__sun = Sun(float(lat), float(lon))
 
@@ -55,6 +59,10 @@ class Module(core.module.Module):
         return "n/a"
 
     def __calculate_times(self):
+        if not self.__sun:
+            self.__sunset = self.__sunrise = None
+            return
+
         self.__isup = False
 
         order_matters = True
diff --git a/bumblebee_status/util/location.py b/bumblebee_status/util/location.py
index 12242ea..e48b71a 100644
--- a/bumblebee_status/util/location.py
+++ b/bumblebee_status/util/location.py
@@ -59,11 +59,11 @@ def __load():
     __next = time.time() + 60 * 30  # error - try again every 30m
 
 
-def __get(name, default=None):
+def __get(name):
     global __data
     if not __data or __expired():
         __load()
-    return __data.get(name, default)
+    return __data[name]
 
 
 def reset():

From 3aadab5628f0b4f839428231e28f1d7ab9d60d0c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 14 Feb 2022 14:58:01 +0100
Subject: [PATCH 289/506] [modules/publicip] handle missing public ip more
 gracefully

If location does not throw, but reports an empty public IP, return
"n/a".

Since this caused a bug, also add a test for it.

fixes #853
---
 bumblebee_status/modules/contrib/publicip.py | 4 ++--
 tests/modules/contrib/test_publicip.py       | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 17a23e3..a74d708 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -16,13 +16,13 @@ class Module(core.module.Module):
         self.__ip = ""
 
     def public_ip(self, widget):
-        return self.__ip
+        return self.__ip or "n/a"
 
     def update(self):
         try:
             self.__ip = util.location.public_ip()
         except Exception:
-            self.__ip = "n/a"
+            self.__ip = None
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/modules/contrib/test_publicip.py b/tests/modules/contrib/test_publicip.py
index 9584bd7..870ede6 100644
--- a/tests/modules/contrib/test_publicip.py
+++ b/tests/modules/contrib/test_publicip.py
@@ -26,6 +26,15 @@ class PublicIPTest(TestCase):
 
         assert widget(module).full_text() == '5.12.220.2'
 
+    @mock.patch('util.location.public_ip')
+    def test_public_ip(self, public_ip_mock):
+        public_ip_mock.return_value = None
+
+        module = build_module()
+        module.update()
+
+        assert widget(module).full_text() == 'n/a'
+
     @mock.patch('util.location.public_ip')
     def test_public_ip_with_exception(self, public_ip_mock):
         public_ip_mock.side_effect = Exception

From 03731136b6f2147ded54ce2881eddc4b1dba5d83 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 15 Feb 2022 16:34:02 +0100
Subject: [PATCH 290/506] [modules/nic] fix missing check for None

---
 bumblebee_status/modules/core/nic.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 94a9e20..09fe487 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -75,10 +75,11 @@ class Module(core.module.Module):
         iftype = "tunnel" if self._istunnel(intf) else iftype
 
         # "strength" is none if interface type is not wlan
-        if self._iswlan(intf):
-            if widget.get("strength") < self._strength_threshold_critical:
+        strength = widget.get("strength")
+        if self._iswlan(intf) and strength:
+            if strength < self._strength_threshold_critical:
                 states.append("critical")
-            elif widget.get("strength") < self._strength_threshold_warning:
+            elif strength < self._strength_threshold_warning:
                 states.append("warning")
 
         states.append("{}-{}".format(iftype, widget.get("state")))

From 928f8258aabf5cb05b709fa3740099218d5acae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20L=C3=BCftinger?=
 <lukas.lueftinger@ares-genetics.com>
Date: Sun, 20 Feb 2022 12:29:49 +0100
Subject: [PATCH 291/506] fix case of Kelvin SI unit in redshift widget

---
 bumblebee_status/modules/core/redshift.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/redshift.py b/bumblebee_status/modules/core/redshift.py
index c6735b1..d50463f 100644
--- a/bumblebee_status/modules/core/redshift.py
+++ b/bumblebee_status/modules/core/redshift.py
@@ -54,7 +54,7 @@ def get_redshift_value(module):
     for line in res.split("\n"):
         line = line.lower()
         if "temperature" in line:
-            widget.set("temp", line.split(" ")[2])
+            widget.set("temp", line.split(" ")[2].upper())
         if "period" in line:
             state = line.split(" ")[1]
             if "day" in state:

From 950931e1b9e9619d556a57e3a576e2dc1b6bbc51 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Mon, 28 Feb 2022 19:14:21 +0100
Subject: [PATCH 292/506] added new module 'pactl'

* added new module 'pactl' which displays the current default sink and allows to
  select a different default sink from the popup menu.
---
 bumblebee_status/modules/contrib/pactl.py | 142 ++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/pactl.py

diff --git a/bumblebee_status/modules/contrib/pactl.py b/bumblebee_status/modules/contrib/pactl.py
new file mode 100644
index 0000000..0abea68
--- /dev/null
+++ b/bumblebee_status/modules/contrib/pactl.py
@@ -0,0 +1,142 @@
+# pylint: disable=C0111,R0903
+
+""" Displays the current default sink.
+
+    Left click opens a popup menu that lists all available sinks and allows to change the default sink.
+
+    Per default, this module uses the sink names returned by "pactl list sinks short"
+
+    sample output of "pactl list sinks short":
+
+    2	alsa_output.pci-0000_00_1f.3.analog-stereo	module-alsa-card.c	s16le 2ch 44100Hz	SUSPENDED
+    3	alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo	module-alsa-card.c	s16le 2ch 44100Hz	SUSPENDE
+
+    As "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" is not a particularly nice name, its possible to map the name to more a
+    user friendly name. e.g to map "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" to the name "Headset", add the following
+    bumblebee-status config entry: pactl.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=Headset
+
+    The module also allows to specify individual (unicode) icons for all the sinks. e.g in order to use the icon 🎧 for the
+    "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" sink, add the following bumblebee-status config entry:
+    pactl.icon.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=🎧
+
+    Requirements:
+        * pulseaudio
+        * pactl
+"""
+
+import logging
+import functools
+
+import core.module
+import core.widget
+import core.input
+
+import util.cli
+import util.popup
+
+
+class Sink(object):
+    def __init__(self, id, internal_name, friendly_name, icon):
+        super().__init__()
+        self.__id = id
+        self.__internal_name = internal_name
+        self.__friendly_name = friendly_name
+        self.__icon = icon
+
+    @property
+    def id(self):
+        return self.__id
+
+    @property
+    def internal_name(self):
+        return self.__internal_name
+
+    @property
+    def friendly_name(self):
+        return self.__friendly_name
+
+    @property
+    def icon(self):
+        return self.__icon
+
+    @property
+    def display_name(self):
+        display_name = (
+            self.__icon + " " + self.__friendly_name
+            if self.__icon != ""
+            else self.__friendly_name
+        )
+        return display_name
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.default_sink))
+
+        self.__default_sink = None
+
+        res = util.cli.execute("pactl list sinks short")
+        lines = res.splitlines()
+
+        self.__sinks = []
+        for line in lines:
+            info = line.split("\t")
+            try:
+                friendly_name = self.parameter(info[1], info[1])
+                icon = self.parameter("icon." + info[1], "")
+                self.__sinks.append(Sink(info[0], info[1], friendly_name, icon))
+            except:
+                logging.exception("Couldn't parse sink")
+                pass
+
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.popup)
+
+    def __sink(self, internal_sink_name):
+        for sink in self.__sinks:
+            logging.info(sink.internal_name)
+            if internal_sink_name == sink.internal_name:
+                return sink
+        return None
+
+    def update(self):
+        try:
+            res = util.cli.execute("pactl info")
+            lines = res.splitlines()
+            self.__default_sink = None
+            for line in lines:
+                if not line.startswith("Default Sink:"):
+                    continue
+                internal_sink_name = line.replace("Default Sink: ", "")
+                self.__default_sink = self.__sink(internal_sink_name)
+                break
+        except Exception as e:
+            logging.exception("Could not get pactl info")
+            self.__default_sink = None
+
+    def default_sink(self, widget):
+        if self.__default_sink is None:
+            return "unknown"
+        return self.__default_sink.display_name
+
+    def __on_sink_selected(self, sink):
+        try:
+            util.cli.execute("pactl set-default-sink {}".format(sink.id))
+            self.__default_sink = sink
+        except Exception as e:
+            logging.exception("Couldn't set default sink")
+
+    def popup(self, widget):
+        menu = util.popup.menu()
+
+        for sink in self.__sinks:
+            menu.add_menuitem(
+                sink.friendly_name,
+                callback=functools.partial(self.__on_sink_selected, sink),
+            )
+        menu.show(widget)
+
+    def state(self, widget):
+        return []
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 33d22c2637f0b667182b9b0c3a7b7db2b60578fd Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Mon, 28 Feb 2022 19:20:19 +0100
Subject: [PATCH 293/506] removed debug log from 'pactl' module

---
 bumblebee_status/modules/contrib/pactl.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/pactl.py b/bumblebee_status/modules/contrib/pactl.py
index 0abea68..cd62c9a 100644
--- a/bumblebee_status/modules/contrib/pactl.py
+++ b/bumblebee_status/modules/contrib/pactl.py
@@ -93,7 +93,6 @@ class Module(core.module.Module):
 
     def __sink(self, internal_sink_name):
         for sink in self.__sinks:
-            logging.info(sink.internal_name)
             if internal_sink_name == sink.internal_name:
                 return sink
         return None

From 07200c466bd746b4076db0547093f467d8c70254 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 2 Mar 2022 12:33:02 +0100
Subject: [PATCH 294/506] [themes] add zengarden light (powerline)

---
 themes/zengarden-powerline-light.json | 64 +++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 themes/zengarden-powerline-light.json

diff --git a/themes/zengarden-powerline-light.json b/themes/zengarden-powerline-light.json
new file mode 100644
index 0000000..ecf7de5
--- /dev/null
+++ b/themes/zengarden-powerline-light.json
@@ -0,0 +1,64 @@
+{
+	"icons": [ "paxy97", "awesome-fonts" ],
+	"defaults": {
+		"warning": {
+			"fg": "#353839",
+			"bg": "#967117"
+		},
+		"critical": {
+			"fg": "#353839",
+			"bg": "#ba1d58"
+		},
+		"default-separators": false,
+		"separator-block-width": 0
+	},
+	"fg": "#353839",
+	"bg": "#c4b6a3",
+    "dnf": {
+        "good": {
+            "fg": "#353839",
+            "bg": "#177245"
+        }
+    },
+    "apt": {
+        "good": {
+            "fg": "#353839",
+            "bg": "#177245"
+        }
+    },
+    "battery": {
+        "charged": {
+            "fg": "#353839",
+            "bg": "#177245"
+        },
+        "AC": {
+            "fg": "#353839",
+            "bg": "#177245"
+        }
+    },
+    "bluetooth": {
+        "ON": {
+            "fg": "#353839",
+            "bg": "#177245"
+        }
+    },
+    "git": {
+        "modified": { "bg": "#174572" },
+        "deleted": { "bg": "#ba1d58" },
+        "new": { "bg": "#967117" }
+    },
+    "pomodoro": {
+        "paused": {
+            "fg": "#353839",
+            "bg": "#d79921"
+        },
+        "work": {
+            "fg": "#353839",
+            "bg": "#177245"
+        },
+        "break": {
+            "fg": "#353839",
+            "bg": "#177245"
+        }
+    }
+}

From 9a2e7637c9d5c6d4098b3bcff548dbf4045d31a2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 2 Mar 2022 16:16:24 +0100
Subject: [PATCH 295/506] [themes/zengarden] lighter accents

---
 themes/zengarden-powerline-light.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/themes/zengarden-powerline-light.json b/themes/zengarden-powerline-light.json
index ecf7de5..7fe0bc5 100644
--- a/themes/zengarden-powerline-light.json
+++ b/themes/zengarden-powerline-light.json
@@ -3,11 +3,11 @@
 	"defaults": {
 		"warning": {
 			"fg": "#353839",
-			"bg": "#967117"
+			"bg": "#b38a32"
 		},
 		"critical": {
 			"fg": "#353839",
-			"bg": "#ba1d58"
+			"bg": "#d94070"
 		},
 		"default-separators": false,
 		"separator-block-width": 0
@@ -17,29 +17,29 @@
     "dnf": {
         "good": {
             "fg": "#353839",
-            "bg": "#177245"
+            "bg": "#378c5d"
         }
     },
     "apt": {
         "good": {
             "fg": "#353839",
-            "bg": "#177245"
+            "bg": "#378c5d"
         }
     },
     "battery": {
         "charged": {
             "fg": "#353839",
-            "bg": "#177245"
+            "bg": "#378c5d"
         },
         "AC": {
             "fg": "#353839",
-            "bg": "#177245"
+            "bg": "#378c5d"
         }
     },
     "bluetooth": {
         "ON": {
             "fg": "#353839",
-            "bg": "#177245"
+            "bg": "#378c5d"
         }
     },
     "git": {
@@ -54,11 +54,11 @@
         },
         "work": {
             "fg": "#353839",
-            "bg": "#177245"
+            "bg": "#378c5d"
         },
         "break": {
             "fg": "#353839",
-            "bg": "#177245"
+            "bg": "#378c5d"
         }
     }
 }

From c57daf65ce6da29d405570e1de09adbc9bad779b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 3 Mar 2022 14:31:47 +0100
Subject: [PATCH 296/506] [themes/zengarden] add key colors

---
 themes/zengarden-powerline-light.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/themes/zengarden-powerline-light.json b/themes/zengarden-powerline-light.json
index 7fe0bc5..097842a 100644
--- a/themes/zengarden-powerline-light.json
+++ b/themes/zengarden-powerline-light.json
@@ -60,5 +60,19 @@
             "fg": "#353839",
             "bg": "#378c5d"
         }
-    }
+    },
+	"keys": {
+		"Key.cmd": {
+			"bg": "#477ab7"
+		},
+		"Key.shift": {
+			"bg": "#b38a32"
+		},
+		"Key.ctrl": {
+			"bg": "#377c8b"
+		},
+		"Key.alt": {
+			"bg": "#e05b1f"
+		}
+	}
 }

From 7d33171749b0109ad55bb88b6dafc9b011b12f83 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 4 Mar 2022 09:35:43 +0100
Subject: [PATCH 297/506] [core/input] methods can be event callbacks

When registering an event (especially mouse events), if the parameter
is a valid method in the Module, execute that with the event as
parameter.

Add this in the core.spacer module as an example.

fixes #858
see #857
---
 bumblebee_status/core/input.py          | 3 +++
 bumblebee_status/modules/core/spacer.py | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/core/input.py b/bumblebee_status/core/input.py
index 2f9fdfc..5752dd8 100644
--- a/bumblebee_status/core/input.py
+++ b/bumblebee_status/core/input.py
@@ -54,8 +54,11 @@ def register(obj, button=None, cmd=None, wait=False):
     event_id = __event_id(obj.id if obj is not None else "", button)
     logging.debug("registering callback {}".format(event_id))
     core.event.unregister(event_id) # make sure there's always only one input event
+
     if callable(cmd):
         core.event.register_exclusive(event_id, cmd)
+    elif obj and hasattr(obj, cmd) and callable(getattr(obj, cmd)):
+        core.event.register_exclusive(event_id, lambda event: getattr(obj, cmd)(event))
     else:
         core.event.register_exclusive(event_id, lambda event: __execute(event, cmd, wait))
 
diff --git a/bumblebee_status/modules/core/spacer.py b/bumblebee_status/modules/core/spacer.py
index 7e4453a..e5a2d5e 100644
--- a/bumblebee_status/modules/core/spacer.py
+++ b/bumblebee_status/modules/core/spacer.py
@@ -9,7 +9,7 @@ Parameters:
 import core.module
 import core.widget
 import core.decorators
-
+import core.input
 
 class Module(core.module.Module):
     @core.decorators.every(minutes=60)
@@ -20,5 +20,8 @@ class Module(core.module.Module):
     def text(self, _):
         return self.__text
 
+    def update_text(self, event):
+        self.__text = core.input.button_name(event["button"])
+
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 9cbc39e462df8b2f732d22c1821938fef680bc4f Mon Sep 17 00:00:00 2001
From: Sadegh Hamedani <sad3gh.hmp@gmail.com>
Date: Fri, 4 Mar 2022 18:28:13 +0330
Subject: [PATCH 298/506] [contrib] added module persian_date

---
 .../modules/contrib/persian_date.py           | 45 +++++++++++++++++++
 themes/icons/awesome-fonts.json               |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/persian_date.py

diff --git a/bumblebee_status/modules/contrib/persian_date.py b/bumblebee_status/modules/contrib/persian_date.py
new file mode 100644
index 0000000..6e3eded
--- /dev/null
+++ b/bumblebee_status/modules/contrib/persian_date.py
@@ -0,0 +1,45 @@
+# pylint: disable=C0111,R0903
+
+"""Displays the current date and time in Persian(Jalali) Calendar.
+
+Requires the following python packages:
+    * jdatetime
+
+Parameters:
+    * datetime.format: strftime()-compatible formatting string. default: "%A %d %B" e.g., "جمعه ۱۳ اسفند"
+    * datetime.locale: locale to use. default: "fa_IR"
+"""
+
+from __future__ import absolute_import
+import jdatetime
+import locale
+
+import core.module
+import core.widget
+import core.input
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.full_text))
+
+        l = ("fa_IR", "UTF-8")
+        lcl = self.parameter("locale", ".".join(l))
+        try:
+            locale.setlocale(locale.LC_ALL, lcl.split("."))
+        except Exception as e:
+            locale.setlocale(locale.LC_ALL, ("fa_IR", "UTF-8"))
+
+    def default_format(self):
+        return "%A %d %B"
+
+    def full_text(self, widget):
+        enc = locale.getpreferredencoding()
+        fmt = self.parameter("format", self.default_format())
+        retval = jdatetime.datetime.now().strftime(fmt)
+        if hasattr(retval, "decode"):
+            return retval.decode(enc)
+        return retval
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 9f14da9..f85dfd8 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -7,6 +7,7 @@
     "default-separators": false
   },
   "date": { "prefix": "" },
+  "persian_date": { "prefix": "" },
   "time": { "prefix": "" },
   "datetime": { "prefix": "" },
   "datetz": { "prefix": "" },

From e5cdabcc0f9fb972828cf88739072130bf2f545a Mon Sep 17 00:00:00 2001
From: Dhananjay Tanpure <dhananjaytanpure13@gmail.com>
Date: Mon, 7 Mar 2022 08:50:30 +0530
Subject: [PATCH 299/506] mpd and title

---
 bumblebee_status/modules/contrib/mpd.py   | 9 +++++++++
 bumblebee_status/modules/contrib/title.py | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/mpd.py b/bumblebee_status/modules/contrib/mpd.py
index 3efffff..92568d1 100644
--- a/bumblebee_status/modules/contrib/mpd.py
+++ b/bumblebee_status/modules/contrib/mpd.py
@@ -94,6 +94,12 @@ class Module(core.module.Module):
                     "cmd": "mpc toggle" + self._hostcmd,
                 }
                 widget.full_text(self.description)
+            elif widget_name == "mpd.toggle":
+                widget_map[widget] = {
+                    "button": core.input.LEFT_MOUSE,
+                    "cmd": "mpc toggle" + self._hostcmd,
+                }
+                widget.full_text(self.toggle)
             elif widget_name == "mpd.next":
                 widget_map[widget] = {
                     "button": core.input.LEFT_MOUSE,
@@ -127,6 +133,9 @@ class Module(core.module.Module):
     def description(self, widget):
         return string.Formatter().vformat(self._fmt, (), self._tags)
 
+    def toggle(self, widget):
+        return str(util.cli.execute("mpc status %currenttime%/%totaltime%", ignore_errors=True)).strip()
+
     def update(self):
         self._load_song()
 
diff --git a/bumblebee_status/modules/contrib/title.py b/bumblebee_status/modules/contrib/title.py
index 33af47a..055369e 100644
--- a/bumblebee_status/modules/contrib/title.py
+++ b/bumblebee_status/modules/contrib/title.py
@@ -9,6 +9,7 @@ Parameters:
     * title.max : Maximum character length for title before truncating. Defaults to 64.
     * title.placeholder : Placeholder text to be placed if title was truncated. Defaults to '...'.
     * title.scroll : Boolean flag for scrolling title. Defaults to False
+    * title.short : Boolean flag for short title. Defaults to False
 
 
 contributed by `UltimatePancake <https://github.com/UltimatePancake>`_ - many thanks!
@@ -35,6 +36,7 @@ class Module(core.module.Module):
 
         # parsing of parameters
         self.__scroll = util.format.asbool(self.parameter("scroll", False))
+        self.__short = util.format.asbool(self.parameter("short", False))
         self.__max = int(self.parameter("max", 64))
         self.__placeholder = self.parameter("placeholder", "...")
         self.__title = ""
@@ -66,7 +68,9 @@ class Module(core.module.Module):
     def __pollTitle(self):
         """Updating current title."""
         try:
-            self.__full_title = self.__i3.get_tree().find_focused().name
+            focused = self.__i3.get_tree().find_focused().name
+            self.__full_title = focused.split(
+                "-")[-1].strip() if self.__short else focused
         except:
             self.__full_title = no_title
         if self.__full_title is None:

From d52f71306381ac02a0a5a768d74f3d045ab17cf0 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Mon, 7 Mar 2022 20:53:11 +0100
Subject: [PATCH 300/506] Revert "Merge pull request #857 from bbernhard/pactl"

This reverts commit eb51a3c1c7d99829304ba615b9caa4ef8417af42, reversing
changes made to c57daf65ce6da29d405570e1de09adbc9bad779b.

Instead of creating a separate module, the changes will be integrated
into the pulseaudio module.
---
 bumblebee_status/modules/contrib/pactl.py | 141 ----------------------
 1 file changed, 141 deletions(-)
 delete mode 100644 bumblebee_status/modules/contrib/pactl.py

diff --git a/bumblebee_status/modules/contrib/pactl.py b/bumblebee_status/modules/contrib/pactl.py
deleted file mode 100644
index cd62c9a..0000000
--- a/bumblebee_status/modules/contrib/pactl.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# pylint: disable=C0111,R0903
-
-""" Displays the current default sink.
-
-    Left click opens a popup menu that lists all available sinks and allows to change the default sink.
-
-    Per default, this module uses the sink names returned by "pactl list sinks short"
-
-    sample output of "pactl list sinks short":
-
-    2	alsa_output.pci-0000_00_1f.3.analog-stereo	module-alsa-card.c	s16le 2ch 44100Hz	SUSPENDED
-    3	alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo	module-alsa-card.c	s16le 2ch 44100Hz	SUSPENDE
-
-    As "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" is not a particularly nice name, its possible to map the name to more a
-    user friendly name. e.g to map "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" to the name "Headset", add the following
-    bumblebee-status config entry: pactl.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=Headset
-
-    The module also allows to specify individual (unicode) icons for all the sinks. e.g in order to use the icon 🎧 for the
-    "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" sink, add the following bumblebee-status config entry:
-    pactl.icon.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=🎧
-
-    Requirements:
-        * pulseaudio
-        * pactl
-"""
-
-import logging
-import functools
-
-import core.module
-import core.widget
-import core.input
-
-import util.cli
-import util.popup
-
-
-class Sink(object):
-    def __init__(self, id, internal_name, friendly_name, icon):
-        super().__init__()
-        self.__id = id
-        self.__internal_name = internal_name
-        self.__friendly_name = friendly_name
-        self.__icon = icon
-
-    @property
-    def id(self):
-        return self.__id
-
-    @property
-    def internal_name(self):
-        return self.__internal_name
-
-    @property
-    def friendly_name(self):
-        return self.__friendly_name
-
-    @property
-    def icon(self):
-        return self.__icon
-
-    @property
-    def display_name(self):
-        display_name = (
-            self.__icon + " " + self.__friendly_name
-            if self.__icon != ""
-            else self.__friendly_name
-        )
-        return display_name
-
-
-class Module(core.module.Module):
-    def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.default_sink))
-
-        self.__default_sink = None
-
-        res = util.cli.execute("pactl list sinks short")
-        lines = res.splitlines()
-
-        self.__sinks = []
-        for line in lines:
-            info = line.split("\t")
-            try:
-                friendly_name = self.parameter(info[1], info[1])
-                icon = self.parameter("icon." + info[1], "")
-                self.__sinks.append(Sink(info[0], info[1], friendly_name, icon))
-            except:
-                logging.exception("Couldn't parse sink")
-                pass
-
-        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.popup)
-
-    def __sink(self, internal_sink_name):
-        for sink in self.__sinks:
-            if internal_sink_name == sink.internal_name:
-                return sink
-        return None
-
-    def update(self):
-        try:
-            res = util.cli.execute("pactl info")
-            lines = res.splitlines()
-            self.__default_sink = None
-            for line in lines:
-                if not line.startswith("Default Sink:"):
-                    continue
-                internal_sink_name = line.replace("Default Sink: ", "")
-                self.__default_sink = self.__sink(internal_sink_name)
-                break
-        except Exception as e:
-            logging.exception("Could not get pactl info")
-            self.__default_sink = None
-
-    def default_sink(self, widget):
-        if self.__default_sink is None:
-            return "unknown"
-        return self.__default_sink.display_name
-
-    def __on_sink_selected(self, sink):
-        try:
-            util.cli.execute("pactl set-default-sink {}".format(sink.id))
-            self.__default_sink = sink
-        except Exception as e:
-            logging.exception("Couldn't set default sink")
-
-    def popup(self, widget):
-        menu = util.popup.menu()
-
-        for sink in self.__sinks:
-            menu.add_menuitem(
-                sink.friendly_name,
-                callback=functools.partial(self.__on_sink_selected, sink),
-            )
-        menu.show(widget)
-
-    def state(self, widget):
-        return []
-
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 82ca97c65f7ba6a6c65eef2521f1248859fab66b Mon Sep 17 00:00:00 2001
From: Sadegh Hamedani <sad3gh.hmp@gmail.com>
Date: Thu, 10 Mar 2022 11:52:08 +0330
Subject: [PATCH 301/506] [core/datetime] added 'dtlibrary' attribute and
 'set_locale' method

---
 bumblebee_status/modules/core/datetime.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/modules/core/datetime.py b/bumblebee_status/modules/core/datetime.py
index febb5fb..0a15c70 100644
--- a/bumblebee_status/modules/core/datetime.py
+++ b/bumblebee_status/modules/core/datetime.py
@@ -17,26 +17,33 @@ import core.input
 
 
 class Module(core.module.Module):
-    def __init__(self, config, theme):
+    def __init__(self, config, theme, dtlibrary=None):
         super().__init__(config, theme, core.widget.Widget(self.full_text))
 
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd="calendar")
-        l = locale.getdefaultlocale()
+        self.dtlibrary = dtlibrary or datetime
+
+    def set_locale(self):
+        l = self.default_locale()
         if not l or l == (None, None):
             l = ("en_US", "UTF-8")
         lcl = self.parameter("locale", ".".join(l))
         try:
-            locale.setlocale(locale.LC_TIME, lcl.split("."))
+            locale.setlocale(locale.LC_ALL, lcl.split("."))
         except Exception as e:
-            locale.setlocale(locale.LC_TIME, ("en_US", "UTF-8"))
+            locale.setlocale(locale.LC_ALL, ("en_US", "UTF-8"))
 
     def default_format(self):
         return "%x %X"
 
+    def default_locale(self):
+        return locale.getdefaultlocale()
+
     def full_text(self, widget):
+        self.set_locale()
         enc = locale.getpreferredencoding()
         fmt = self.parameter("format", self.default_format())
-        retval = datetime.datetime.now().strftime(fmt)
+        retval = self.dtlibrary.datetime.now().strftime(fmt)
         if hasattr(retval, "decode"):
             return retval.decode(enc)
         return retval

From c228ca3b128c420d817664b9bc62dd2db7618ead Mon Sep 17 00:00:00 2001
From: Sadegh Hamedani <sad3gh.hmp@gmail.com>
Date: Thu, 10 Mar 2022 11:53:19 +0330
Subject: [PATCH 302/506] [contrib/persian_date] refactor using `core.datetime`
 module as parent

---
 .../modules/contrib/persian_date.py           | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/bumblebee_status/modules/contrib/persian_date.py b/bumblebee_status/modules/contrib/persian_date.py
index 6e3eded..9873e1a 100644
--- a/bumblebee_status/modules/contrib/persian_date.py
+++ b/bumblebee_status/modules/contrib/persian_date.py
@@ -10,36 +10,22 @@ Parameters:
     * datetime.locale: locale to use. default: "fa_IR"
 """
 
-from __future__ import absolute_import
 import jdatetime
-import locale
 
-import core.module
-import core.widget
-import core.input
+import core.decorators
+from modules.core.datetime import Module as dtmodule
 
 
-class Module(core.module.Module):
+class Module(dtmodule):
+    @core.decorators.every(minutes=1)
     def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.full_text))
-
-        l = ("fa_IR", "UTF-8")
-        lcl = self.parameter("locale", ".".join(l))
-        try:
-            locale.setlocale(locale.LC_ALL, lcl.split("."))
-        except Exception as e:
-            locale.setlocale(locale.LC_ALL, ("fa_IR", "UTF-8"))
+        super().__init__(config, theme, dtlibrary=jdatetime)
 
     def default_format(self):
         return "%A %d %B"
 
-    def full_text(self, widget):
-        enc = locale.getpreferredencoding()
-        fmt = self.parameter("format", self.default_format())
-        retval = jdatetime.datetime.now().strftime(fmt)
-        if hasattr(retval, "decode"):
-            return retval.decode(enc)
-        return retval
+    def default_locale(self):
+        return ("fa_IR", "UTF-8")
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 879744e19cab5cc7357912ba670d200adfd58be6 Mon Sep 17 00:00:00 2001
From: ishaan <ishaanbhimwal@gmail.com>
Date: Mon, 14 Mar 2022 22:28:00 +0530
Subject: [PATCH 303/506] add aur-update

---
 .../modules/contrib/aur-update.py             | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/aur-update.py

diff --git a/bumblebee_status/modules/contrib/aur-update.py b/bumblebee_status/modules/contrib/aur-update.py
new file mode 100644
index 0000000..c175a63
--- /dev/null
+++ b/bumblebee_status/modules/contrib/aur-update.py
@@ -0,0 +1,65 @@
+"""Check updates for AUR.
+
+Requires the following packages:
+    * yay (used as default)
+
+Note - You can replace yay by changing the "yay -Qum"
+command for your preferred AUR helper. Few examples:
+
+paru -Qum
+pikaur -Qua
+rua upgrade --printonly
+trizen -Su --aur --quiet
+yay -Qum
+
+contributed by `ishaanbhimwal <https://github.com/ishaanbhimwal>`_ - many thanks!
+"""
+
+import logging
+
+import core.module
+import core.widget
+import core.decorators
+
+import util.cli
+
+
+class Module(core.module.Module):
+    @core.decorators.every(minutes=60)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.utilization))
+        self.background = True
+        self.__packages = 0
+        self.__error = False
+
+    @property
+    def __format(self):
+        return self.parameter("format", "Update AUR: {}")
+
+    def utilization(self, widget):
+        return self.__format.format(self.__packages)
+
+    def hidden(self):
+        return self.__packages == 0 and not self.__error
+
+    def update(self):
+        self.__error = False
+        code, result = util.cli.execute(
+            "yay -Qum", ignore_errors=True, return_exitcode=True
+        )
+
+        if code == 0:
+            self.__packages = len(result.strip().split("\n"))
+        elif code == 2:
+            self.__packages = 0
+        else:
+            self.__error = True
+            logging.error("yay -Qum exited with {}: {}".format(code, result))
+
+    def state(self, widget):
+        if self.__error:
+            return "warning"
+        return self.threshold_state(self.__packages, 1, 100)
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From f513582d44d33cc32e71dfb16a8968ca055216db Mon Sep 17 00:00:00 2001
From: ishaan <ishaanbhimwal@gmail.com>
Date: Tue, 15 Mar 2022 01:17:57 +0530
Subject: [PATCH 304/506] fix aur-update showing wrong update number

---
 .../modules/contrib/aur-update.py             | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/bumblebee_status/modules/contrib/aur-update.py b/bumblebee_status/modules/contrib/aur-update.py
index c175a63..14bee6b 100644
--- a/bumblebee_status/modules/contrib/aur-update.py
+++ b/bumblebee_status/modules/contrib/aur-update.py
@@ -1,16 +1,7 @@
 """Check updates for AUR.
 
 Requires the following packages:
-    * yay (used as default)
-
-Note - You can replace yay by changing the "yay -Qum"
-command for your preferred AUR helper. Few examples:
-
-paru -Qum
-pikaur -Qua
-rua upgrade --printonly
-trizen -Su --aur --quiet
-yay -Qum
+    * yay (https://github.com/Jguer/yay)
 
 contributed by `ishaanbhimwal <https://github.com/ishaanbhimwal>`_ - many thanks!
 """
@@ -49,12 +40,13 @@ class Module(core.module.Module):
         )
 
         if code == 0:
-            self.__packages = len(result.strip().split("\n"))
-        elif code == 2:
-            self.__packages = 0
+            if result == "":
+                self.__packages = 0
+            else:
+                self.__packages = len(result.strip().split("\n"))
         else:
             self.__error = True
-            logging.error("yay -Qum exited with {}: {}".format(code, result))
+            logging.error("aur-update exited with {}: {}".format(code, result))
 
     def state(self, widget):
         if self.__error:

From 1fc4139b7ce0376b80b3f3f71a6f8367609bbe01 Mon Sep 17 00:00:00 2001
From: ishaan <ishaanbhimwal@gmail.com>
Date: Tue, 15 Mar 2022 15:56:42 +0530
Subject: [PATCH 305/506] add documentation and screenshot for aur-update

---
 .../modules/contrib/aur-update.py             |   2 +-
 docs/modules.rst                              |  14 +
 screenshots/arch-update.png                   | Bin 0 -> 4952 bytes
 screenshots/aur-update.png                    | Bin 0 -> 4718 bytes
 themes/icons/awesome-fonts.json               | 759 +++++++++++++-----
 5 files changed, 595 insertions(+), 180 deletions(-)
 create mode 100644 screenshots/arch-update.png
 create mode 100644 screenshots/aur-update.png

diff --git a/bumblebee_status/modules/contrib/aur-update.py b/bumblebee_status/modules/contrib/aur-update.py
index 14bee6b..f1b85ea 100644
--- a/bumblebee_status/modules/contrib/aur-update.py
+++ b/bumblebee_status/modules/contrib/aur-update.py
@@ -1,6 +1,6 @@
 """Check updates for AUR.
 
-Requires the following packages:
+Requires the following executable:
     * yay (https://github.com/Jguer/yay)
 
 contributed by `ishaanbhimwal <https://github.com/ishaanbhimwal>`_ - many thanks!
diff --git a/docs/modules.rst b/docs/modules.rst
index 413f6cf..ad4a307 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -401,6 +401,20 @@ Requires the following executable:
 
 contributed by `lucassouto <https://github.com/lucassouto>`_ - many thanks!
 
+.. image:: ../screenshots/arch-update.png
+
+aur-update
+~~~~~~~~~~~
+
+Check updates for AUR.
+
+Requires the following executable:
+    * yay (https://github.com/Jguer/yay)
+
+contributed by `ishaanbhimwal <https://github.com/ishaanbhimwal>`_ - many thanks!
+
+.. image:: ../screenshots/aur-update.png
+
 battery
 ~~~~~~~
 
diff --git a/screenshots/arch-update.png b/screenshots/arch-update.png
new file mode 100644
index 0000000000000000000000000000000000000000..42b268ee2c5a5fd373576bb71cac277a54b345e7
GIT binary patch
literal 4952
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
WxUH2)B(}l;0000<MNUMnLSTZ+NrIpN

literal 0
HcmV?d00001

diff --git a/screenshots/aur-update.png b/screenshots/aur-update.png
new file mode 100644
index 0000000000000000000000000000000000000000..932041336c65e6c0f05b79c7617a28bcdc83727b
GIT binary patch
literal 4718
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%0DL>SW97vr)abRtKs_E|*`paL#Hq
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

literal 0
HcmV?d00001

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index f85dfd8..3f971d7 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -2,187 +2,489 @@
   "defaults": {
     "separator": "",
     "padding": " ",
-    "unknown": { "prefix": "" },
+    "unknown": {
+      "prefix": ""
+    },
     "separator-block-width": 0,
     "default-separators": false
   },
-  "date": { "prefix": "" },
-  "persian_date": { "prefix": "" },
-  "time": { "prefix": "" },
-  "datetime": { "prefix": "" },
-  "datetz": { "prefix": "" },
-  "timetz": { "prefix": "" },
-  "datetimetz": { "prefix": "" },
-  "memory": { "prefix": "" },
-  "cpu": { "prefix": "" },
-  "cpu2": {
-    "freq": { "prefix": "" },
-    "load": { "prefix": "" },
-    "loads": { "prefix": "" },
-    "temp": { "prefix": "" },
-    "fan": { "prefix": "" }
+  "date": {
+    "prefix": ""
+  },
+  "persian_date": {
+    "prefix": ""
+  },
+  "time": {
+    "prefix": ""
+  },
+  "datetime": {
+    "prefix": ""
+  },
+  "datetz": {
+    "prefix": ""
+  },
+  "timetz": {
+    "prefix": ""
+  },
+  "datetimetz": {
+    "prefix": ""
+  },
+  "memory": {
+    "prefix": ""
+  },
+  "cpu": {
+    "prefix": ""
+  },
+  "cpu2": {
+    "freq": {
+      "prefix": ""
+    },
+    "load": {
+      "prefix": ""
+    },
+    "loads": {
+      "prefix": ""
+    },
+    "temp": {
+      "prefix": ""
+    },
+    "fan": {
+      "prefix": ""
+    }
+  },
+  "disk": {
+    "prefix": ""
+  },
+  "smartstatus": {
+    "prefix": ""
+  },
+  "dnf": {
+    "prefix": ""
+  },
+  "apt": {
+    "prefix": ""
+  },
+  "pacman": {
+    "prefix": ""
+  },
+  "brightness": {
+    "prefix": ""
+  },
+  "load": {
+    "prefix": ""
+  },
+  "layout": {
+    "prefix": ""
+  },
+  "layout-xkb": {
+    "prefix": ""
+  },
+  "layout-xkbswitch": {
+    "prefix": ""
   },
-  "disk": { "prefix": "" },
-  "smartstatus": { "prefix": "" },
-  "dnf": { "prefix": "" },
-  "apt": { "prefix": "" },
-  "pacman": { "prefix": "" },
-  "brightness": { "prefix": "" },
-  "load": { "prefix": "" },
-  "layout": { "prefix": "" },
-  "layout-xkb": { "prefix": "" },
-  "layout-xkbswitch": { "prefix": "" },
   "notmuch_count": {
-    "empty": { "prefix": "\uf0e0" },
-    "items": { "prefix": "\uf0e0" }
+    "empty": {
+      "prefix": "\uf0e0"
+    },
+    "items": {
+      "prefix": "\uf0e0"
+    }
   },
   "portage_status": {
-    "idle": { "prefix": "" },
-    "active": { "prefix": "" }
+    "idle": {
+      "prefix": ""
+    },
+    "active": {
+      "prefix": ""
+    }
   },
   "todo": {
-    "empty": { "prefix": "" },
-    "items": { "prefix": "" },
-    "uptime": { "prefix": "" }
+    "empty": {
+      "prefix": ""
+    },
+    "items": {
+      "prefix": ""
+    },
+    "uptime": {
+      "prefix": ""
+    }
   },
   "zpool": {
-    "poolread": { "prefix": "→ " },
-    "poolwrite": { "prefix": "← " },
-    "ONLINE": { "prefix": "" },
-    "FAULTED": { "prefix": "!" },
-    "DEGRADED": { "prefix": "!" }
+    "poolread": {
+      "prefix": "→ "
+    },
+    "poolwrite": {
+      "prefix": "← "
+    },
+    "ONLINE": {
+      "prefix": ""
+    },
+    "FAULTED": {
+      "prefix": "!"
+    },
+    "DEGRADED": {
+      "prefix": "!"
+    }
   },
   "cmus": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
-    "stopped": { "prefix": "" },
-    "prev": { "prefix": "" },
-    "next": { "prefix": "" },
-    "shuffle-on": { "prefix": "" },
-    "shuffle-off": { "prefix": "" },
-    "repeat-on": { "prefix": "" },
-    "repeat-off": { "prefix": "" }
+    "playing": {
+      "prefix": ""
+    },
+    "paused": {
+      "prefix": ""
+    },
+    "stopped": {
+      "prefix": ""
+    },
+    "prev": {
+      "prefix": ""
+    },
+    "next": {
+      "prefix": ""
+    },
+    "shuffle-on": {
+      "prefix": ""
+    },
+    "shuffle-off": {
+      "prefix": ""
+    },
+    "repeat-on": {
+      "prefix": ""
+    },
+    "repeat-off": {
+      "prefix": ""
+    }
   },
   "gpmdp": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
-    "stopped": { "prefix": "" },
-    "prev": { "prefix": "" },
-    "next": { "prefix": "" }
+    "playing": {
+      "prefix": ""
+    },
+    "paused": {
+      "prefix": ""
+    },
+    "stopped": {
+      "prefix": ""
+    },
+    "prev": {
+      "prefix": ""
+    },
+    "next": {
+      "prefix": ""
+    }
   },
   "playerctl": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
-    "stopped": { "prefix": "" },
-    "prev": { "prefix": "" },
-    "next": { "prefix": "" }
+    "playing": {
+      "prefix": ""
+    },
+    "paused": {
+      "prefix": ""
+    },
+    "stopped": {
+      "prefix": ""
+    },
+    "prev": {
+      "prefix": ""
+    },
+    "next": {
+      "prefix": ""
+    }
   },
   "pasink": {
-    "muted": { "prefix": "" },
-    "unmuted": { "prefix": "" }
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
   },
   "amixer": {
-    "muted": { "prefix": "" },
-    "unmuted": { "prefix": "" }
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
   },
   "pasource": {
-    "muted": { "prefix": "" },
-    "unmuted": { "prefix": "" }
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
   },
   "kernel": {
     "prefix": "\uf17c"
   },
   "nic": {
-    "wireless-up": { "prefix": "" },
-    "wireless-down": { "prefix": "" },
-    "wired-up": { "prefix": "" },
-    "wired-down": { "prefix": "" },
-    "tunnel-up": { "prefix": "" },
-    "tunnel-down": { "prefix": "" }
+    "wireless-up": {
+      "prefix": ""
+    },
+    "wireless-down": {
+      "prefix": ""
+    },
+    "wired-up": {
+      "prefix": ""
+    },
+    "wired-down": {
+      "prefix": ""
+    },
+    "tunnel-up": {
+      "prefix": ""
+    },
+    "tunnel-down": {
+      "prefix": ""
+    }
   },
   "bluetooth": {
-    "ON": { "prefix": "" },
-    "OFF": { "prefix": "" },
-    "?": { "prefix": "" }
+    "ON": {
+      "prefix": ""
+    },
+    "OFF": {
+      "prefix": ""
+    },
+    "?": {
+      "prefix": ""
+    }
   },
   "bluetooth2": {
-    "ON": { "prefix": "" },
-    "warning": { "prefix": "" },
-    "critical": { "prefix": "" }
+    "ON": {
+      "prefix": ""
+    },
+    "warning": {
+      "prefix": ""
+    },
+    "critical": {
+      "prefix": ""
+    }
   },
   "battery-upower": {
-    "charged": { "prefix": "", "suffix": "" },
-    "AC": { "suffix": "" },
-    "charging": {
-      "prefix": ["", "", "", "", ""],
+    "charged": {
+      "prefix": "",
       "suffix": ""
     },
-    "discharging-10": { "prefix": "", "suffix": "" },
-    "discharging-25": { "prefix": "", "suffix": "" },
-    "discharging-50": { "prefix": "", "suffix": "" },
-    "discharging-80": { "prefix": "", "suffix": "" },
-    "discharging-100": { "prefix": "", "suffix": "" },
-    "unlimited": { "prefix": "", "suffix": "" },
-    "estimate": { "prefix": "" },
-    "unknown-10": { "prefix": "", "suffix": "" },
-    "unknown-25": { "prefix": "", "suffix": "" },
-    "unknown-50": { "prefix": "", "suffix": "" },
-    "unknown-80": { "prefix": "", "suffix": "" },
-    "unknown-100": { "prefix": "", "suffix": "" }
+    "AC": {
+      "suffix": ""
+    },
+    "charging": {
+      "prefix": [
+        "",
+        "",
+        "",
+        "",
+        ""
+      ],
+      "suffix": ""
+    },
+    "discharging-10": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-25": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-50": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-80": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-100": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unlimited": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "estimate": {
+      "prefix": ""
+    },
+    "unknown-10": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-25": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-50": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-80": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-100": {
+      "prefix": "",
+      "suffix": ""
+    }
   },
   "battery": {
-    "charged": { "prefix": "", "suffix": "" },
-    "AC": { "suffix": "" },
-    "charging": {
-      "prefix": ["", "", "", "", ""],
+    "charged": {
+      "prefix": "",
       "suffix": ""
     },
-    "discharging-10": { "prefix": "", "suffix": "" },
-    "discharging-25": { "prefix": "", "suffix": "" },
-    "discharging-50": { "prefix": "", "suffix": "" },
-    "discharging-80": { "prefix": "", "suffix": "" },
-    "discharging-100": { "prefix": "", "suffix": "" },
-    "unlimited": { "prefix": "", "suffix": "" },
-    "estimate": { "prefix": "" },
-    "unknown-10": { "prefix": "", "suffix": "" },
-    "unknown-25": { "prefix": "", "suffix": "" },
-    "unknown-50": { "prefix": "", "suffix": "" },
-    "unknown-80": { "prefix": "", "suffix": "" },
-    "unknown-100": { "prefix": "", "suffix": "" }
+    "AC": {
+      "suffix": ""
+    },
+    "charging": {
+      "prefix": [
+        "",
+        "",
+        "",
+        "",
+        ""
+      ],
+      "suffix": ""
+    },
+    "discharging-10": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-25": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-50": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-80": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-100": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unlimited": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "estimate": {
+      "prefix": ""
+    },
+    "unknown-10": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-25": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-50": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-80": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-100": {
+      "prefix": "",
+      "suffix": ""
+    }
   },
   "battery_all": {
-    "charged": { "prefix": "", "suffix": "" },
-    "AC": { "suffix": "" },
-    "charging": {
-      "prefix": ["", "", "", "", ""],
+    "charged": {
+      "prefix": "",
       "suffix": ""
     },
-    "discharging-10": { "prefix": "", "suffix": "" },
-    "discharging-25": { "prefix": "", "suffix": "" },
-    "discharging-50": { "prefix": "", "suffix": "" },
-    "discharging-80": { "prefix": "", "suffix": "" },
-    "discharging-100": { "prefix": "", "suffix": "" },
-    "unlimited": { "prefix": "", "suffix": "" },
-    "estimate": { "prefix": "" },
-    "unknown-10": { "prefix": "", "suffix": "" },
-    "unknown-25": { "prefix": "", "suffix": "" },
-    "unknown-50": { "prefix": "", "suffix": "" },
-    "unknown-80": { "prefix": "", "suffix": "" },
-    "unknown-100": { "prefix": "", "suffix": "" }
+    "AC": {
+      "suffix": ""
+    },
+    "charging": {
+      "prefix": [
+        "",
+        "",
+        "",
+        "",
+        ""
+      ],
+      "suffix": ""
+    },
+    "discharging-10": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-25": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-50": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-80": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "discharging-100": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unlimited": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "estimate": {
+      "prefix": ""
+    },
+    "unknown-10": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-25": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-50": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-80": {
+      "prefix": "",
+      "suffix": ""
+    },
+    "unknown-100": {
+      "prefix": "",
+      "suffix": ""
+    }
   },
   "caffeine": {
-    "activated": { "prefix": " " },
-    "deactivated": { "prefix": " " }
+    "activated": {
+      "prefix": " "
+    },
+    "deactivated": {
+      "prefix": " "
+    }
   },
   "xrandr": {
-    "on": { "prefix": " " },
-    "off": { "prefix": " " },
-    "refresh": { "prefix": "" }
+    "on": {
+      "prefix": " "
+    },
+    "off": {
+      "prefix": " "
+    },
+    "refresh": {
+      "prefix": ""
+    }
   },
   "redshift": {
-    "day": { "prefix": "" },
-    "night": { "prefix": "" },
-    "transition": { "prefix": "" }
+    "day": {
+      "prefix": ""
+    },
+    "night": {
+      "prefix": ""
+    },
+    "transition": {
+      "prefix": ""
+    }
   },
   "docker_ps": {
     "prefix": ""
@@ -191,32 +493,67 @@
     "prefix": ""
   },
   "sensors2": {
-    "temp": { "prefix": "" },
-    "fan": { "prefix": "" },
-    "cpu": { "prefix": "" }
+    "temp": {
+      "prefix": ""
+    },
+    "fan": {
+      "prefix": ""
+    },
+    "cpu": {
+      "prefix": ""
+    }
   },
   "traffic": {
-    "rx": { "prefix": "" },
-    "tx": { "prefix": "" }
+    "rx": {
+      "prefix": ""
+    },
+    "tx": {
+      "prefix": ""
+    }
   },
   "network_traffic": {
-    "rx": { "prefix": "" },
-    "tx": { "prefix": "" }
+    "rx": {
+      "prefix": ""
+    },
+    "tx": {
+      "prefix": ""
+    }
   },
   "mpd": {
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
-    "stopped": { "prefix": "" },
-    "prev": { "prefix": "" },
-    "next": { "prefix": "" },
-    "shuffle-on": { "prefix": "" },
-    "shuffle-off": { "prefix": "" },
-    "repeat-on": { "prefix": "" },
-    "repeat-off": { "prefix": "" }
+    "playing": {
+      "prefix": ""
+    },
+    "paused": {
+      "prefix": ""
+    },
+    "stopped": {
+      "prefix": ""
+    },
+    "prev": {
+      "prefix": ""
+    },
+    "next": {
+      "prefix": ""
+    },
+    "shuffle-on": {
+      "prefix": ""
+    },
+    "shuffle-off": {
+      "prefix": ""
+    },
+    "repeat-on": {
+      "prefix": ""
+    },
+    "repeat-off": {
+      "prefix": ""
+    }
   },
   "arch-update": {
     "prefix": " "
   },
+  "aur-update": {
+    "prefix": " "
+  },
   "github": {
     "prefix": "  "
   },
@@ -224,21 +561,41 @@
     "prefix": "  "
   },
   "spotify": {
-    "song": { "prefix": "" },
-    "playing": { "prefix": "" },
-    "paused": { "prefix": "" },
-    "prev": { "prefix": "" },
-    "next": { "prefix": "" }
+    "song": {
+      "prefix": ""
+    },
+    "playing": {
+      "prefix": ""
+    },
+    "paused": {
+      "prefix": ""
+    },
+    "prev": {
+      "prefix": ""
+    },
+    "next": {
+      "prefix": ""
+    }
   },
   "publicip": {
     "prefix": "  "
   },
   "weather": {
-    "clouds": { "prefix": "" },
-    "rain": { "prefix": "" },
-    "snow": { "prefix": "" },
-    "clear": { "prefix": "" },
-    "thunder": { "prefix": "" }
+    "clouds": {
+      "prefix": ""
+    },
+    "rain": {
+      "prefix": ""
+    },
+    "snow": {
+      "prefix": ""
+    },
+    "clear": {
+      "prefix": ""
+    },
+    "thunder": {
+      "prefix": ""
+    }
   },
   "taskwarrior": {
     "prefix": "  "
@@ -249,30 +606,56 @@
     }
   },
   "git": {
-    "main": { "prefix": "" },
-    "new": { "prefix": "" },
-    "modified": { "prefix": "" },
-    "deleted": { "prefix": "" }
+    "main": {
+      "prefix": ""
+    },
+    "new": {
+      "prefix": ""
+    },
+    "modified": {
+      "prefix": ""
+    },
+    "deleted": {
+      "prefix": ""
+    }
   },
   "dunst": {
-    "muted": { "prefix": "" },
-    "unmuted": { "prefix": "" }
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
   },
   "dunstctl": {
-    "muted": { "prefix": "" },
-    "unmuted": { "prefix": "" },
-    "unknown": { "prefix": "" }
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    },
+    "unknown": {
+      "prefix": ""
+    }
   },
   "rofication": {
-    "prefix":  ""
+    "prefix": ""
   },
   "twmn": {
-    "muted": { "prefix": "" },
-    "unmuted": { "prefix": "" }
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
   },
   "pihole": {
-    "enabled": { "prefix": "" },
-    "disabled": { "prefix": "" }
+    "enabled": {
+      "prefix": ""
+    },
+    "disabled": {
+      "prefix": ""
+    }
   },
   "vpn": {
     "prefix": ""
@@ -287,12 +670,22 @@
     "prefix": ""
   },
   "pomodoro": {
-      "off": { "prefix": "" },
-      "paused": { "prefix": "" },
-      "work": { "prefix": "" },
-      "break": { "prefix": "" }
+    "off": {
+      "prefix": ""
+    },
+    "paused": {
+      "prefix": ""
+    },
+    "work": {
+      "prefix": ""
+    },
+    "break": {
+      "prefix": ""
+    }
+  },
+  "hddtemp": {
+    "prefix": ""
   },
-  "hddtemp": { "prefix": "" },
   "octoprint": {
     "prefix": " "
   },
@@ -300,10 +693,18 @@
     "prefix": ""
   },
   "speedtest": {
-    "running": { "prefix": ["\uf251", "\uf252", "\uf253"] },
-	"not-running": { "prefix": "\uf144" }
+    "running": {
+      "prefix": [
+        "\uf251",
+        "\uf252",
+        "\uf253"
+      ]
+    },
+    "not-running": {
+      "prefix": "\uf144"
+    }
   },
   "thunderbird": {
     "prefix": ""
   }
-}
+}
\ No newline at end of file

From 9b61eee725c794ad4dd1e7319ae1b3450afb7c08 Mon Sep 17 00:00:00 2001
From: ishaan <ishaanbhimwal@gmail.com>
Date: Tue, 15 Mar 2022 17:32:45 +0530
Subject: [PATCH 306/506] add better screenshots

---
 screenshots/arch-update.png | Bin 4952 -> 2409 bytes
 screenshots/aur-update.png  | Bin 4718 -> 2214 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/screenshots/arch-update.png b/screenshots/arch-update.png
index 42b268ee2c5a5fd373576bb71cac277a54b345e7..45613fcb330904d27e1c209f2473362a4247faa2 100644
GIT binary patch
literal 2409
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
bf6IRWu5)CYO)!6P00000NkvXXu0mjfSYUuV

literal 4952
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
WxUH2)B(}l;0000<MNUMnLSTZ+NrIpN

diff --git a/screenshots/aur-update.png b/screenshots/aur-update.png
index 932041336c65e6c0f05b79c7617a28bcdc83727b..dfe50de2e4ac94216330ce77556bbb2855f49051 100644
GIT binary patch
literal 2214
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

literal 4718
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%0DL>SW97vr)abRtKs_E|*`paL#Hq
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


From 82fa347f2c734fee654459c4eb75c604a9060e48 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Thu, 24 Mar 2022 21:19:52 +0100
Subject: [PATCH 307/506] extended pulseaudio module

* added possibility to show currently selected default device in the
  statusbar (default: off)
* allows to override the left mouse button click with a different
  action (e.g open popup menu to change the current default device)
---
 bumblebee_status/modules/core/pulseaudio.py | 69 ++++++++++++++++++---
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 120470f..1213fe9 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -11,6 +11,20 @@ Parameters:
       Note: If the left and right channels have different volumes, the limit might not be reached exactly.
     * pulseaudio.showbars: 1 for showing volume bars, requires --markup=pango;
       0 for not showing volume bars (default)
+    * pulseaudio.showdevicename: If set to 'true' (default is 'false'), the currently selected default device is shown.
+      Per default, the sink/source name returned by "pactl list sinks short" is used as display name.
+
+      As this name is usually not particularly nice (e.g "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo"),
+      its possible to map the name to more a user friendly name.
+
+      e.g to map "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" to the name "Headset", add the following
+      bumblebee-status config entry: pulseaudio.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=Headset
+
+      Furthermore its possible to specify individual (unicode) icons for all sinks/sources. e.g in order to use the icon 🎧 for the
+      "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" sink, add the following bumblebee-status config entry:
+      pulseaudio.icon.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=🎧
+    * Per default a left mouse button click mutes/unmutes the device. In case you want to open a dropdown menu to change the current
+      default device add the following config entry to your bumblebee-status config: pulseaudio.left-click=select_default_device_popup
 
 Requires the following executable:
     * pulseaudio
@@ -20,6 +34,7 @@ Requires the following executable:
 
 import re
 import logging
+import functools
 
 import core.module
 import core.widget
@@ -28,11 +43,12 @@ import core.input
 import util.cli
 import util.graph
 import util.format
+import util.popup
 
 
 class Module(core.module.Module):
     def __init__(self, config, theme, channel):
-        super().__init__(config, theme, core.widget.Widget(self.volume))
+        super().__init__(config, theme, core.widget.Widget(self.display))
 
         if util.format.asbool(self.parameter("autostart", False)):
             util.cli.execute("pulseaudio --start", ignore_errors=True)
@@ -48,7 +64,11 @@ class Module(core.module.Module):
         self._mute = False
         self._failed = False
         self._channel = channel
+        self.__selected_default_device = None
         self._showbars = util.format.asbool(self.parameter("showbars", 0))
+        self.__show_device_name = util.format.asbool(
+            self.parameter("showdevicename", False)
+        )
 
         self._patterns = [
             {"expr": "Name:", "callback": (lambda line: False)},
@@ -138,19 +158,19 @@ class Module(core.module.Module):
         logging.error("no pulseaudio device found")
         return "n/a"
 
-    def volume(self, widget):
+    def display(self, widget):
         if self._failed == True:
             return "n/a"
+
+        vol = None
         if int(self._mono) > 0:
             vol = "{}%".format(self._mono)
             if self._showbars:
                 vol = "{} {}".format(vol, util.graph.hbar(float(self._mono)))
-            return vol
         elif self._left == self._right:
             vol = "{}%".format(self._left)
             if self._showbars:
                 vol = "{} {}".format(vol, util.graph.hbar(float(self._left)))
-            return vol
         else:
             vol = "{}%/{}%".format(self._left, self._right)
             if self._showbars:
@@ -159,19 +179,31 @@ class Module(core.module.Module):
                     util.graph.hbar(float(self._left)),
                     util.graph.hbar(float(self._right)),
                 )
-            return vol
+
+        output = vol
+        if self.__show_device_name:
+            friendly_name = self.parameter(
+                self.__selected_default_device, self.__selected_default_device
+            )
+            icon = self.parameter("icon." + self.__selected_default_device, "")
+            output = (
+                icon + " " + friendly_name + " | " + vol
+                if icon != ""
+                else friendly_name + " | " + vol
+            )
+        return output
 
     def update(self):
         try:
             self._failed = False
             channel = "sinks" if self._channel == "sink" else "sources"
-            device = self._default_device()
+            self.__selected_default_device = self._default_device()
 
             result = util.cli.execute("pactl list {}".format(channel))
             found = False
 
             for line in result.split("\n"):
-                if "Name: {}".format(device) in line:
+                if "Name: {}".format(self.__selected_default_device) in line:
                     found = True
                     continue
                 if found is False:
@@ -189,6 +221,29 @@ class Module(core.module.Module):
             else:
                 raise e
 
+    def __on_sink_selected(self, sink_name):
+        util.cli.execute("pactl set-default-{} {}".format(self._channel, sink_name))
+
+    def select_default_device_popup(self, widget):
+        channel = "sinks" if self._channel == "sink" else "sources"
+        result = util.cli.execute("pactl list {} short".format(channel))
+
+        menu = util.popup.menu()
+        lines = result.splitlines()
+        for line in lines:
+            info = line.split("\t")
+            try:
+                friendly_name = self.parameter(info[1], info[1])
+                menu.add_menuitem(
+                    friendly_name,
+                    callback=functools.partial(self.__on_sink_selected, info[1]),
+                )
+            except:
+                logging.exception("Couldn't parse {}".format(channel))
+                pass
+
+        menu.show(widget)
+
     def state(self, widget):
         if self._mute:
             return ["warning", "muted"]

From 4d3de3be0446877caa436bbc571b449fbb7fba71 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Fri, 25 Mar 2022 19:29:37 +0100
Subject: [PATCH 308/506] handle util.popup ImportError gracefully

* util.popup requires tkinter to be installed (in order to display
  popups). As most people will probably use the default configuration
  of the pulseaudio module (where the popup is disabled) and in order
  to avoid breaking existing setups, we catch import errors and just log
  them.
---
 bumblebee_status/modules/core/pulseaudio.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 1213fe9..906e1dd 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -43,8 +43,11 @@ import core.input
 import util.cli
 import util.graph
 import util.format
-import util.popup
 
+try:
+    import util.popup
+except ImportError as e:
+    logging.warning("Couldn't import util.popup: %s. Popups won't work!", e)
 
 class Module(core.module.Module):
     def __init__(self, config, theme, channel):

From 8501c406aff6a8f6a87f4c504e7a7f3bfab5a02e Mon Sep 17 00:00:00 2001
From: arivarton <accounts@arivarton.com>
Date: Fri, 8 Apr 2022 14:15:28 +0200
Subject: [PATCH 309/506] Google calendar module.

---
 bumblebee_status/modules/contrib/gcalendar.py | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/gcalendar.py

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
new file mode 100644
index 0000000..e1ce219
--- /dev/null
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -0,0 +1,113 @@
+"""Displays first upcoming event in google calendar.
+
+Events that are set as 'all-day' will not be shown.
+
+Requires credentials.json from a google api application where the google calendar api is installed.
+On first time run the browser will open and google will ask for permission for this app to access the google calendar and then save a .gcalendar_token.json file to the credentials_path directory which stores this permission.
+
+A refresh is done every 15 minutes.
+
+Parameters:
+    * gcalendar.time_format: Format time output. Defaults to "%H:%M".
+    * gcalendar.date_format: Format date output. Defaults to "%d.%m.%y".
+    * gcalendar.credentials_path: Path to credentials.json. Defaults to "~/".
+
+Requires these pip packages:
+   * google-api-python-client 
+   * google-auth-httplib2 
+   * google-auth-oauthlib
+"""
+
+# This import belongs to the google code
+from __future__ import print_function
+
+from dateutil.parser import parse as dtparse
+
+import core.module
+import core.widget
+import core.decorators
+
+import datetime
+import os.path
+
+from google.auth.transport.requests import Request
+from google.oauth2.credentials import Credentials
+from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.discovery import build
+from googleapiclient.errors import HttpError
+
+class Module(core.module.Module):
+    @core.decorators.every(minutes=15)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.first_event))
+        self.__time_format = self.parameter("time_format", "%H:%M")
+        self.__date_format = self.parameter("date_format", "%d.%m.%y")
+        self.__credentials_path = os.path.expanduser(self.parameter("credentials_path", "~/"))
+        self.__credentials = os.path.join(self.__credentials_path, 'credentials.json')
+        self.__token = os.path.join(self.__credentials_path, '.gcalendar_token.json')
+
+    def first_event(self, widget):
+        SCOPES = ['https://www.googleapis.com/auth/calendar.readonly']
+
+        """Shows basic usage of the Google Calendar API.
+        Prints the start and name of the next 10 events on the user's calendar.
+        """
+        creds = None
+        # The file token.json stores the user's access and refresh tokens, and is
+        # created automatically when the authorization flow completes for the first
+        # time.
+        if os.path.exists(self.__token):
+            creds = Credentials.from_authorized_user_file(self.__token, SCOPES)
+        # If there are no (valid) credentials available, let the user log in.
+        if not creds or not creds.valid:
+            if creds and creds.expired and creds.refresh_token:
+                creds.refresh(Request())
+            else:
+                flow = InstalledAppFlow.from_client_secrets_file(
+                    self.__credentials, SCOPES)
+                creds = flow.run_local_server(port=0)
+            # Save the credentials for the next run
+            with open(self.__token, 'w') as token:
+                token.write(creds.to_json())
+
+        try:
+            service = build('calendar', 'v3', credentials=creds)
+
+            # Call the Calendar API
+            now = datetime.datetime.utcnow().isoformat() + 'Z'  # 'Z' indicates UTC time
+            end = (datetime.datetime.utcnow() + datetime.timedelta(days=7)).isoformat() + 'Z'  # 'Z' indicates UTC time
+            # Get all calendars
+            calendar_list = service.calendarList().list().execute()
+            event_list = []
+            for calendar_list_entry in calendar_list['items']:
+                calendar_id = calendar_list_entry['id']
+                events_result = service.events().list(calendarId=calendar_id, timeMin=now,
+                                                      timeMax=end,
+                                                      singleEvents=True,
+                                                      orderBy='startTime').execute()
+                events = events_result.get('items', [])
+
+                if not events:
+                    return 'No upcoming events found.'
+
+                for event in events:
+                    start = dtparse(event['start'].get('dateTime', event['start'].get('date')))
+                    # Only add to list if not an whole day event
+                    if start.tzinfo:
+                        event_list.append({'date': start,
+                            'summary': event['summary'],
+                            'type': event['eventType']})
+            sorted_list = sorted(event_list, key=lambda t: t['date'])
+
+            for gevent in sorted_list:
+                if gevent['date'] >= datetime.datetime.now(datetime.timezone.utc):
+                    if gevent['date'].date() == datetime.datetime.utcnow().date():
+                        return str('%s %s' % (gevent['date'].astimezone().strftime(f'{self.__time_format}'), gevent['summary']))
+                    else:
+                        return str('%s %s' % (gevent['date'].astimezone().strftime(f'{self.__date_format} {__time_format}'), gevent['summary']))
+            return 'No upcoming events found.'
+
+        except:
+            return None
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From a48ddbb2c80a42e79ecd78c91519239c48c84645 Mon Sep 17 00:00:00 2001
From: arivarton <accounts@arivarton.com>
Date: Fri, 8 Apr 2022 14:23:22 +0200
Subject: [PATCH 310/506] Ran black -t py34

---
 bumblebee_status/modules/contrib/gcalendar.py | 90 +++++++++++++------
 1 file changed, 63 insertions(+), 27 deletions(-)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index e1ce219..418f059 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -36,18 +36,21 @@ from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 
+
 class Module(core.module.Module):
     @core.decorators.every(minutes=15)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.first_event))
         self.__time_format = self.parameter("time_format", "%H:%M")
         self.__date_format = self.parameter("date_format", "%d.%m.%y")
-        self.__credentials_path = os.path.expanduser(self.parameter("credentials_path", "~/"))
-        self.__credentials = os.path.join(self.__credentials_path, 'credentials.json')
-        self.__token = os.path.join(self.__credentials_path, '.gcalendar_token.json')
+        self.__credentials_path = os.path.expanduser(
+            self.parameter("credentials_path", "~/")
+        )
+        self.__credentials = os.path.join(self.__credentials_path, "credentials.json")
+        self.__token = os.path.join(self.__credentials_path, ".gcalendar_token.json")
 
     def first_event(self, widget):
-        SCOPES = ['https://www.googleapis.com/auth/calendar.readonly']
+        SCOPES = ["https://www.googleapis.com/auth/calendar.readonly"]
 
         """Shows basic usage of the Google Calendar API.
         Prints the start and name of the next 10 events on the user's calendar.
@@ -64,50 +67,83 @@ class Module(core.module.Module):
                 creds.refresh(Request())
             else:
                 flow = InstalledAppFlow.from_client_secrets_file(
-                    self.__credentials, SCOPES)
+                    self.__credentials, SCOPES
+                )
                 creds = flow.run_local_server(port=0)
             # Save the credentials for the next run
-            with open(self.__token, 'w') as token:
+            with open(self.__token, "w") as token:
                 token.write(creds.to_json())
 
         try:
-            service = build('calendar', 'v3', credentials=creds)
+            service = build("calendar", "v3", credentials=creds)
 
             # Call the Calendar API
-            now = datetime.datetime.utcnow().isoformat() + 'Z'  # 'Z' indicates UTC time
-            end = (datetime.datetime.utcnow() + datetime.timedelta(days=7)).isoformat() + 'Z'  # 'Z' indicates UTC time
+            now = datetime.datetime.utcnow().isoformat() + "Z"  # 'Z' indicates UTC time
+            end = (
+                datetime.datetime.utcnow() + datetime.timedelta(days=7)
+            ).isoformat() + "Z"  # 'Z' indicates UTC time
             # Get all calendars
             calendar_list = service.calendarList().list().execute()
             event_list = []
-            for calendar_list_entry in calendar_list['items']:
-                calendar_id = calendar_list_entry['id']
-                events_result = service.events().list(calendarId=calendar_id, timeMin=now,
-                                                      timeMax=end,
-                                                      singleEvents=True,
-                                                      orderBy='startTime').execute()
-                events = events_result.get('items', [])
+            for calendar_list_entry in calendar_list["items"]:
+                calendar_id = calendar_list_entry["id"]
+                events_result = (
+                    service.events()
+                    .list(
+                        calendarId=calendar_id,
+                        timeMin=now,
+                        timeMax=end,
+                        singleEvents=True,
+                        orderBy="startTime",
+                    )
+                    .execute()
+                )
+                events = events_result.get("items", [])
 
                 if not events:
-                    return 'No upcoming events found.'
+                    return "No upcoming events found."
 
                 for event in events:
-                    start = dtparse(event['start'].get('dateTime', event['start'].get('date')))
+                    start = dtparse(
+                        event["start"].get("dateTime", event["start"].get("date"))
+                    )
                     # Only add to list if not an whole day event
                     if start.tzinfo:
-                        event_list.append({'date': start,
-                            'summary': event['summary'],
-                            'type': event['eventType']})
-            sorted_list = sorted(event_list, key=lambda t: t['date'])
+                        event_list.append(
+                            {
+                                "date": start,
+                                "summary": event["summary"],
+                                "type": event["eventType"],
+                            }
+                        )
+            sorted_list = sorted(event_list, key=lambda t: t["date"])
 
             for gevent in sorted_list:
-                if gevent['date'] >= datetime.datetime.now(datetime.timezone.utc):
-                    if gevent['date'].date() == datetime.datetime.utcnow().date():
-                        return str('%s %s' % (gevent['date'].astimezone().strftime(f'{self.__time_format}'), gevent['summary']))
+                if gevent["date"] >= datetime.datetime.now(datetime.timezone.utc):
+                    if gevent["date"].date() == datetime.datetime.utcnow().date():
+                        return str(
+                            "%s %s"
+                            % (
+                                gevent["date"]
+                                .astimezone()
+                                .strftime(f"{self.__time_format}"),
+                                gevent["summary"],
+                            )
+                        )
                     else:
-                        return str('%s %s' % (gevent['date'].astimezone().strftime(f'{self.__date_format} {__time_format}'), gevent['summary']))
-            return 'No upcoming events found.'
+                        return str(
+                            "%s %s"
+                            % (
+                                gevent["date"]
+                                .astimezone()
+                                .strftime(f"{self.__date_format} {__time_format}"),
+                                gevent["summary"],
+                            )
+                        )
+            return "No upcoming events found."
 
         except:
             return None
 
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 83d910a7ef097a7cdb8cac2cc19c50188b42769b Mon Sep 17 00:00:00 2001
From: arivarton <accounts@arivarton.com>
Date: Fri, 8 Apr 2022 17:09:28 +0200
Subject: [PATCH 311/506] Changed __time_format to self.__time_format.

---
 bumblebee_status/modules/contrib/gcalendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index 418f059..e438bdd 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -136,7 +136,7 @@ class Module(core.module.Module):
                             % (
                                 gevent["date"]
                                 .astimezone()
-                                .strftime(f"{self.__date_format} {__time_format}"),
+                                .strftime(f"{self.__date_format} {self.__time_format}"),
                                 gevent["summary"],
                             )
                         )

From 771e7482d719994e72a0381d449ecc54cf342342 Mon Sep 17 00:00:00 2001
From: Samuel Tebbs <samuel.tebbs@gmail.com>
Date: Sat, 23 Apr 2022 14:44:35 +0100
Subject: [PATCH 312/506] [modules/playerctl] add 'hide' parameter

---
 bumblebee_status/modules/contrib/playerctl.py | 15 ++++++++++++---
 docs/modules.rst                              |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index 56af426..7fef412 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -12,6 +12,7 @@ Parameters:
       Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
     * playerctl.args:     The arguments added to playerctl.
       You can check 'playerctl --help' or `its README <https://github.com/altdesktop/playerctl#using-the-cli>`_. For example, it could be '-p vlc,%any'.
+    * playerctl.hide:   Hide the widgets when no players are found. Defaults to "false".
 
 Parameters are inspired by the `spotify` module, many thanks to its developers!
 
@@ -32,6 +33,8 @@ class Module(core.module.Module):
 
         self.background = True
 
+        self.__hide = util.format.asbool(self.parameter("hide", "false"));
+
         self.__layout = util.format.aslist(
             self.parameter(
                 "layout", "playerctl.prev, playerctl.song, playerctl.pause, playerctl.next"
@@ -83,14 +86,20 @@ class Module(core.module.Module):
             if isinstance(callback_options, dict):
                 core.input.register(widget, **callback_options)
 
-    def update(self):
+    def hidden(self):
+        return self.__hide and self.status() == None
+
+    def status(self):
         try:
             playback_status = str(util.cli.execute(self.__cmd + "status 2>&1 || true", shell = True)).strip()
             if playback_status == "No players found":
-                playback_status = None
+                return None
+            return playback_status
         except Exception as e:
             logging.exception(e)
-            playback_status = None
+            return None
+
+    def update(self):
         for widget in self.widgets():
             if playback_status:
                 if widget.name == "playerctl.pause":
diff --git a/docs/modules.rst b/docs/modules.rst
index ad4a307..24046a0 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1095,6 +1095,7 @@ Parameters:
       Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
     * playerctl.args:     The arguments added to playerctl.
       You can check 'playerctl --help' or `its readme <https://github.com/altdesktop/playerctl#using-the-cli>`_. For example, it could be '-p vlc,%any'.
+    * playerctl.hide:   Hide the widgets when no players are found. Defaults to "false".
 
 Parameters are inspired by the `spotify` module, many thanks to its developers!
 

From d20dacb2dc9bca6f1d2fb8a79665f2175af7d7f5 Mon Sep 17 00:00:00 2001
From: Samuel Tebbs <samuel.tebbs@gmail.com>
Date: Sun, 24 Apr 2022 16:09:54 +0100
Subject: [PATCH 313/506] Fix missing playback_status

---
 bumblebee_status/modules/contrib/playerctl.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
index 7fef412..bd8876c 100755
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -100,6 +100,7 @@ class Module(core.module.Module):
             return None
 
     def update(self):
+        playback_status = self.status()
         for widget in self.widgets():
             if playback_status:
                 if widget.name == "playerctl.pause":

From 3da0f08fcb370d298cf0313540d76344c308ff56 Mon Sep 17 00:00:00 2001
From: alexcoder04 <alexcoder04@protonmail.com>
Date: Sun, 1 May 2022 12:15:29 +0200
Subject: [PATCH 314/506] arch-update: sleep 1 sec before checking

When waking up from suspend, there is sometimes a delay connecting to
the network, so arch-update gives an error
---
 bumblebee_status/modules/contrib/arch-update.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee_status/modules/contrib/arch-update.py b/bumblebee_status/modules/contrib/arch-update.py
index ed9ae58..d8da8fb 100644
--- a/bumblebee_status/modules/contrib/arch-update.py
+++ b/bumblebee_status/modules/contrib/arch-update.py
@@ -7,6 +7,7 @@ contributed by `lucassouto <https://github.com/lucassouto>`_ - many thanks!
 """
 
 import logging
+from time import sleep
 
 import core.module
 import core.widget
@@ -35,6 +36,7 @@ class Module(core.module.Module):
 
     def update(self):
         self.__error = False
+        sleep(1)
         code, result = util.cli.execute(
             "checkupdates", ignore_errors=True, return_exitcode=True
         )

From a6d2ccc666ce84acad96dd8116cbb84ea1e2c1ca Mon Sep 17 00:00:00 2001
From: Timoses <timoses@tutanota.com>
Date: Wed, 11 May 2022 19:58:34 +0200
Subject: [PATCH 315/506] Fix logout item using hardcoded command

---
 bumblebee_status/modules/contrib/system.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/system.py b/bumblebee_status/modules/contrib/system.py
index cc46ef8..00e80e0 100644
--- a/bumblebee_status/modules/contrib/system.py
+++ b/bumblebee_status/modules/contrib/system.py
@@ -96,7 +96,7 @@ class Module(core.module.Module):
         menu.add_menuitem(
             "log out",
             callback=functools.partial(
-                self.__on_command, "Log out", "Log out?", "i3exit logout"
+                self.__on_command, "Log out", "Log out?", logout_cmd
             ),
         )
         # don't ask for these

From f01179290b7a62548c3439c103616e2c5c744253 Mon Sep 17 00:00:00 2001
From: Sam Tebbs <samuel.tebbs@gmail.com>
Date: Fri, 13 May 2022 10:21:31 +0100
Subject: [PATCH 316/506] Hide progress module if it's inactive

---
 bumblebee_status/modules/contrib/progress.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bumblebee_status/modules/contrib/progress.py b/bumblebee_status/modules/contrib/progress.py
index 7e148b3..9148acb 100644
--- a/bumblebee_status/modules/contrib/progress.py
+++ b/bumblebee_status/modules/contrib/progress.py
@@ -29,6 +29,9 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.get_progress_text))
         self.__active = False
 
+    def hidden(self):
+        return not self.__active
+
     def get_progress_text(self, widget):
         if self.update_progress_info(widget):
             width = util.format.asint(self.parameter("barwidth", 8))

From 91b1b5e037b761453d55de0383e90efbe6e1505f Mon Sep 17 00:00:00 2001
From: Sam Tebbs <samuel.tebbs@gmail.com>
Date: Fri, 20 May 2022 09:21:20 +0100
Subject: [PATCH 317/506] Add popup command parameter to the system module

---
 bumblebee_status/modules/contrib/system.py | 5 +++++
 docs/modules.rst                           | 1 +
 2 files changed, 6 insertions(+)

diff --git a/bumblebee_status/modules/contrib/system.py b/bumblebee_status/modules/contrib/system.py
index 00e80e0..79e8846 100644
--- a/bumblebee_status/modules/contrib/system.py
+++ b/bumblebee_status/modules/contrib/system.py
@@ -72,6 +72,11 @@ class Module(core.module.Module):
             util.cli.execute(command)
 
     def popup(self, widget):
+        popupcmd = self.parameter("popupcmd", "");
+        if (popupcmd != ""):
+            util.cli.execute(popupcmd)
+            return
+
         menu = util.popup.menu()
         reboot_cmd = self.parameter("reboot", "reboot")
         shutdown_cmd = self.parameter("shutdown", "shutdown -h now")
diff --git a/docs/modules.rst b/docs/modules.rst
index 24046a0..69e56fd 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1413,6 +1413,7 @@ Parameters:
         * system.lock: specify a command for locking the screen (defaults to 'i3exit lock')
         * system.suspend: specify a command for suspending (defaults to 'i3exit suspend')
         * system.hibernate: specify a command for hibernating (defaults to 'i3exit hibernate')
+        * system.popupcmd: specify a command to run instead of opening the default menu
         
 Requirements:
         tkinter (python3-tk package on debian based systems either you can install it as python package)

From 5c166beebfd4b4a7fb8053e2ddb142801368d9cc Mon Sep 17 00:00:00 2001
From: FraSharp <s23265@iisve.it>
Date: Thu, 26 May 2022 13:00:40 +0200
Subject: [PATCH 318/506] [modules]: introduce pamixer module

Signed-off-by: FraSharp <s23265@iisve.it>
---
 bumblebee_status/modules/contrib/pamixer.py | 88 +++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/pamixer.py

diff --git a/bumblebee_status/modules/contrib/pamixer.py b/bumblebee_status/modules/contrib/pamixer.py
new file mode 100644
index 0000000..2396949
--- /dev/null
+++ b/bumblebee_status/modules/contrib/pamixer.py
@@ -0,0 +1,88 @@
+"""get volume level or control it
+
+Requires the following executable:
+    * pamixer
+
+Parameters:
+    * pamixer.percent_change: How much to change volume by when scrolling on the module (default is 4%)
+
+heavily based on amixer module
+"""
+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 = "volume 0%"
+        self.__muted = True
+        self.__change = util.format.asint(
+            self.parameter("percent_change", "4%").strip("%"), 0, 200
+        )
+
+        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("--set-level 0")
+
+    def increase_volume(self, event):
+        self.set_parameter("--increase {}".format(self.__change))
+
+    def decrease_volume(self, event):
+        self.set_parameter("--decrease {}".format(self.__change))
+
+    def set_parameter(self, parameter):
+        util.cli.execute("pamixer {}".format(parameter))
+
+    def volume(self, widget):
+        if self.__level == "volume 0%":
+            self.__muted = True
+            return self.__level
+        m = re.search(r"([\d]+)\%", self.__level)
+        if m:
+            if m.group(1) != "0%" in self.__level:
+                self.__muted = False
+            return "volume {}%".format(m.group(1))
+        else:
+            return "volume 0%"
+
+    def update(self):
+        try:
+            volume = util.cli.execute("pamixer --get-volume-human".format())
+            self.__level = volume
+            self.__muted = False
+        except Exception as e:
+            self.__level = "volume 0%"
+
+    def state(self, widget):
+        if self.__muted:
+            return ["warning", "muted"]
+        return ["unmuted"]
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From c001f031a15170069a8fc370d27d50f2012c4397 Mon Sep 17 00:00:00 2001
From: benthetechguy <kwestover.kw@gmail.com>
Date: Tue, 7 Jun 2022 19:14:51 -0400
Subject: [PATCH 319/506] Change nonexistent image to link

---
 docs/FAQ.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/FAQ.rst b/docs/FAQ.rst
index eeaff82..8c927cf 100644
--- a/docs/FAQ.rst
+++ b/docs/FAQ.rst
@@ -29,9 +29,9 @@ didn’t have background color support for the status bar.
 Some of the icons don’t render correctly
 ----------------------------------------
 
-Please check that you have |Font Awesome| installed (version 4).
+Please check that you have `Font Awesome`_ installed (version 4).
 
-.. note:: The |Font Awesome| is required for all themes that
+.. note:: The `Font Awesome`_ is required for all themes that
     contain icons (because that is the font that includes these icons).
     Please refer to your distribution’s package management on how to install
     them, or get them from their website directly. Also, please note that
@@ -52,4 +52,4 @@ Please check that you have |Font Awesome| installed (version 4).
    # Other
    # see https://github.com/gabrielelana/awesome-terminal-fonts
 
-.. |Font Awesome| image:: https://fontawesome.com/
+.. _Font Awesome: https://fontawesome.com/

From 4afb8d863674509df5a42020b5e782c3f2e27017 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 8 Jun 2022 08:32:35 +0200
Subject: [PATCH 320/506] [doc] add man pages

Many thanks to https://github.com/benthetechguy, who wrote man pages for
bumblebee-status and bumblebee-ctl

fixes #882
---
 man/bumblebee-ctl.1    | 29 +++++++++++++++++++++
 man/bumblebee-status.1 | 58 ++++++++++++++++++++++++++++++++++++++++++
 setup.py               |  1 +
 3 files changed, 88 insertions(+)
 create mode 100644 man/bumblebee-ctl.1
 create mode 100644 man/bumblebee-status.1

diff --git a/man/bumblebee-ctl.1 b/man/bumblebee-ctl.1
new file mode 100644
index 0000000..33c50aa
--- /dev/null
+++ b/man/bumblebee-ctl.1
@@ -0,0 +1,29 @@
+.TH BUMBLEBEE-CTL "1" "June 2022" "bumblebee-status"
+.SH NAME
+bumblebee-ctl \- Send commands to bumblebee-status
+.SH SYNOPSIS
+.B bumblebee-ctl
+[\fB\-h\fR] [\fB\-b\fR \fIbutton\fR] [\fB\-i\fR \fIID\fR] \fB-m\fR \fImodule\fR
+.SH DESCRIPTION
+.B bumblebee-ctl
+can be used to send commands to bumblebee-status.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-b\fR, \fB\-\-button\fR <button>
+Button to emulate. Buttons can be any of left\-mouse, right\-mouse,
+middle\-mouse, wheel\-up, wheel\-down, or update.
+.TP
+\fB\-i\fR, \fB\-\-id\fR <ID>
+ID of widget to trigger
+.TP
+\fB\-m\fR, \fB\-\-module\fR <module>
+name of module to trigger
+.SH COPYRIGHT
+Copyright \(co 2016\-2022 tobi\-wan\-kenobi.
+.PP
+.br
+This is free software; see the source for copying conditions.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/man/bumblebee-status.1 b/man/bumblebee-status.1
new file mode 100644
index 0000000..9a3f521
--- /dev/null
+++ b/man/bumblebee-status.1
@@ -0,0 +1,58 @@
+.TH BUMBLEBEE-STATUS "1" "June 2022" "bumblebee-status"
+.SH NAME
+bumblebee-status \- status line generator for the i3 window manager
+.SH SYNOPSIS
+.B bumblebee-status
+[\fIoptions\fR]
+.SH DESCRIPTION
+.B bumblebee-status
+is a modular, themeable status line generator for the i3 window manager.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-c\fR, \fB\-\-config\-file\fR <config\-file>
+specify a configuration file to use
+.TP
+\fB\-m\fR, \fB\-\-modules\fR MODULES <modules>
+Specify a space\-separated list of modules to load. The order of the list
+determines their order in the i3bar (from left to right). Use
+<module>:<alias> to provide an alias in case you want to load the same
+module multiple times, but specify different parameters.
+.TP
+\fB\-p\fR, \fB\-\-parameters\fR PARAMETERS <parameters>
+provide configuration parameters in the form of <module>.<key>=<value>
+.TP
+\fB\-t\fR, \fB\-\-theme\fR <theme>
+specify the theme to use for drawing modules
+.TP
+\fB\-i\fR, \fB\-\-iconset\fR <iconset>
+specify the name of an iconset to use (overrides theme default)
+.TP
+\fB\-a\fR, \fB\-\-autohide\fR AUTOHIDE <modules>
+specify a list of modules to hide when not in warning/error state
+.TP
+\fB\-e\fR, \fB\-\-errorhide\fR ERRORHIDE <modules>
+specify a list of modules that are hidden when in state error
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+add debug fields to i3 output
+.TP
+\fB\-f\fR, \fB\-\-logfile\fR <logfile>
+destination for the debug log file, if \fB\-d\fR or \fB\-\-debug\fR
+is specified; defaults to stderr
+.TP
+\fB\-r\fR, \fB\-\-right\-to\-left\fR
+draw widgets from right to left, rather than left to right
+(which is the default)
+.TP
+\fB\-l\fR, \fB\-\-list\fR <\fImodules\fR,\fIthemes\fR,\fImodules\-rst\fR>
+display a list of available themes or available modules,
+along with their parameters
+.SH COPYRIGHT
+Copyright \(co 2016\-2022 tobi\-wan\-kenobi.
+.PP
+.br
+This is free software; see the source for copying conditions.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/setup.py b/setup.py
index 1f6c203..a63be64 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,7 @@ setup(
         ("share/bumblebee-status/themes", glob.glob("themes/*.json")),
         ("share/bumblebee-status/themes/icons", glob.glob("themes/icons/*.json")),
         ("share/bumblebee-status/utility", glob.glob("bin/*")),
+        ("usr/share/man/man1", glob.glob("man/*.1")),
     ],
     packages=find_packages(exclude=["tests", "tests.*"])
 )

From 7b63efee3690947c215e473cc929ef02e14334c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Wed, 8 Jun 2022 11:13:51 -0400
Subject: [PATCH 321/506] add srcery theme (closes: #881)

---
 themes/srcery.json | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 themes/srcery.json

diff --git a/themes/srcery.json b/themes/srcery.json
new file mode 100644
index 0000000..8211c25
--- /dev/null
+++ b/themes/srcery.json
@@ -0,0 +1,44 @@
+{
+    "icons": [ ],
+    "colors": [
+        {
+            "white": "#D0BFA1",
+            "bright_white": "#FCE8C3",
+            "black": "#1C1B19",
+            "black_l": "#918175",
+            "red": "#EF2F27",
+            "green_d": "#519F50",
+            "green_l": "#98BC37",
+            "yellow_d": "#FBB829",
+            "yellow_l": "#FED06E",
+            "blue_d": "#2C78BF",
+            "blue_l": "#68A8E4",
+            "magenta_d": "#E02C6D",
+            "magenta_l": "#FF5C8F",
+            "cyan_d": "#0AAEB3",
+            "cyan_l": "#53FDE9",
+            "orange": "#D75F00",
+            "bright_orange": "#FF8700",
+            "xgray1": "#262626",
+            "xgray2": "#303030",
+            "xgray3": "#3A3A3A",
+            "xgray4": "#444444",
+            "xgray5": "#4E4E4E",
+            "hard_black": "#121212"
+        }
+    ],
+    "defaults": {
+        "separator-block-width": 0,
+        "urgent": true,
+        "fg": "white",
+        "bg": "black",
+        "warning": {
+            "bg": "orange",
+            "fg": "hard_black"
+        },
+        "critical": {
+            "bg": "red",
+            "fg": "hard_black"
+        }
+    }
+}

From 9072249d5ce24b8225c3d85e55739ecc22b7fa2d Mon Sep 17 00:00:00 2001
From: anarcat <anarcat@users.noreply.github.com>
Date: Wed, 8 Jun 2022 11:51:56 -0400
Subject: [PATCH 322/506] expand FAQ about fonts

This adds a little more information about the font stuff based on the things I learned in https://github.com/tobi-wan-kenobi/bumblebee-status/issues/881#issuecomment-1150034722
---
 docs/FAQ.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/FAQ.rst b/docs/FAQ.rst
index 8c927cf..0aade9b 100644
--- a/docs/FAQ.rst
+++ b/docs/FAQ.rst
@@ -52,4 +52,15 @@ Please check that you have `Font Awesome`_ installed (version 4).
    # Other
    # see https://github.com/gabrielelana/awesome-terminal-fonts
 
+You might also need to add it to the `font` directive in your i3 configuration, for example:
+
+.. code-block::
+
+    bar {
+        font pango:FontAwesome, Fira mono 10
+        status_command bumblebee-status -m title pasink pasource cpu memory battery datetime --iconset awesome-fonts
+    }
+
+If you are unsure about how the font is named, you can use the ``pango-list`` command line tool to look at the fonts installed on your computer. Also note how you can specify multiple fonts, separated by commas, in the above example.
+
 .. _Font Awesome: https://fontawesome.com/

From 2d6041be5d11cb9e1d85d89cb3c98384cb37b3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Wed, 15 Jun 2022 11:45:03 -0400
Subject: [PATCH 323/506] reduce spacing in awesome fonts iconset

This replaces the previous normal spacing character (which is the
usual ASCII 0x20 SPACE) by a *narrower* spacer (which is unicode
U+2009 THIN SPACE).

I found that space thanks to

https://en.wikipedia.org/wiki/Space_(punctuation)#Types_of_spaces

... and specifically:

https://en.wikipedia.org/wiki/Thin_space

... and this actually works, amazingly. Probably because it is pretty
standard as it's part of the SI specification (thousands separator),
Tex (`\thinspace` or `\,`), and HTML (`&thinsp;`)

Closes: #888
---
 themes/icons/awesome-fonts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 3f971d7..a3de1d2 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -1,7 +1,7 @@
 {
   "defaults": {
     "separator": "",
-    "padding": " ",
+    "padding": " ",
     "unknown": {
       "prefix": ""
     },

From 16c4ce2ee6d5de7a68363172b13813a5fadb16d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Mon, 20 Jun 2022 11:29:14 -0400
Subject: [PATCH 324/506] handle missing battery case

I run the same bumblebee-status configuration on my laptop and my
workstation. On my laptop, the upower module works fine: it says "ac"
when plugged in, charging, all that stuff is great.

But on my workstation, it's completely broken: it thinks there's a
battery (which is a mistake: there is no battery at all, apart maybe
from the CMOS battery, but that's not covered by upower), and it
thinks it's discharged, which makes a very noisy warning in the bar.

Now maybe there's something wrong with dbus, Debian, the kernel,
Linux, or some thing else in the stack. All I know is that
`self.power.get_display_device()` returns something like a valid
dbus object here and from there it confuses the heck out of the
module.

So this just adds a function to check if the actual device we're
talking about is actually present, and bails earlier otherwise.

Before: battery logo and "0% 00:00m!", all marked as critical ("red")

After: "ac" with the plugged in logo, not marked critical ("black")
---
 bumblebee_status/modules/contrib/battery-upower.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bumblebee_status/modules/contrib/battery-upower.py b/bumblebee_status/modules/contrib/battery-upower.py
index 9723058..9167ad7 100644
--- a/bumblebee_status/modules/contrib/battery-upower.py
+++ b/bumblebee_status/modules/contrib/battery-upower.py
@@ -207,6 +207,12 @@ class UPowerManager:
         data = upower_interface.GetTotal()
         return data
 
+    def is_battery_present(self, battery):
+        battery_proxy = self.bus.get_object(self.UPOWER_NAME, battery)
+        battery_proxy_interface = dbus.Interface(battery_proxy, self.DBUS_PROPERTIES)
+
+        return bool(battery_proxy_interface.Get(self.UPOWER_NAME + ".Device", "IsPresent"))
+
     def is_loading(self, battery):
         battery_proxy = self.bus.get_object(self.UPOWER_NAME, battery)
         battery_proxy_interface = dbus.Interface(battery_proxy, self.DBUS_PROPERTIES)
@@ -259,6 +265,11 @@ class Module(core.module.Module):
         widget.set("capacity", -1)
         widget.set("ac", False)
         output = "n/a"
+        if not self.power.is_battery_present(self.device):
+            widget.set("ac", True)
+            widget.set("capacity", 100)
+            output = "ac"
+            return output
         try:
             capacity = int(self.power.get_device_percentage(self.device))
             capacity = capacity if capacity < 100 else 100

From eabf167c1f430364289ac315ec5d468870d9d9dd Mon Sep 17 00:00:00 2001
From: Sam Tebbs <samuel.tebbs@gmail.com>
Date: Wed, 22 Jun 2022 09:12:10 +0100
Subject: [PATCH 325/506] Hide battery module if there are no batteries

---
 bumblebee_status/modules/contrib/battery.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bumblebee_status/modules/contrib/battery.py b/bumblebee_status/modules/contrib/battery.py
index 2db2031..6182f20 100644
--- a/bumblebee_status/modules/contrib/battery.py
+++ b/bumblebee_status/modules/contrib/battery.py
@@ -134,6 +134,9 @@ class Module(core.module.Module):
             if util.format.asbool(self.parameter("decorate", True)) == False:
                 widget.set("theme.exclude", "suffix")
 
+    def hidden(self):
+        return len(self._batteries) == 0
+
     def ac(self, widget):
         return "ac"
 

From 326e2f9318b0e4955a04d70b3dff463b0c3f33ad Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 3 Jul 2022 13:56:02 +0200
Subject: [PATCH 326/506] [core/theme] add support for XDG_DATA_DIRS

read theme information from
$XDG_DATA_DIRS/bumblebee-status/themes

see #821
---
 bumblebee_status/core/theme.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index 4de58d3..d91b060 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -14,11 +14,19 @@ log = logging.getLogger(__name__)
 THEME_BASE_DIR = os.path.dirname(os.path.realpath(__file__))
 PATHS = [
     ".",
-    os.path.join(THEME_BASE_DIR, "../../themes"),
+    os.path.join(THEME_BASE_DIR, "../../themes")
+]
+
+if os.environ.get("XDG_DATA_DIRS"):
+    PATHS.extend([
+        os.path.join(p, "bumblebee-status/themes") for p in os.environ["XDG_DATA_DIRS"].split(":")
+    ])
+
+PATHS.extend([
     os.path.expanduser("~/.config/bumblebee-status/themes"),
     os.path.expanduser("~/.local/share/bumblebee-status/themes"),  # PIP
     "/usr/share/bumblebee-status/themes",
-]
+])
 
 
 def themes():

From 6f4f163a7d5e10be2fc907b343bf651ffc510b87 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 3 Jul 2022 14:02:38 +0200
Subject: [PATCH 327/506] [core/layout] use python-only layout detection

remove precompiled binary and make the layout module
fall back to the python implementation.

fixes #883
---
 bin/get-kbd-layout                      | Bin 21512 -> 0 bytes
 bumblebee_status/modules/core/layout.py |  40 +-----------------------
 util/layout.c                           |  39 -----------------------
 3 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100755 bin/get-kbd-layout
 mode change 100644 => 120000 bumblebee_status/modules/core/layout.py
 delete mode 100644 util/layout.c

diff --git a/bin/get-kbd-layout b/bin/get-kbd-layout
deleted file mode 100755
index 7ce6ccf1f0f105b58ed302f5950b540abfcf4a6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21512
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
P{XP9kW1GvsC5rzBp!`HM

diff --git a/bumblebee_status/modules/core/layout.py b/bumblebee_status/modules/core/layout.py
deleted file mode 100644
index 3ebeeb5..0000000
--- a/bumblebee_status/modules/core/layout.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# pylint: disable=C0111,R0903
-
-"""Displays the current keyboard layout
-
-Parameters:
-    * layout.device: The device ID of the keyboard (as reported by `xinput -list`), defaults to the core device
-"""
-
-import re
-
-import core.widget
-import core.module
-
-import util.cli
-
-from bumblebee_status.discover import utility
-
-class Module(core.module.Module):
-    def __init__(self, config, theme):
-        super().__init__(config=config, theme=theme, widgets=core.widget.Widget(self.get_layout))
-
-        self._cmd = utility("get-kbd-layout")
-        keyboard = self.parameter("device", None)
-        if keyboard:
-            self._cmd += " {}".format(keyboard)
-
-    def get_layout(self, widget):
-        result = util.cli.execute(self._cmd, ignore_errors=True)
-
-        m = re.search("([a-zA-Z]+_)?([a-zA-Z]+)(\(([\w-]+)\))?", result)
-
-        if m:
-            layout = m.group(2)
-            variant = m.group(3)
-            return layout if not variant else "{} {}".format(layout, variant)
-
-        return "n/a"
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/bumblebee_status/modules/core/layout.py b/bumblebee_status/modules/core/layout.py
new file mode 120000
index 0000000..f2e8037
--- /dev/null
+++ b/bumblebee_status/modules/core/layout.py
@@ -0,0 +1 @@
+layout-xkb.py
\ No newline at end of file
diff --git a/util/layout.c b/util/layout.c
deleted file mode 100644
index 21aac1f..0000000
--- a/util/layout.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <X11/XKBlib.h>
-
-void err_if(int condition, const char* msg)
-{
-	if (condition) {
-		fprintf(stderr, "fatal: %s\n", msg);
-		exit(1);
-	}
-}
-
-int main(int argc, char** argv)
-{
-	Display* display = XOpenDisplay(NULL);
-	err_if(!display, "unable to open display");
-
-	int kbd = argc == 1 ? XkbUseCoreKbd : atoi(argv[1]);
-
-	XkbStateRec state;
-	XkbGetState(display, kbd, &state);
-
-	XkbDescPtr desc = XkbGetKeyboard(display, XkbAllComponentsMask, kbd);
-	char* symbols = XGetAtomName(display, desc->names->symbols);
-	printf("%s\n", symbols);
-
-#if 0
-	char *group = XGetAtomName(display, desc->names->groups[state.group]);
-	XFree(group);
-#endif
-	XFree(symbols);
-	XFree(desc);
-
-	XCloseDisplay(display);
-
-	return 0;
-}
-

From 218bfa2235ddb2f3881ad93cc069f8eda40553f1 Mon Sep 17 00:00:00 2001
From: Tom Watson <tom@watsonian.com>
Date: Wed, 6 Jul 2022 01:05:25 +0700
Subject: [PATCH 328/506] Updated contrib/publicip module and util/location

Added another API endpoint, Added options to display country name, country code, city name and lat/long coordinates, attempt to handle failure to fetch info from API endpoints cleanly
---
 bumblebee_status/modules/contrib/publicip.py | 127 ++++++++++++++++++-
 bumblebee_status/util/location.py            |  49 ++++++-
 2 files changed, 163 insertions(+), 13 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index a74d708..5b061f4 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -1,22 +1,109 @@
-"""Displays public IP address
+"""
+Displays public IP address and, optionally, Country Name, Country Code & City Name
+Maximum refresh interval should be 5 minutes to avoid free SLA breach from providers
+Note: 1 request/5 minutes is 8640 requests/month
+Provider information contained in core.location
+Left mouse click forces immediate update
+
+Parameters (Default in brackets)_
+ip (True) 		Public IP address
+country_name (False) 	Display name of country associated with the IP
+country_code (False)	Display country code of country associated with the IP
+city_name (False) 	Display name of city associated with the IP
+coordinates (False) 	Display name of city associated with the IP
+all (False) 		Display all information associate with the IP
+
+Examples
+By default only the public IP is shown
+bumblebee-status -m publicip
+
+To also include the country name...
+bumblebee-status -m publicip -p publicip.country_name=True
+
+To include all ava
+
 """
 
 import core.module
 import core.widget
 import core.decorators
-
+import core.input
+import util.format
 import util.location
 
 
 class Module(core.module.Module):
-    @core.decorators.every(minutes=60)
+    @core.decorators.every(minutes=5)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.public_ip))
 
-        self.__ip = ""
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__click_update)
+
+        self.__ip = ""			# Public IP address
+        self.__country_name = ""	# Country name associated with public IP address
+        self.__country_code = ""	# Country code associated with public IP address
+        self.__city_name = ""		# City name associated with public IP address
+        self.__coordinates = ""		# Coordinated assoicated with public IP address
+
+        # Handle failure to get IP information
+        self.__ip_error = False
+
+        # Process option paramaters
+        self.__show_ip = util.format.asbool(
+            self.parameter("ip", True)
+        )
+        self.__show_country_name = util.format.asbool(
+            self.parameter("country_name", False)
+        )
+        self.__show_country_code = util.format.asbool(
+            self.parameter("country_code", False)
+        )
+        self.__show_city_name = util.format.asbool(self.parameter("city_name", False))
+        self.__show_coordinates = util.format.asbool(
+            self.parameter("coordinates", False)
+        )
+        self.__show_all = util.format.asbool(self.parameter("all", False))
+
+    def __click_update(self, event):
+        util.location.reset()
 
     def public_ip(self, widget):
-        return self.__ip or "n/a"
+        __output = ""
+
+        if self.__ip:
+            if self.__show_ip or self.__show_all:
+                __output = self.__ip
+            self.__ip_error = False
+        else:
+            self.__ip_error = True
+            __output = "Error Getting IP"
+
+        if not self.__ip_error:
+            if self.__show_country_name or self.__show_all:
+                if self.__country_name:
+                    __output += " " + self.__country_name
+                else:
+                    __output += " " + "?"
+
+            if self.__show_country_code or self.__show_all:
+                if self.__country_code:
+                    __output += " " + "(" + self.__country_code + ")"
+                else:
+                    __output += " " + "(?)"
+
+            if self.__show_city_name or self.__show_all:
+                if self.__city_name:
+                    __output += " " + self.__city_name
+                else:
+                    __output += " " + "?"
+
+            if self.__show_coordinates or self.__show_all:
+                if self.__coordinates:
+                    __output += " " + self.__coordinates
+                else:
+                    __output += " " + "?"
+
+        return __output
 
     def update(self):
         try:
@@ -24,5 +111,33 @@ class Module(core.module.Module):
         except Exception:
             self.__ip = None
 
+        if self.__show_country_name or self.__show_all:
+            try:
+                self.__country_name = util.location.country_name()
+            except Exception:
+                self.__country_name = None
 
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
+        if self.__show_country_code or self.__show_all:
+            try:
+                self.__country_code = util.location.country_code()
+            except Exception:
+                self.__country_code = None
+
+        if self.__show_city_name or self.__show_all:
+            try:
+                self.__city_name = util.location.city_name()
+            except Exception:
+                self.__city_name = None
+
+        if self.__show_coordinates or self.__show_all:
+            try:
+                __tmp = util.location.coordinates()
+                __lat = "{:.2f}".format(__tmp[0])
+                __lon = "{:.2f}".format(__tmp[1])
+                __output = __lat + "°N" + "," + " " + __lon + "°E"
+                self.__coordinates = __output
+            except Exception:
+                self.__city_name = None
+
+
+# vim: tabstop=7 expandtab shiftwidth=4 softtabstop=4
diff --git a/bumblebee_status/util/location.py b/bumblebee_status/util/location.py
index e48b71a..840baa0 100644
--- a/bumblebee_status/util/location.py
+++ b/bumblebee_status/util/location.py
@@ -3,8 +3,10 @@ service and caches it for 12h (retries are done every
 30m in case of problems)
 
 Right now, it uses (in order of preference):
-    - http://free.ipwhois.io/
-    - http://ipapi.co/
+    - http://free.ipwhois.io/ - 10k free requests/month
+    - http://ipapi.co/ - 30k free requests/month
+    - http://ip-api.com/ - ~2m free requests/month
+
 """
 
 
@@ -21,7 +23,9 @@ __sources = [
         "mapping": {
             "latitude": "latitude",
             "longitude": "longitude",
-            "country_name": "country",
+            "country_name": "country_name",
+            "country_code": "country_code",
+            "city": "city_name",
             "ip": "public_ip",
         },
     },
@@ -30,9 +34,22 @@ __sources = [
         "mapping": {
             "latitude": "latitude",
             "longitude": "longitude",
-            "country": "country",
+            "country": "country_name",
+            "country_code": "country_code",
+            "city": "city_name",
             "ip": "public_ip",
         },
+    },
+    {
+        "url": "http://ip-api.com/json",
+        "mapping": {
+            "latitude": "lat",
+            "longitude": "lon",
+            "country": "country_name",
+            "countryCode": "country_code",
+            "city": "city_name",
+            "query": "public_ip",
+        },
     }
 ]
 
@@ -63,7 +80,10 @@ def __get(name):
     global __data
     if not __data or __expired():
         __load()
-    return __data[name]
+    if name in __data:
+        return __data[name]
+    else:
+        return None
 
 
 def reset():
@@ -82,14 +102,29 @@ def coordinates():
     return __get("latitude"), __get("longitude")
 
 
-def country():
+def country_name():
     """Returns the current country name
 
     :return: country name
     :rtype: string
     """
-    return __get("country")
+    return __get("country_name")
 
+def country_code():
+    """Returns the current country code
+
+    :return: country code
+    :rtype: string
+    """
+    return __get("country_code")
+
+def city_name():
+    """Returns the current city name
+
+    :return: city name
+    :rtype: string
+    """
+    return __get("city_name")
 
 def public_ip():
     """Returns the current public IP

From 6f137c4927e6a0f005f95898d08487585fb56ba9 Mon Sep 17 00:00:00 2001
From: Tom Watson <tom@watsonian.com>
Date: Wed, 6 Jul 2022 17:51:19 +0700
Subject: [PATCH 329/506] Update following PR review

Moved to format string handling of parameters. Minor refactoring.
---
 bumblebee_status/modules/contrib/publicip.py | 149 ++++++-------------
 1 file changed, 46 insertions(+), 103 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 5b061f4..f65e3b7 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -1,27 +1,31 @@
 """
-Displays public IP address and, optionally, Country Name, Country Code & City Name
+Displays zero or more of:
+    * Public IP address
+    * Country Name
+    * Country Code
+    * City Name
+    * Geographic Coordinates\
+
 Maximum refresh interval should be 5 minutes to avoid free SLA breach from providers
 Note: 1 request/5 minutes is 8640 requests/month
 Provider information contained in core.location
-Left mouse click forces immediate update
 
-Parameters (Default in brackets)_
-ip (True) 		Public IP address
-country_name (False) 	Display name of country associated with the IP
-country_code (False)	Display country code of country associated with the IP
-city_name (False) 	Display name of city associated with the IP
-coordinates (False) 	Display name of city associated with the IP
-all (False) 		Display all information associate with the IP
+Left mouse click on the widget forces immediate update
 
-Examples
-By default only the public IP is shown
-bumblebee-status -m publicip
+Parameters:
+publicip.format: Format string (defaults to ‘{ip} ({country_code})’)
 
-To also include the country name...
-bumblebee-status -m publicip -p publicip.country_name=True
-
-To include all ava
+Available format strings:
+ip
+country_name
+country_code
+city_name
+coordinates
 
+Examples:
+bumblebee-status -m publicip -p publicip.format="{ip} ({country_code})"
+bumblebee-status -m publicip -p publicip.format="{ip} which is in {city_name}"
+bumblebee-status -m publicip -p publicip.format="Your packets are right here: {coordinates}"
 """
 
 import core.module
@@ -37,107 +41,46 @@ class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.public_ip))
 
+        # Immediate update (override default) when left click on widget
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__click_update)
 
-        self.__ip = ""			# Public IP address
-        self.__country_name = ""	# Country name associated with public IP address
-        self.__country_code = ""	# Country code associated with public IP address
-        self.__city_name = ""		# City name associated with public IP address
-        self.__coordinates = ""		# Coordinated assoicated with public IP address
+        self.__ip = ""  # Public IP address
+        self.__country_name = ""  # Country name associated with public IP address
+        self.__country_code = ""  # Country code associated with public IP address
+        self.__city_name = ""  # City name associated with public IP address
+        self.__coordinates = ""  # Coordinated assoicated with public IP address
 
-        # Handle failure to get IP information
-        self.__ip_error = False
-
-        # Process option paramaters
-        self.__show_ip = util.format.asbool(
-            self.parameter("ip", True)
-        )
-        self.__show_country_name = util.format.asbool(
-            self.parameter("country_name", False)
-        )
-        self.__show_country_code = util.format.asbool(
-            self.parameter("country_code", False)
-        )
-        self.__show_city_name = util.format.asbool(self.parameter("city_name", False))
-        self.__show_coordinates = util.format.asbool(
-            self.parameter("coordinates", False)
-        )
-        self.__show_all = util.format.asbool(self.parameter("all", False))
+        # By default show: <ip> (<2 letter country code>)
+        self._format = self.parameter("format", "{ip} ({country_code})")
 
     def __click_update(self, event):
         util.location.reset()
 
     def public_ip(self, widget):
-        __output = ""
-
-        if self.__ip:
-            if self.__show_ip or self.__show_all:
-                __output = self.__ip
-            self.__ip_error = False
+        if not self.__ip:
+            return "Error fetching IP"
         else:
-            self.__ip_error = True
-            __output = "Error Getting IP"
-
-        if not self.__ip_error:
-            if self.__show_country_name or self.__show_all:
-                if self.__country_name:
-                    __output += " " + self.__country_name
-                else:
-                    __output += " " + "?"
-
-            if self.__show_country_code or self.__show_all:
-                if self.__country_code:
-                    __output += " " + "(" + self.__country_code + ")"
-                else:
-                    __output += " " + "(?)"
-
-            if self.__show_city_name or self.__show_all:
-                if self.__city_name:
-                    __output += " " + self.__city_name
-                else:
-                    __output += " " + "?"
-
-            if self.__show_coordinates or self.__show_all:
-                if self.__coordinates:
-                    __output += " " + self.__coordinates
-                else:
-                    __output += " " + "?"
-
-        return __output
+            return self._format.format(
+                ip=self.__ip,
+                country_name=self.__country_name,
+                country_code=self.__country_code,
+                city_name=self.__city_name,
+                coordinates=self.__coordinates,
+            )
 
     def update(self):
         try:
             self.__ip = util.location.public_ip()
+            self.__country_name = util.location.country_name()
+            self.__country_code = util.location.country_code()
+            self.__city_name = util.location.city_name()
+            __lat, __lon = util.location.coordinates()
+            __lat = "{:.2f}".format(__lat)
+            __lon = "{:.2f}".format(__lon)
+            __output = __lat + "°N" + "," + " " + __lon + "°E"
+            self.__coordinates = __output
         except Exception:
-            self.__ip = None
-
-        if self.__show_country_name or self.__show_all:
-            try:
-                self.__country_name = util.location.country_name()
-            except Exception:
-                self.__country_name = None
-
-        if self.__show_country_code or self.__show_all:
-            try:
-                self.__country_code = util.location.country_code()
-            except Exception:
-                self.__country_code = None
-
-        if self.__show_city_name or self.__show_all:
-            try:
-                self.__city_name = util.location.city_name()
-            except Exception:
-                self.__city_name = None
-
-        if self.__show_coordinates or self.__show_all:
-            try:
-                __tmp = util.location.coordinates()
-                __lat = "{:.2f}".format(__tmp[0])
-                __lon = "{:.2f}".format(__tmp[1])
-                __output = __lat + "°N" + "," + " " + __lon + "°E"
-                self.__coordinates = __output
-            except Exception:
-                self.__city_name = None
+            pass
 
 
 # vim: tabstop=7 expandtab shiftwidth=4 softtabstop=4

From a97a7fe507444b8f679b897ee4bf32f98590288a Mon Sep 17 00:00:00 2001
From: Tom Watson <tom@watsonian.com>
Date: Wed, 6 Jul 2022 19:37:29 +0700
Subject: [PATCH 330/506] Updates addressing PR comments

Added location_info() to util/location API to return a dict of all location information. Updated modules/contrib/publicip to use that API. Changed modules/contrib/publicip refresh period back to 60 minutes. Changed /util/location API from 'country_name' back to 'name'
---
 bumblebee_status/modules/contrib/publicip.py | 16 ++++++------
 bumblebee_status/util/location.py            | 26 +++++++++++++++++---
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index f65e3b7..d043fce 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -37,7 +37,7 @@ import util.location
 
 
 class Module(core.module.Module):
-    @core.decorators.every(minutes=5)
+    @core.decorators.every(minutes=60)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.public_ip))
 
@@ -48,7 +48,7 @@ class Module(core.module.Module):
         self.__country_name = ""  # Country name associated with public IP address
         self.__country_code = ""  # Country code associated with public IP address
         self.__city_name = ""  # City name associated with public IP address
-        self.__coordinates = ""  # Coordinated assoicated with public IP address
+        self.__coordinates = ""  # Coordinates assoicated with public IP address
 
         # By default show: <ip> (<2 letter country code>)
         self._format = self.parameter("format", "{ip} ({country_code})")
@@ -70,11 +70,13 @@ class Module(core.module.Module):
 
     def update(self):
         try:
-            self.__ip = util.location.public_ip()
-            self.__country_name = util.location.country_name()
-            self.__country_code = util.location.country_code()
-            self.__city_name = util.location.city_name()
-            __lat, __lon = util.location.coordinates()
+            __info = util.location.location_info()
+            self.__ip = __info["public_ip"]
+            self.__country_name = __info["country"]
+            self.__country_code = __info["country_code"]
+            self.__city_name = __info["city_name"]
+            __lat = __info["latitude"]  
+            __lon = __info["longitude"]  
             __lat = "{:.2f}".format(__lat)
             __lon = "{:.2f}".format(__lon)
             __output = __lat + "°N" + "," + " " + __lon + "°E"
diff --git a/bumblebee_status/util/location.py b/bumblebee_status/util/location.py
index 840baa0..1974773 100644
--- a/bumblebee_status/util/location.py
+++ b/bumblebee_status/util/location.py
@@ -50,7 +50,7 @@ __sources = [
             "city": "city_name",
             "query": "public_ip",
         },
-    }
+    },
 ]
 
 
@@ -87,8 +87,7 @@ def __get(name):
 
 
 def reset():
-    """Resets the location library, ensuring that a new query will be started
-    """
+    """Resets the location library, ensuring that a new query will be started"""
     global __next
     __next = 0
 
@@ -102,7 +101,7 @@ def coordinates():
     return __get("latitude"), __get("longitude")
 
 
-def country_name():
+def country():
     """Returns the current country name
 
     :return: country name
@@ -110,6 +109,7 @@ def country_name():
     """
     return __get("country_name")
 
+
 def country_code():
     """Returns the current country code
 
@@ -118,6 +118,7 @@ def country_code():
     """
     return __get("country_code")
 
+
 def city_name():
     """Returns the current city name
 
@@ -126,6 +127,7 @@ def city_name():
     """
     return __get("city_name")
 
+
 def public_ip():
     """Returns the current public IP
 
@@ -135,4 +137,20 @@ def public_ip():
     return __get("public_ip")
 
 
+def location_info():
+    """Returns the current location information
+
+    :return: public IP, country name, country code, city name & coordinates
+    :rtype: dictionary
+    """
+    return {
+        "public_ip": __get("public_ip"),
+        "country": __get("country_name"),
+        "country_code": __get("country_code"),
+        "city_name": __get("city_name"),
+        "latitude": __get("latitude"),
+        "longitude": __get("longitude"),
+    }
+
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 9a6e61173f6547673528701b622c7204c092f966 Mon Sep 17 00:00:00 2001
From: Tom Watson <tom@watsonian.com>
Date: Thu, 7 Jul 2022 18:08:20 +0700
Subject: [PATCH 331/506] Updated publicip to automatically update on detecting
 a change to default route

---
 bumblebee_status/modules/contrib/publicip.py | 130 +++++++++++--------
 1 file changed, 78 insertions(+), 52 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index d043fce..c6ff2a8 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -1,88 +1,114 @@
 """
-Displays zero or more of:
+Displays information about the public IP address associated with the default route:
     * Public IP address
     * Country Name
     * Country Code
     * City Name
-    * Geographic Coordinates\
-
-Maximum refresh interval should be 5 minutes to avoid free SLA breach from providers
-Note: 1 request/5 minutes is 8640 requests/month
-Provider information contained in core.location
+    * Geographic Coordinates
 
 Left mouse click on the widget forces immediate update
+Any change to the default route will cause the widget to update
+
+Requirements:
+    * netifaces
 
 Parameters:
-publicip.format: Format string (defaults to ‘{ip} ({country_code})’)
-
-Available format strings:
-ip
-country_name
-country_code
-city_name
-coordinates
+    * publicip.format: Format string (defaults to ‘{ip} ({country_code})’)
+    * Available format strings - ip, country_name, country_code, city_name, coordinates
 
 Examples:
-bumblebee-status -m publicip -p publicip.format="{ip} ({country_code})"
-bumblebee-status -m publicip -p publicip.format="{ip} which is in {city_name}"
-bumblebee-status -m publicip -p publicip.format="Your packets are right here: {coordinates}"
+    * bumblebee-status -m publicip -p publicip.format="{ip} ({country_code})"
+    * bumblebee-status -m publicip -p publicip.format="{ip} which is in {city_name}"
+    * bumblebee-status -m publicip -p publicip.format="Your packets are right here: {coordinates}"
+
+contributed by `tfwiii <https://github.com/tfwiii>`_ - many thanks!
 """
 
+import re
+import threading
+import netifaces
+import time 
+
 import core.module
 import core.widget
-import core.decorators
 import core.input
+import core.decorators
+
 import util.format
 import util.location
 
 
+def update_publicip_information(module):
+    widget = module.widget()
+    __previous_default_route = None
+    __current_default_route = None
+    __interval = 5 # Interval between default route change checks
+
+    while True:
+        __current_default_route = netifaces.gateways()["default"][2]
+        
+        # Updates public ip information if a change to default route is detected
+        if __current_default_route != __previous_default_route:
+            # Sets __previous_default_route in preparation for next change check
+            __previous_default_route = __current_default_route
+
+            # Refresh location information
+            util.location.reset()
+
+            # Fetch fresh location information
+            __info = util.location.location_info()
+            
+            # Contstruct coordinates string
+            __lat = "{:.2f}".format(__info["latitude"])
+            __lon = "{:.2f}".format(__info["longitude"])
+            __coords = __lat + "°N" + "," + " " + __lon + "°E"
+
+            # Set widget values
+            widget.set("public_ip", __info["public_ip"])
+            widget.set("country_name", __info["country"])
+            widget.set("country_code", __info["country_code"])
+            widget.set("city_name", __info["city_name"])
+            widget.set("coordinates", __coords)
+            
+            # Update widget values
+            core.event.trigger("update", [widget.module.id], redraw_only=True)
+            
+            # Wait __interval seconds before checking for default route changes again
+            time.sleep(__interval)
+
 class Module(core.module.Module):
     @core.decorators.every(minutes=60)
     def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.public_ip))
+        super().__init__(config, theme, core.widget.Widget(self.publicip))
+
+        self.__thread = None
 
         # Immediate update (override default) when left click on widget
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__click_update)
 
-        self.__ip = ""  # Public IP address
-        self.__country_name = ""  # Country name associated with public IP address
-        self.__country_code = ""  # Country code associated with public IP address
-        self.__city_name = ""  # City name associated with public IP address
-        self.__coordinates = ""  # Coordinates assoicated with public IP address
-
         # By default show: <ip> (<2 letter country code>)
         self._format = self.parameter("format", "{ip} ({country_code})")
 
+    def publicip(self, widget):
+        return self._format.format(
+                ip = widget.get("public_ip", "-"),
+                country_name = widget.get("country_name", "-"),
+                country_code = widget.get("country_code", "-"),
+                city_name = widget.get("city_name", "-"),
+                coordinates = widget.get("coordinates", "-")
+            )
+
     def __click_update(self, event):
         util.location.reset()
 
-    def public_ip(self, widget):
-        if not self.__ip:
-            return "Error fetching IP"
-        else:
-            return self._format.format(
-                ip=self.__ip,
-                country_name=self.__country_name,
-                country_code=self.__country_code,
-                city_name=self.__city_name,
-                coordinates=self.__coordinates,
-            )
-
     def update(self):
-        try:
-            __info = util.location.location_info()
-            self.__ip = __info["public_ip"]
-            self.__country_name = __info["country"]
-            self.__country_code = __info["country_code"]
-            self.__city_name = __info["city_name"]
-            __lat = __info["latitude"]  
-            __lon = __info["longitude"]  
-            __lat = "{:.2f}".format(__lat)
-            __lon = "{:.2f}".format(__lon)
-            __output = __lat + "°N" + "," + " " + __lon + "°E"
-            self.__coordinates = __output
-        except Exception:
-            pass
+        if self.__thread is not None and self.__thread.is_alive():
+            return
+        self.__thread = threading.Thread(target=update_publicip_information, args=(self,))
+        self.__thread.start()
+
+    def state(self, widget):
+        return widget.get("state", None)
 
 
-# vim: tabstop=7 expandtab shiftwidth=4 softtabstop=4
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 284662a0bae24e26a8db538b5ff3454cb82d0f99 Mon Sep 17 00:00:00 2001
From: Tom Watson <tom@watsonian.com>
Date: Thu, 7 Jul 2022 18:38:43 +0700
Subject: [PATCH 332/506] Ran publicip.py through black

---
 bumblebee_status/modules/contrib/publicip.py | 29 +++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index c6ff2a8..3c98bfc 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -27,7 +27,7 @@ contributed by `tfwiii <https://github.com/tfwiii>`_ - many thanks!
 import re
 import threading
 import netifaces
-import time 
+import time
 
 import core.module
 import core.widget
@@ -42,11 +42,11 @@ def update_publicip_information(module):
     widget = module.widget()
     __previous_default_route = None
     __current_default_route = None
-    __interval = 5 # Interval between default route change checks
+    __interval = 5  # Interval between default route change checks
 
     while True:
         __current_default_route = netifaces.gateways()["default"][2]
-        
+
         # Updates public ip information if a change to default route is detected
         if __current_default_route != __previous_default_route:
             # Sets __previous_default_route in preparation for next change check
@@ -57,7 +57,7 @@ def update_publicip_information(module):
 
             # Fetch fresh location information
             __info = util.location.location_info()
-            
+
             # Contstruct coordinates string
             __lat = "{:.2f}".format(__info["latitude"])
             __lon = "{:.2f}".format(__info["longitude"])
@@ -69,13 +69,14 @@ def update_publicip_information(module):
             widget.set("country_code", __info["country_code"])
             widget.set("city_name", __info["city_name"])
             widget.set("coordinates", __coords)
-            
+
             # Update widget values
             core.event.trigger("update", [widget.module.id], redraw_only=True)
-            
+
             # Wait __interval seconds before checking for default route changes again
             time.sleep(__interval)
 
+
 class Module(core.module.Module):
     @core.decorators.every(minutes=60)
     def __init__(self, config, theme):
@@ -91,12 +92,12 @@ class Module(core.module.Module):
 
     def publicip(self, widget):
         return self._format.format(
-                ip = widget.get("public_ip", "-"),
-                country_name = widget.get("country_name", "-"),
-                country_code = widget.get("country_code", "-"),
-                city_name = widget.get("city_name", "-"),
-                coordinates = widget.get("coordinates", "-")
-            )
+            ip=widget.get("public_ip", "-"),
+            country_name=widget.get("country_name", "-"),
+            country_code=widget.get("country_code", "-"),
+            city_name=widget.get("city_name", "-"),
+            coordinates=widget.get("coordinates", "-"),
+        )
 
     def __click_update(self, event):
         util.location.reset()
@@ -104,7 +105,9 @@ class Module(core.module.Module):
     def update(self):
         if self.__thread is not None and self.__thread.is_alive():
             return
-        self.__thread = threading.Thread(target=update_publicip_information, args=(self,))
+        self.__thread = threading.Thread(
+            target=update_publicip_information, args=(self,)
+        )
         self.__thread.start()
 
     def state(self, widget):

From 2fa79317831c7d01a7c76160cbf255c5de717d14 Mon Sep 17 00:00:00 2001
From: Tom Watson <tom@watsonian.com>
Date: Tue, 12 Jul 2022 00:19:19 +0700
Subject: [PATCH 333/506] Fixed runaway thread creation (faulty indenting)

---
 bumblebee_status/modules/contrib/publicip.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 3c98bfc..67a5c86 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -73,9 +73,8 @@ def update_publicip_information(module):
             # Update widget values
             core.event.trigger("update", [widget.module.id], redraw_only=True)
 
-            # Wait __interval seconds before checking for default route changes again
-            time.sleep(__interval)
-
+        # Wait __interval seconds before checking for default route changes again
+        time.sleep(__interval)
 
 class Module(core.module.Module):
     @core.decorators.every(minutes=60)

From a5fbc73c44d8ba9e4a46b63b92de15245cd9ca98 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Thu, 21 Jul 2022 11:37:33 +0530
Subject: [PATCH 334/506] fix typo

---
 bumblebee_status/_version.py                  |  2 +-
 bumblebee_status/core/module.py               |  2 +-
 .../modules/contrib/battery-upower.py         |  4 ++--
 bumblebee_status/modules/contrib/blugon.py    |  2 +-
 bumblebee_status/modules/contrib/cpu2.py      |  4 ++--
 .../modules/contrib/messagereceiver.py        |  2 +-
 bumblebee_status/modules/contrib/pacman.py    |  2 +-
 bumblebee_status/modules/contrib/pomodoro.py  |  2 +-
 bumblebee_status/modules/contrib/progress.py  |  8 ++++----
 .../modules/contrib/smartstatus.py            |  2 +-
 bumblebee_status/modules/contrib/spaceapi.py  |  2 +-
 bumblebee_status/modules/contrib/traffic.py   |  2 +-
 bumblebee_status/modules/core/disk.py         |  2 +-
 bumblebee_status/modules/core/sensors2.py     |  2 +-
 docs/modules.rst                              | 20 +++++++++----------
 versioneer.py                                 |  6 +++---
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/bumblebee_status/_version.py b/bumblebee_status/_version.py
index 154e077..247364e 100644
--- a/bumblebee_status/_version.py
+++ b/bumblebee_status/_version.py
@@ -292,7 +292,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
         # TAG-NUM-gHEX
         mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe)
         if not mo:
-            # unparseable. Maybe git-describe is misbehaving?
+            # unparsable. Maybe git-describe is misbehaving?
             pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out
             return pieces
 
diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 312862d..84c3ab5 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -295,7 +295,7 @@ class Error(Module):
     def full_text(self, widget):
         return "{}: {}".format(self.__module, self.__error)
 
-    """Overriden state, always returns critical (it *is* an error, after all"""
+    """Overridden state, always returns critical (it *is* an error, after all"""
 
     def state(self, widget):
         return ["critical"]
diff --git a/bumblebee_status/modules/contrib/battery-upower.py b/bumblebee_status/modules/contrib/battery-upower.py
index 9167ad7..3cc9e7f 100644
--- a/bumblebee_status/modules/contrib/battery-upower.py
+++ b/bumblebee_status/modules/contrib/battery-upower.py
@@ -68,7 +68,7 @@ class UPowerManager:
         isPresent = battery_proxy_interface.Get(
             self.UPOWER_NAME + ".Device", "IsPresent"
         )
-        isRechargable = battery_proxy_interface.Get(
+        isRechargeable = battery_proxy_interface.Get(
             self.UPOWER_NAME + ".Device", "IsRechargeable"
         )
         online = battery_proxy_interface.Get(self.UPOWER_NAME + ".Device", "Online")
@@ -128,7 +128,7 @@ class UPowerManager:
             "HasHistory": hasHistory,
             "HasStatistics": hasStatistics,
             "IsPresent": isPresent,
-            "IsRechargeable": isRechargable,
+            "IsRechargeable": isRechargeable,
             "Online": online,
             "PowerSupply": powersupply,
             "Capacity": capacity,
diff --git a/bumblebee_status/modules/contrib/blugon.py b/bumblebee_status/modules/contrib/blugon.py
index 4fa0079..83e0bb6 100644
--- a/bumblebee_status/modules/contrib/blugon.py
+++ b/bumblebee_status/modules/contrib/blugon.py
@@ -1,6 +1,6 @@
 """Displays temperature of blugon and Controls it.
 
-Use wheel up and down to change temperature, middle click to toggle and right click to reset temprature.
+Use wheel up and down to change temperature, middle click to toggle and right click to reset temperature.
 
 Default Values:
     * Minimum temperature: 1000 (red)
diff --git a/bumblebee_status/modules/contrib/cpu2.py b/bumblebee_status/modules/contrib/cpu2.py
index 1512681..e017f04 100644
--- a/bumblebee_status/modules/contrib/cpu2.py
+++ b/bumblebee_status/modules/contrib/cpu2.py
@@ -24,9 +24,9 @@ Parameters:
          * cpu2.fanspeed
     * cpu2.colored: 1 for colored per core load graph, 0 for mono (default)
     * cpu2.temp_pattern: pattern to look for in the output of 'sensors -u';
-      required if cpu2.temp widged is used
+      required if cpu2.temp widget is used
     * cpu2.fan_pattern: pattern to look for in the output of 'sensors -u';
-      required if cpu2.fanspeed widged is used
+      required if cpu2.fanspeed widget is used
 
 Note: if you are getting 'n/a' for CPU temperature / fan speed, then you're
 lacking the aforementioned pattern settings or they have wrong values.
diff --git a/bumblebee_status/modules/contrib/messagereceiver.py b/bumblebee_status/modules/contrib/messagereceiver.py
index 48c389a..74943cd 100644
--- a/bumblebee_status/modules/contrib/messagereceiver.py
+++ b/bumblebee_status/modules/contrib/messagereceiver.py
@@ -3,7 +3,7 @@
 """
 Displays the message that's received via unix socket.
 
-Parameteres:
+Parameters:
     * messagereceiver   : Unix socket address (e.g: /tmp/bumblebee_messagereceiver.sock)
 
 Example:
diff --git a/bumblebee_status/modules/contrib/pacman.py b/bumblebee_status/modules/contrib/pacman.py
index b50ed53..cb3de96 100644
--- a/bumblebee_status/modules/contrib/pacman.py
+++ b/bumblebee_status/modules/contrib/pacman.py
@@ -3,7 +3,7 @@
 """Displays update information per repository for pacman.
 
 Parameters:
-    * pacman.sum: If you prefere displaying updates with a single digit (defaults to 'False')
+    * pacman.sum: If you prefer displaying updates with a single digit (defaults to 'False')
 
 Requires the following executables:
     * fakeroot
diff --git a/bumblebee_status/modules/contrib/pomodoro.py b/bumblebee_status/modules/contrib/pomodoro.py
index fe5959f..3f1397a 100644
--- a/bumblebee_status/modules/contrib/pomodoro.py
+++ b/bumblebee_status/modules/contrib/pomodoro.py
@@ -13,7 +13,7 @@ Parameters:
       Example: 'notify-send 'Time up!''. If you want to chain multiple commands,
       please use an external wrapper script and invoke that. The module itself does
       not support command chaining (see https://github.com/tobi-wan-kenobi/bumblebee-status/issues/532
-      for a detailled explanation)
+      for a detailed explanation)
 
 contributed by `martindoublem <https://github.com/martindoublem>`_, inspired by `karthink <https://github.com/karthink>`_ - many thanks!
 """
diff --git a/bumblebee_status/modules/contrib/progress.py b/bumblebee_status/modules/contrib/progress.py
index 9148acb..c8905e7 100644
--- a/bumblebee_status/modules/contrib/progress.py
+++ b/bumblebee_status/modules/contrib/progress.py
@@ -56,7 +56,7 @@ class Module(core.module.Module):
             return self.parameter("placeholder", "n/a")
 
     def update_progress_info(self, widget):
-        """Update widget's informations about the copy"""
+        """Update widget's information about the copy"""
         if not self.__active:
             return
 
@@ -64,8 +64,8 @@ class Module(core.module.Module):
         #  1. pid
         #  2. command
         #  3. arguments
-        #  4. progress (xx.x formated)
-        #  5. quantity (.. unit / .. unit formated)
+        #  4. progress (xx.x formatted)
+        #  5. quantity (.. unit / .. unit formatted)
         #  6. speed
         #  7. time remaining
         extract_nospeed = re.compile(
@@ -80,7 +80,7 @@ class Module(core.module.Module):
             result = extract_wtspeed.match(raw)
 
             if not result:
-                # Abord speed measures
+                # Abort speed measures
                 raw = util.cli.execute("progress -q")
                 result = extract_nospeed.match(raw)
 
diff --git a/bumblebee_status/modules/contrib/smartstatus.py b/bumblebee_status/modules/contrib/smartstatus.py
index 81060da..ddd187c 100644
--- a/bumblebee_status/modules/contrib/smartstatus.py
+++ b/bumblebee_status/modules/contrib/smartstatus.py
@@ -10,7 +10,7 @@ Requires the following executables:
     * smartctl
 
 Parameters:
-    * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'seperate' or 'singles')
+    * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'separate' or 'singles')
     * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
     * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. 
 """
diff --git a/bumblebee_status/modules/contrib/spaceapi.py b/bumblebee_status/modules/contrib/spaceapi.py
index a6c2772..e36d7bd 100644
--- a/bumblebee_status/modules/contrib/spaceapi.py
+++ b/bumblebee_status/modules/contrib/spaceapi.py
@@ -16,7 +16,7 @@ Parameters:
 
 Format Strings:
     * Format strings are indicated by double %%
-    * They represent a leaf in the JSON tree, layers seperated by '.'
+    * They represent a leaf in the JSON tree, layers separated by '.'
     * Boolean values can be overwritten by appending '%true%false'
       in the format string
     * Example: to reference 'open' in '{'state':{'open': true}}'
diff --git a/bumblebee_status/modules/contrib/traffic.py b/bumblebee_status/modules/contrib/traffic.py
index c8b87db..4c91b61 100644
--- a/bumblebee_status/modules/contrib/traffic.py
+++ b/bumblebee_status/modules/contrib/traffic.py
@@ -8,7 +8,7 @@ Parameters:
     * traffic.showname: If set to False, hide network interface name (defaults to True)
     * traffic.format: Format string for download/upload speeds.
       Defaults to '{:.2f}'
-    * traffic.graphlen: Graph lenth in seconds. Positive even integer. Each
+    * traffic.graphlen: Graph length in seconds. Positive even integer. Each
       char shows 2 seconds. If set, enables up/down traffic
       graphs
 
diff --git a/bumblebee_status/modules/core/disk.py b/bumblebee_status/modules/core/disk.py
index ff0d4f9..0488535 100644
--- a/bumblebee_status/modules/core/disk.py
+++ b/bumblebee_status/modules/core/disk.py
@@ -4,7 +4,7 @@
 
 Parameters:
     * disk.warning: Warning threshold in % of disk space (defaults to 80%)
-    * disk.critical: Critical threshold in % of disk space (defaults ot 90%)
+    * disk.critical: Critical threshold in % of disk space (defaults to 90%)
     * disk.path: Path to calculate disk usage from (defaults to /)
     * disk.open: Which application / file manager to launch (default xdg-open)
     * disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to '{path} {used}/{size} ({percent:05.02f}%)')
diff --git a/bumblebee_status/modules/core/sensors2.py b/bumblebee_status/modules/core/sensors2.py
index 5f101fa..68b58b6 100644
--- a/bumblebee_status/modules/core/sensors2.py
+++ b/bumblebee_status/modules/core/sensors2.py
@@ -11,7 +11,7 @@ Parameters:
     * sensors2.showother: Enable or display 'other' sensor readings (default: false)
     * sensors2.showname: Enable or disable show of sensor name (default: false)
     * sensors2.chip_include: Comma-separated list of chip to include (defaults to '' will include all by default, example: 'coretemp,bat')
-    * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exlude none by default)
+    * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exclude none by default)
     * sensors2.field_include: Comma separated list of chip to include (defaults to '' will include all by default, example: 'temp,fan')
     * sensors2.field_exclude: Comma separated list of chip to exclude (defaults to '' will exclude none by default)
     * sensors2.chip_field_exclude: Comma separated list of chip field to exclude (defaults to '' will exclude none by default, example: 'coretemp-isa-0000.temp1,coretemp-isa-0000.fan1')
diff --git a/docs/modules.rst b/docs/modules.rst
index 69e56fd..21a1439 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -60,7 +60,7 @@ Shows free diskspace, total diskspace and the percentage of free disk space.
 
 Parameters:
     * disk.warning: Warning threshold in % of disk space (defaults to 80%)
-    * disk.critical: Critical threshold in % of disk space (defaults ot 90%)
+    * disk.critical: Critical threshold in % of disk space (defaults to 90%)
     * disk.path: Path to calculate disk usage from (defaults to /)
     * disk.open: Which application / file manager to launch (default xdg-open)
     * disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to '{path} {used}/{size} ({percent:05.02f}%)')
@@ -246,7 +246,7 @@ Parameters:
     * sensors2.showother: Enable or display 'other' sensor readings (default: false)
     * sensors2.showname: Enable or disable show of sensor name (default: false)
     * sensors2.chip_include: Comma-separated list of chip to include (defaults to '' will include all by default, example: 'coretemp,bat')
-    * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exlude none by default)
+    * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exclude none by default)
     * sensors2.field_include: Comma separated list of chip to include (defaults to '' will include all by default, example: 'temp,fan')
     * sensors2.field_exclude: Comma separated list of chip to exclude (defaults to '' will exclude none by default)
     * sensors2.chip_field_exclude: Comma separated list of chip field to exclude (defaults to '' will exclude none by default, example: 'coretemp-isa-0000.temp1,coretemp-isa-0000.fan1')
@@ -574,9 +574,9 @@ Parameters:
          * cpu2.fanspeed
     * cpu2.colored: 1 for colored per core load graph, 0 for mono (default)
     * cpu2.temp_pattern: pattern to look for in the output of 'sensors -u';
-      required if cpu2.temp widged is used
+      required if cpu2.temp widget is used
     * cpu2.fan_pattern: pattern to look for in the output of 'sensors -u';
-      required if cpu2.fanspeed widged is used
+      required if cpu2.fanspeed widget is used
 
 Note: if you are getting 'n/a' for CPU temperature / fan speed, then you're
 lacking the aforementioned pattern settings or they have wrong values.
@@ -907,7 +907,7 @@ messagereceiver
 
 Displays the message that's received via unix socket.
 
-Parameteres:
+Parameters:
     * messagereceiver   : Unix socket address (e.g: /tmp/bumblebee_messagereceiver.sock)
 
 Example:
@@ -1059,7 +1059,7 @@ pacman
 Displays update information per repository for pacman.
 
 Parameters:
-    * pacman.sum: If you prefere displaying updates with a single digit (defaults to 'False')
+    * pacman.sum: If you prefer displaying updates with a single digit (defaults to 'False')
 
 Requires the following executables:
     * fakeroot
@@ -1119,7 +1119,7 @@ Parameters:
       Example: 'notify-send 'Time up!''. If you want to chain multiple commands,
       please use an external wrapper script and invoke that. The module itself does
       not support command chaining (see https://github.com/tobi-wan-kenobi/bumblebee-status/issues/532
-      for a detailled explanation)
+      for a detailed explanation)
 
 contributed by `martindoublem <https://github.com/martindoublem>`_, inspired by `karthink <https://github.com/karthink>`_ - many thanks!
 
@@ -1303,7 +1303,7 @@ Requires the following executables:
     * smartctl
 
 Parameters:
-    * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'seperate' or 'singles')
+    * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'separate' or 'singles')
     * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
     * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. 
 
@@ -1323,7 +1323,7 @@ Parameters:
 
 Format Strings:
     * Format strings are indicated by double %%
-    * They represent a leaf in the JSON tree, layers seperated by '.'
+    * They represent a leaf in the JSON tree, layers separated by '.'
     * Boolean values can be overwritten by appending '%true%false'
       in the format string
     * Example: to reference 'open' in '{'state':{'open': true}}'
@@ -1514,7 +1514,7 @@ Parameters:
     * traffic.showname: If set to False, hide network interface name (defaults to True)
     * traffic.format: Format string for download/upload speeds.
       Defaults to '{:.2f}'
-    * traffic.graphlen: Graph lenth in seconds. Positive even integer. Each
+    * traffic.graphlen: Graph length in seconds. Positive even integer. Each
       char shows 2 seconds. If set, enables up/down traffic
       graphs
 
diff --git a/versioneer.py b/versioneer.py
index 2b54540..d6b8fc6 100644
--- a/versioneer.py
+++ b/versioneer.py
@@ -179,7 +179,7 @@ two common reasons why `setup.py` might not be in the root:
   `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI
   distributions (and upload multiple independently-installable tarballs).
 * Source trees whose main purpose is to contain a C library, but which also
-  provide bindings to Python (and perhaps other langauges) in subdirectories.
+  provide bindings to Python (and perhaps other languages) in subdirectories.
 
 Versioneer will look for `.git` in parent directories, and most operations
 should get the right version string. However `pip` and `setuptools` have bugs
@@ -699,7 +699,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
         # TAG-NUM-gHEX
         mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
         if not mo:
-            # unparseable. Maybe git-describe is misbehaving?
+            # unparsable. Maybe git-describe is misbehaving?
             pieces["error"] = ("unable to parse git-describe output: '%%s'"
                                %% describe_out)
             return pieces
@@ -1106,7 +1106,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
         # TAG-NUM-gHEX
         mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe)
         if not mo:
-            # unparseable. Maybe git-describe is misbehaving?
+            # unparsable. Maybe git-describe is misbehaving?
             pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out
             return pieces
 

From 8e85eaa0189278badc936afe23b59f7024f282a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adamczyk=20B=C5=82a=C5=BCej?= <blazej.adamczyk@coi.gov.pl>
Date: Mon, 25 Jul 2022 09:12:42 +0200
Subject: [PATCH 335/506] Fixed a bug in pulseaudio when changing source/sink,
 e.g. (dis)connecting bluetooth headset.

---
 bumblebee_status/modules/core/pulseaudio.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 906e1dd..98ec4d4 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -146,9 +146,12 @@ class Module(core.module.Module):
             m = re.search(r"mono:.*\s*\/\s*(\d+)%", line)
             if m:
                 self._mono = m.group(1)
+                self._left = 0
+                self._right = 0
         else:
             m = re.search(r"left:.*\s*\/\s*(\d+)%.*right:.*\s*\/\s*(\d+)%", line)
             if m:
+                self._mono = 0
                 self._left = m.group(1)
                 self._right = m.group(2)
 

From a1c4b3c65e724959dc2af49b570e910de38e48a2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 11:17:18 +0200
Subject: [PATCH 336/506] [modules/spotify] enable scrolling

this change should enable scrolling for the spotify module

(unfortunately, i am unable to fully test this, as i am not using
spotify)

fixes #903
---
 bumblebee_status/modules/contrib/spotify.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/spotify.py b/bumblebee_status/modules/contrib/spotify.py
index 1c7f7e2..d597b47 100644
--- a/bumblebee_status/modules/contrib/spotify.py
+++ b/bumblebee_status/modules/contrib/spotify.py
@@ -110,7 +110,8 @@ class Module(core.module.Module):
     def hidden(self):
         return self.string_song == ""
 
-    def __get_song(self):
+    @core.decorators.scrollable
+    def __get_song(self, widget):
         bus = self.__bus
         if self.__bus_name == "spotifyd":
             spotify = bus.get_object(
@@ -128,11 +129,10 @@ class Module(core.module.Module):
             artist=",".join(props.get("xesam:artist")),
             trackNumber=str(props.get("xesam:trackNumber")),
         )
+        return self.__song
 
     def update(self):
         try:
-            self.__get_song()
-
             if self.__bus_name == "spotifyd":
                 bus = self.__bus.get_object(
                     "org.mpris.MediaPlayer2.spotifyd", "/org/mpris/MediaPlayer2"
@@ -156,7 +156,7 @@ class Module(core.module.Module):
                         widget.set("state", "paused")
                 elif widget.name == "spotify.song":
                     widget.set("state", "song")
-                    widget.full_text(self.__song)
+                    widget.full_text(self.__get_song(widget))
 
         except Exception as e:
             self.__song = ""

From a8a4a863502b794de84c11e89eec4ef7835d9284 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 11:29:18 +0200
Subject: [PATCH 337/506] [all] remove Travis CI

As far as I can tell, Travis CI is *not* free anymore, even for OSS
projects. I assumed the 10k credits were monthly or yearly, but
seemingly, they are a one-time thing.

So, remove Travis CI and start searching for a better replacement.

see #906
---
 .travis.yml     | 30 ------------------------------
 CONTRIBUTING.md |  1 -
 README.md       |  1 -
 versioneer.py   |  2 --
 4 files changed, 34 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b05ac86..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-os: linux
-language: python
-env:
-  global:
-    - CC_TEST_REPORTER_ID=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf 
-python:
-  - "3.6"
-  - "3.7"
-  - "3.8"
-  - "3.9"
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-addons:
-  apt:
-    packages:
-      libdbus-1-dev
-      libgit2-dev
-      libvirt-dev
-      taskwarrior
-install:
-  - pip install -U coverage pytest pytest-mock freezegun
-  - pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
-  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
-script:
-  - coverage run --source=. -m pytest tests -v
-after_script:
-  - coverage xml
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 099a62e..4ee8d31 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,6 +12,5 @@ But even if you can't provide those, any indicator that something is not working
 
 ### Adding a new module or theme
 If you want to add a new module, please have a look at [how to write a new module](docs/development/module.rst) and [how to write a new theme](docs/development/theme.rst). Then simply create a Pull Request and I will review the changes as soon as possible.
-If you want to do me a *big* favour, check the Travis status for any failing unit tests. Oh - and if you happen to add unit tests, that's also something I am very grateful for!
 
 Thanks for reading until here! :)
diff --git a/README.md b/README.md
index ba6261f..37f1403 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # bumblebee-status
 
-[![Build Status](https://app.travis-ci.com/tobi-wan-kenobi/bumblebee-status.svg?branch=main)](https://app.travis-ci.com/tobi-wan-kenobi/bumblebee-status)
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
diff --git a/versioneer.py b/versioneer.py
index d6b8fc6..84b3b1c 100644
--- a/versioneer.py
+++ b/versioneer.py
@@ -14,8 +14,6 @@ The Versioneer
 (https://pypip.in/version/versioneer/badge.svg?style=flat)
 ](https://pypi.python.org/pypi/versioneer/)
 * [![Build Status]
-(https://travis-ci.org/warner/python-versioneer.png?branch=master)
-](https://travis-ci.org/warner/python-versioneer)
 
 This is a tool for managing a recorded version number in distutils-based
 python projects. The goal is to remove the tedious and error-prone "update

From 7635fec36f17ff556d8394807c974bf7ae926bd3 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 11:41:34 +0200
Subject: [PATCH 338/506] [doc] remove code climate for now

since those were triggered by the travis builds, remove code climate as
well (might reintroduce them later)

see #906
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 37f1403..94bed5c 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
 [![PyPI version](https://badge.fury.io/py/bumblebee-status.svg)](https://badge.fury.io/py/bumblebee-status)
-[![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
-[![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![CodeQL](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml)
 ![License](https://img.shields.io/github/license/tobi-wan-kenobi/bumblebee-status)

From 184762ac579b7fba29d77008f59e168fc60180e6 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:18:07 +0200
Subject: [PATCH 339/506] [autotest] first attempt at a github action that runs
 tests

---
 .github/workflows/autotest.yml | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 .github/workflows/autotest.yml

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
new file mode 100644
index 0000000..5303b51
--- /dev/null
+++ b/.github/workflows/autotest.yml
@@ -0,0 +1,42 @@
+name: Run tests
+
+on:
+  pull_request:
+    types: [ opened, reopened, edited ]
+  push:
+
+env:
+  CC_TEST_REPORTER_ID: 40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+      - name: Install Ubuntu dependencies
+        run: apt install libdbus-1-dev libgit2-dev libvirt-dev taskwarrior
+      - name: Install Python dependencies 
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U coverage pytest pytest-mock freezegun
+          pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
+          pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
+      - name: Install Code Climate dependency
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+      - name: Run tests
+        run: |
+          RESULT=coverage run --source=. -m pytest tests -v
+          coverage xml
+          ./cc-test-reporter after-build --exit-status $RESULT

From 00b7929df5bc600860ef873f28d56198bad44ce1 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:19:32 +0200
Subject: [PATCH 340/506] [autotest] fix ubuntu package installation

---
 .github/workflows/autotest.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 5303b51..f4fdb6a 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.6']
 
     steps:
       - uses: actions/checkout@v3
@@ -23,7 +23,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
       - name: Install Ubuntu dependencies
-        run: apt install libdbus-1-dev libgit2-dev libvirt-dev taskwarrior
+        run: sudo apt-get install -y libdbus-1-dev libgit2-dev libvirt-dev taskwarrior
       - name: Install Python dependencies 
         run: |
           python -m pip install --upgrade pip

From e8c493607f7c6b67c445326bf990077b88b56f29 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:27:03 +0200
Subject: [PATCH 341/506] [autotest] add debug flag to code climate tool

---
 .github/workflows/autotest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index f4fdb6a..889bac4 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -39,4 +39,4 @@ jobs:
         run: |
           RESULT=coverage run --source=. -m pytest tests -v
           coverage xml
-          ./cc-test-reporter after-build --exit-status $RESULT
+          ./cc-test-reporter -d after-build --exit-status $RESULT

From db13bd94a126d669780165f9b02f838d0879485a Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:29:50 +0200
Subject: [PATCH 342/506] [autotest] use separate action for code climate

---
 .github/workflows/autotest.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 889bac4..14c6142 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -38,5 +38,8 @@ jobs:
       - name: Run tests
         run: |
           RESULT=coverage run --source=. -m pytest tests -v
-          coverage xml
-          ./cc-test-reporter -d after-build --exit-status $RESULT
+      - name: Report coverage 
+        uses: paambaati/codeclimate-action@v3.0.0
+        with:
+          coverageCommand: coverage xml
+          debug: true

From 6980d5e5d07a397ecd6ec167161a348c81ed2859 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:35:58 +0200
Subject: [PATCH 343/506] [autotest] use coverage3 explicitly?

---
 .github/workflows/autotest.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 14c6142..330b9bf 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -37,9 +37,9 @@ jobs:
           ./cc-test-reporter before-build
       - name: Run tests
         run: |
-          RESULT=coverage run --source=. -m pytest tests -v
+          RESULT=coverage3 run --source=. -m pytest tests -v
       - name: Report coverage 
         uses: paambaati/codeclimate-action@v3.0.0
         with:
-          coverageCommand: coverage xml
+          coverageCommand: coverage3 xml
           debug: true

From 6bac2b6e34e059b967da3da5476853a1ad24027e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:39:06 +0200
Subject: [PATCH 344/506] [autotest] remove environment variable setting

---
 .github/workflows/autotest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 330b9bf..49cbada 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -37,7 +37,7 @@ jobs:
           ./cc-test-reporter before-build
       - name: Run tests
         run: |
-          RESULT=coverage3 run --source=. -m pytest tests -v
+          coverage run --source=. -m pytest tests -v
       - name: Report coverage 
         uses: paambaati/codeclimate-action@v3.0.0
         with:

From 61ebc3aea6919ccd32201f3c9ff5ec66e272128b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:44:40 +0200
Subject: [PATCH 345/506] [autotest] remove code climate dependency

---
 .github/workflows/autotest.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 49cbada..ce0278a 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -30,11 +30,6 @@ jobs:
           pip install -U coverage pytest pytest-mock freezegun
           pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
           pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
-      - name: Install Code Climate dependency
-        run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
       - name: Run tests
         run: |
           coverage run --source=. -m pytest tests -v

From a78403d3e803104b79140b4870052c868552380e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:00:28 +0200
Subject: [PATCH 346/506] [publicip] fix tests and bugs

---
 bumblebee_status/modules/contrib/publicip.py | 82 +++++++++-----------
 tests/modules/contrib/test_publicip.py       | 34 +++++---
 2 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 67a5c86..89a52c8 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -38,50 +38,14 @@ import util.format
 import util.location
 
 
-def update_publicip_information(module):
-    widget = module.widget()
-    __previous_default_route = None
-    __current_default_route = None
-    __interval = 5  # Interval between default route change checks
-
-    while True:
-        __current_default_route = netifaces.gateways()["default"][2]
-
-        # Updates public ip information if a change to default route is detected
-        if __current_default_route != __previous_default_route:
-            # Sets __previous_default_route in preparation for next change check
-            __previous_default_route = __current_default_route
-
-            # Refresh location information
-            util.location.reset()
-
-            # Fetch fresh location information
-            __info = util.location.location_info()
-
-            # Contstruct coordinates string
-            __lat = "{:.2f}".format(__info["latitude"])
-            __lon = "{:.2f}".format(__info["longitude"])
-            __coords = __lat + "°N" + "," + " " + __lon + "°E"
-
-            # Set widget values
-            widget.set("public_ip", __info["public_ip"])
-            widget.set("country_name", __info["country"])
-            widget.set("country_code", __info["country_code"])
-            widget.set("city_name", __info["city_name"])
-            widget.set("coordinates", __coords)
-
-            # Update widget values
-            core.event.trigger("update", [widget.module.id], redraw_only=True)
-
-        # Wait __interval seconds before checking for default route changes again
-        time.sleep(__interval)
-
 class Module(core.module.Module):
     @core.decorators.every(minutes=60)
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.publicip))
 
-        self.__thread = None
+        self.__previous_default_route = None
+        self.__current_default_route = None
+        self.background = True
 
         # Immediate update (override default) when left click on widget
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__click_update)
@@ -90,6 +54,8 @@ class Module(core.module.Module):
         self._format = self.parameter("format", "{ip} ({country_code})")
 
     def publicip(self, widget):
+        if widget.get("public_ip") == None:
+            return "n/a"
         return self._format.format(
             ip=widget.get("public_ip", "-"),
             country_name=widget.get("country_name", "-"),
@@ -102,12 +68,38 @@ class Module(core.module.Module):
         util.location.reset()
 
     def update(self):
-        if self.__thread is not None and self.__thread.is_alive():
-            return
-        self.__thread = threading.Thread(
-            target=update_publicip_information, args=(self,)
-        )
-        self.__thread.start()
+        widget = self.widget()
+
+        self.__current_default_route = netifaces.gateways()["default"][2]
+
+        try:
+            # Updates public ip information if a change to default route is detected
+            if self.__current_default_route != self.__previous_default_route:
+                # Sets __previous_default_route in preparation for next change check
+                self.__previous_default_route = self.__current_default_route
+
+                # Refresh location information
+                util.location.reset()
+
+                # Fetch fresh location information
+                __info = util.location.location_info()
+
+                # Contstruct coordinates string
+                __lat = "{:.2f}".format(__info["latitude"])
+                __lon = "{:.2f}".format(__info["longitude"])
+                __coords = __lat + "°N" + "," + " " + __lon + "°E"
+
+                # Set widget values
+                widget.set("public_ip", __info["public_ip"])
+                widget.set("country_name", __info["country"])
+                widget.set("country_code", __info["country_code"])
+                widget.set("city_name", __info["city_name"])
+                widget.set("coordinates", __coords)
+
+                # Update widget values
+                core.event.trigger("update", [widget.module.id], redraw_only=True)
+        except:
+            widget.set("public_ip", None)
 
     def state(self, widget):
         return widget.get("state", None)
diff --git a/tests/modules/contrib/test_publicip.py b/tests/modules/contrib/test_publicip.py
index 870ede6..5786dd4 100644
--- a/tests/modules/contrib/test_publicip.py
+++ b/tests/modules/contrib/test_publicip.py
@@ -17,27 +17,41 @@ class PublicIPTest(TestCase):
     def test_load_module(self):
         __import__("modules.contrib.publicip")
 
-    @mock.patch('util.location.public_ip')
-    def test_public_ip(self, public_ip_mock):
-        public_ip_mock.return_value = '5.12.220.2'
+    @mock.patch('util.location.location_info')
+    def test_public_ip(self, location_mock):
+        location_mock.return_value = {
+            'public_ip': '5.12.220.2',
+            'latitude': 0,
+            'longitude': 2,
+            'country': 'some country',
+            'country_code': 'sc',
+            'city_name': '???',
+        }
 
         module = build_module()
         module.update()
 
-        assert widget(module).full_text() == '5.12.220.2'
+        assert widget(module).full_text() == '5.12.220.2 (sc)'
 
-    @mock.patch('util.location.public_ip')
-    def test_public_ip(self, public_ip_mock):
-        public_ip_mock.return_value = None
+    @mock.patch('util.location.location_info')
+    def test_public_ip2(self, location_mock):
+        location_mock.return_value = {
+            'public_ip': None,
+            'latitude': 0,
+            'longitude': 2,
+            'country': 'some country',
+            'country_code': 'sc',
+            'city_name': '???',
+        }
 
         module = build_module()
         module.update()
 
         assert widget(module).full_text() == 'n/a'
 
-    @mock.patch('util.location.public_ip')
-    def test_public_ip_with_exception(self, public_ip_mock):
-        public_ip_mock.side_effect = Exception
+    @mock.patch('util.location.location_info')
+    def test_public_ip_with_exception(self, location_mock):
+        location_mock.side_effect = Exception
 
         module = build_module()
         module.update()

From 921ddb64f041305df8e26666f1f19ff750028833 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:02:54 +0200
Subject: [PATCH 347/506] Revert "[autotest] remove code climate dependency"

This reverts commit 61ebc3aea6919ccd32201f3c9ff5ec66e272128b.
---
 .github/workflows/autotest.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index ce0278a..49cbada 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -30,6 +30,11 @@ jobs:
           pip install -U coverage pytest pytest-mock freezegun
           pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
           pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
+      - name: Install Code Climate dependency
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
       - name: Run tests
         run: |
           coverage run --source=. -m pytest tests -v

From 42ef6a3f0283a61d58c27bef3872a63d80702309 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:03:12 +0200
Subject: [PATCH 348/506] Revert "[doc] remove code climate for now"

This reverts commit 7635fec36f17ff556d8394807c974bf7ae926bd3.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 94bed5c..37f1403 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
 [![PyPI version](https://badge.fury.io/py/bumblebee-status.svg)](https://badge.fury.io/py/bumblebee-status)
+[![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
+[![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![CodeQL](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml)
 ![License](https://img.shields.io/github/license/tobi-wan-kenobi/bumblebee-status)

From f59da4c2d87c4bfc711662fe1db90abcd129d430 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:04:04 +0200
Subject: [PATCH 349/506] [autotests] add more python versions

---
 .github/workflows/autotest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 49cbada..1c6b428 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v3

From 38a5f38b43bf6425f361cf1636db7175f205add7 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:05:15 +0200
Subject: [PATCH 350/506] [doc] add test badge

---
 .github/workflows/autotest.yml | 2 +-
 README.md                      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 1c6b428..652bab0 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -1,4 +1,4 @@
-name: Run tests
+name: Tests
 
 on:
   pull_request:
diff --git a/README.md b/README.md
index 37f1403..9f864c1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
 [![PyPI version](https://badge.fury.io/py/bumblebee-status.svg)](https://badge.fury.io/py/bumblebee-status)
-[![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
+[![Tests](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml/badge.svg)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml)
+![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![CodeQL](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml)

From b752eb89348b1644a30b72f9a7f13b224bfe8b57 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:08:02 +0200
Subject: [PATCH 351/506] [doc] fix badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f864c1..ea2fdab 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
 [![PyPI version](https://badge.fury.io/py/bumblebee-status.svg)](https://badge.fury.io/py/bumblebee-status)
-[![Tests](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml/badge.svg)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml)
+[![Tests](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml)
 ![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)

From 062506f46795d0b9f61de3638f89fdef102db2e9 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:08:37 +0200
Subject: [PATCH 352/506] [doc] fix code climage badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ea2fdab..861b89c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
 [![PyPI version](https://badge.fury.io/py/bumblebee-status.svg)](https://badge.fury.io/py/bumblebee-status)
 [![Tests](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml)
-![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
+[![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![CodeQL](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/codeql-analysis.yml)

From a7dba7966426a679327ecbc273ffb17bef57b68f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 5 Aug 2022 14:30:50 +0200
Subject: [PATCH 353/506] [modules/publicip] add default route monitor

(re)add a separate thread that monitors the default route and updates
the module immediately, if the default route changes.

fixes #909
---
 bumblebee_status/modules/contrib/publicip.py | 51 +++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 89a52c8..a187cba 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -53,6 +53,18 @@ class Module(core.module.Module):
         # By default show: <ip> (<2 letter country code>)
         self._format = self.parameter("format", "{ip} ({country_code})")
 
+        self.__monitor = threading.Thread(target=self.monitor, args=())
+        self.__monitor.start()
+
+    def monitor(self):
+        current_default_route = None
+        default_route = None
+        while threading.main_thread().is_alive():
+            current_default_route = netifaces.gateways()["default"][2]
+            if current_default_route != default_route:
+                self.update()
+            time.sleep(1)
+
     def publicip(self, widget):
         if widget.get("public_ip") == None:
             return "n/a"
@@ -70,34 +82,25 @@ class Module(core.module.Module):
     def update(self):
         widget = self.widget()
 
-        self.__current_default_route = netifaces.gateways()["default"][2]
-
         try:
-            # Updates public ip information if a change to default route is detected
-            if self.__current_default_route != self.__previous_default_route:
-                # Sets __previous_default_route in preparation for next change check
-                self.__previous_default_route = self.__current_default_route
+            util.location.reset()
+            # Fetch fresh location information
+            __info = util.location.location_info()
 
-                # Refresh location information
-                util.location.reset()
+            # Contstruct coordinates string
+            __lat = "{:.2f}".format(__info["latitude"])
+            __lon = "{:.2f}".format(__info["longitude"])
+            __coords = __lat + "°N" + "," + " " + __lon + "°E"
 
-                # Fetch fresh location information
-                __info = util.location.location_info()
+            # Set widget values
+            widget.set("public_ip", __info["public_ip"])
+            widget.set("country_name", __info["country"])
+            widget.set("country_code", __info["country_code"])
+            widget.set("city_name", __info["city_name"])
+            widget.set("coordinates", __coords)
 
-                # Contstruct coordinates string
-                __lat = "{:.2f}".format(__info["latitude"])
-                __lon = "{:.2f}".format(__info["longitude"])
-                __coords = __lat + "°N" + "," + " " + __lon + "°E"
-
-                # Set widget values
-                widget.set("public_ip", __info["public_ip"])
-                widget.set("country_name", __info["country"])
-                widget.set("country_code", __info["country_code"])
-                widget.set("city_name", __info["city_name"])
-                widget.set("coordinates", __coords)
-
-                # Update widget values
-                core.event.trigger("update", [widget.module.id], redraw_only=True)
+            # Update widget values
+            core.event.trigger("update", [widget.module.id], redraw_only=True)
         except:
             widget.set("public_ip", None)
 

From 7a47e9e13dee1913dd4ae3bcaeefcc5f03acde3c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 6 Aug 2022 09:17:49 +0200
Subject: [PATCH 354/506] [module/publicip] handle netifaces errors

make sure the monitoring thread doesn't terminate when there are
netifaces errors.

see #909
---
 bumblebee_status/modules/contrib/publicip.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index a187cba..86a21d7 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -60,8 +60,13 @@ class Module(core.module.Module):
         current_default_route = None
         default_route = None
         while threading.main_thread().is_alive():
-            current_default_route = netifaces.gateways()["default"][2]
+            try:
+                current_default_route = netifaces.gateways()["default"][2]
+            except:
+                # error reading out default gw -> assume none exists
+                current_default_route = None
             if current_default_route != default_route:
+                default_route = current_default_route
                 self.update()
             time.sleep(1)
 

From 6af47dc50664f536fecc326b4c9d65e146634617 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 6 Aug 2022 10:54:08 +0200
Subject: [PATCH 355/506] [doc] update module documentation

fixes #910
---
 docs/modules.rst | 190 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 165 insertions(+), 25 deletions(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index 21a1439..c80320d 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -93,6 +93,22 @@ Shows when a key is pressed
 Parameters:
     * keys.keys: Comma-separated list of keys to monitor (defaults to "")
 
+layout
+~~~~~~
+
+Displays the current keyboard layout using libX11
+
+Requires the following library:
+    * libX11.so.6
+and python module:
+    * xkbgroup
+
+Parameters:
+    * layout-xkb.showname: Boolean that indicate whether the full name should be displayed. Defaults to false (only the symbol will be displayed)
+    * layout-xkb.show_variant: Boolean that indecates whether the variant name should be displayed. Defaults to true.
+
+.. image:: ../screenshots/layout.png
+
 layout-xkb
 ~~~~~~~~~~
 
@@ -171,7 +187,9 @@ Parameters:
     * nic.exclude: Comma-separated list of interface prefixes (supporting regular expressions) to exclude (defaults to 'lo,virbr,docker,vboxnet,veth,br,.*:avahi')
     * nic.include: Comma-separated list of interfaces to include
     * nic.states: Comma-separated list of states to show (prefix with '^' to invert - i.e. ^down -> show all devices that are not in state down)
-    * nic.format: Format string (defaults to '{intf} {state} {ip} {ssid}')
+    * nic.format: Format string (defaults to '{intf} {state} {ip} {ssid} {strength}')
+    * nic.strength_warning: Integer to set the threshold for warning state (defaults to 50)
+    * nic.strength_critical: Integer to set the threshold for critical state (defaults to 30)
 
 .. image:: ../screenshots/nic.png
 
@@ -206,6 +224,20 @@ Parameters:
       Note: If the left and right channels have different volumes, the limit might not be reached exactly.
     * pulseaudio.showbars: 1 for showing volume bars, requires --markup=pango;
       0 for not showing volume bars (default)
+    * pulseaudio.showdevicename: If set to 'true' (default is 'false'), the currently selected default device is shown.
+      Per default, the sink/source name returned by "pactl list sinks short" is used as display name.
+
+      As this name is usually not particularly nice (e.g "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo"),
+      its possible to map the name to more a user friendly name.
+
+      e.g to map "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" to the name "Headset", add the following
+      bumblebee-status config entry: pulseaudio.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=Headset
+
+      Furthermore its possible to specify individual (unicode) icons for all sinks/sources. e.g in order to use the icon 🎧 for the
+      "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" sink, add the following bumblebee-status config entry:
+      pulseaudio.icon.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=🎧
+    * Per default a left mouse button click mutes/unmutes the device. In case you want to open a dropdown menu to change the current
+      default device add the following config entry to your bumblebee-status config: pulseaudio.left-click=select_default_device_popup
 
 Requires the following executable:
     * pulseaudio
@@ -391,6 +423,8 @@ Requires the following executable:
 
 contributed by `lucassouto <https://github.com/lucassouto>`_ - many thanks!
 
+.. image:: ../screenshots/arch-update.png
+
 arch_update
 ~~~~~~~~~~~
 
@@ -401,10 +435,8 @@ Requires the following executable:
 
 contributed by `lucassouto <https://github.com/lucassouto>`_ - many thanks!
 
-.. image:: ../screenshots/arch-update.png
-
 aur-update
-~~~~~~~~~~~
+~~~~~~~~~~
 
 Check updates for AUR.
 
@@ -486,6 +518,26 @@ Parameters:
 
 contributed by `martindoublem <https://github.com/martindoublem>`_ - many thanks!
 
+blugon
+~~~~~~
+
+Displays temperature of blugon and Controls it.
+
+Use wheel up and down to change temperature, middle click to toggle and right click to reset temperature.
+
+Default Values:
+    * Minimum temperature: 1000 (red)
+    * Maximum temperature: 20000 (blue)
+    * Default temperature: 6600
+
+Requires the following executable:
+    * blugon
+
+Parameters:
+    * blugon.step: The amount of increase/decrease on scroll (default: 200)
+
+contributed by `DTan13 <https://github.com/DTan13>`
+
 brightness
 ~~~~~~~~~~
 
@@ -750,10 +802,34 @@ Requires the following executable:
 Parameters:
     * emerge_status.format: Format string (defaults to '{current}/{total} {action} {category}/{pkg}')
 
-This code is based on `emerge_status module from p3status <https://github.com/ultrabug/py3status/blob/master/py3status/modules/emerge_status.py>`_ original created by `AnwariasEu <https://github.com/AnwariasEu>`_.
+This code is based on emerge_status module from p3status [1] original created by AnwariasEu.
+
+[1] https://github.com/ultrabug/py3status/blob/master/py3status/modules/emerge_status.py 
 
 .. image:: ../screenshots/emerge_status.png
 
+gcalendar
+~~~~~~~~~
+
+Displays first upcoming event in google calendar.
+
+Events that are set as 'all-day' will not be shown.
+
+Requires credentials.json from a google api application where the google calendar api is installed.
+On first time run the browser will open and google will ask for permission for this app to access the google calendar and then save a .gcalendar_token.json file to the credentials_path directory which stores this permission.
+
+A refresh is done every 15 minutes.
+
+Parameters:
+    * gcalendar.time_format: Format time output. Defaults to "%H:%M".
+    * gcalendar.date_format: Format date output. Defaults to "%d.%m.%y".
+    * gcalendar.credentials_path: Path to credentials.json. Defaults to "~/".
+
+Requires these pip packages:
+   * google-api-python-client 
+   * google-auth-httplib2 
+   * google-auth-oauthlib
+
 getcrypto
 ~~~~~~~~~
 
@@ -860,18 +936,6 @@ contributed by `pierre87 <https://github.com/pierre87>`_ - many thanks!
 
 .. image:: ../screenshots/kernel.png
 
-layout
-~~~~~~
-
-Displays and changes the current keyboard layout
-
-Requires the following executable:
-    * setxkbmap
-
-contributed by `Pseudonick47 <https://github.com/Pseudonick47>`_ - many thanks!
-
-.. image:: ../screenshots/layout.png
-
 layout-xkbswitch
 ~~~~~~~~~~~~~~~~
 
@@ -998,6 +1062,15 @@ contributed by `alrayyes <https://github.com/alrayyes>`_ - many thanks!
 
 .. image:: ../screenshots/mpd.png
 
+network
+~~~~~~~
+
+A module to show the currently active network connection (ethernet or wifi) and connection strength if the connection is wireless.
+
+Requires the Python netifaces package and iw installed on Linux.
+
+A simpler take on nic and network_traffic. No extra config necessary!
+
 network_traffic
 ~~~~~~~~~~~~~~~
 
@@ -1030,12 +1103,16 @@ Displays GPU name, temperature and memory usage.
 
 Parameters:
    * nvidiagpu.format: Format string (defaults to '{name}: {temp}°C %{usedmem}/{totalmem} MiB')
-     Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem}
+     Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem} {gpu_usage_pct} {mem_usage_pct} {mem_io_pct}
 
 Requires nvidia-smi
 
 contributed by `RileyRedpath <https://github.com/RileyRedpath>`_ - many thanks!
 
+Note: mem_io_pct is (from `man nvidia-smi`):
+> Percent of time over the past sample period during which global (device)
+> memory was being read or written.
+
 octoprint
 ~~~~~~~~~
 
@@ -1053,6 +1130,14 @@ Parameters:
 
 contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 
+optman
+~~~~~~
+
+Displays currently active gpu by optimus-manager
+Requires the following packages:
+
+    * optimus-manager
+
 pacman
 ~~~~~~
 
@@ -1069,6 +1154,31 @@ contributed by `Pseudonick47 <https://github.com/Pseudonick47>`_ - many thanks!
 
 .. image:: ../screenshots/pacman.png
 
+pamixer
+~~~~~~~
+
+get volume level or control it
+
+Requires the following executable:
+    * pamixer
+
+Parameters:
+    * pamixer.percent_change: How much to change volume by when scrolling on the module (default is 4%)
+
+heavily based on amixer module
+
+persian_date
+~~~~~~~~~~~~
+
+Displays the current date and time in Persian(Jalali) Calendar.
+
+Requires the following python packages:
+    * jdatetime
+
+Parameters:
+    * datetime.format: strftime()-compatible formatting string. default: "%A %d %B" e.g., "جمعه ۱۳ اسفند"
+    * datetime.locale: locale to use. default: "fa_IR"
+
 pihole
 ~~~~~~
 
@@ -1094,7 +1204,7 @@ Parameters:
     * playerctl.layout:   Comma-separated list to change order of widgets (defaults to song, previous, pause, next)
       Widget names are: playerctl.song, playerctl.prev, playerctl.pause, playerctl.next
     * playerctl.args:     The arguments added to playerctl.
-      You can check 'playerctl --help' or `its readme <https://github.com/altdesktop/playerctl#using-the-cli>`_. For example, it could be '-p vlc,%any'.
+      You can check 'playerctl --help' or `its README <https://github.com/altdesktop/playerctl#using-the-cli>`_. For example, it could be '-p vlc,%any'.
     * playerctl.hide:   Hide the widgets when no players are found. Defaults to "false".
 
 Parameters are inspired by the `spotify` module, many thanks to its developers!
@@ -1183,7 +1293,29 @@ contributed by `remi-dupre <https://github.com/remi-dupre>`_ - many thanks!
 publicip
 ~~~~~~~~
 
-Displays public IP address
+Displays information about the public IP address associated with the default route:
+    * Public IP address
+    * Country Name
+    * Country Code
+    * City Name
+    * Geographic Coordinates
+
+Left mouse click on the widget forces immediate update
+Any change to the default route will cause the widget to update
+
+Requirements:
+    * netifaces
+
+Parameters:
+    * publicip.format: Format string (defaults to ‘{ip} ({country_code})’)
+    * Available format strings - ip, country_name, country_code, city_name, coordinates
+
+Examples:
+    * bumblebee-status -m publicip -p publicip.format="{ip} ({country_code})"
+    * bumblebee-status -m publicip -p publicip.format="{ip} which is in {city_name}"
+    * bumblebee-status -m publicip -p publicip.format="Your packets are right here: {coordinates}"
+
+contributed by `tfwiii <https://github.com/tfwiii>`_ - many thanks!
 
 rofication
 ~~~~~~~~~~
@@ -1225,9 +1357,7 @@ sensors
 Displays sensor temperature
 
 Parameters:
-    * sensors.use_sensors: whether to use the 'sensors' command.
-      If set to 'false', the sysfs-interface at '/sys/class/thermal' is used.
-      If not set, 'sensors' will be used if available.
+    * sensors.use_sensors: whether to use the sensors command
     * sensors.path: path to temperature file (default /sys/class/thermal/thermal_zone0/temp).
     * sensors.json: if set to 'true', interpret sensors.path as JSON 'path' in the output
       of 'sensors -j' (i.e. <key1>/<key2>/.../<value>), for example, path could
@@ -1307,6 +1437,16 @@ Parameters:
     * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
     * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. 
 
+solaar
+~~~~~~
+
+Shows status and load percentage of logitech's unifying device
+
+Requires the following executable:
+    * solaar (from community)
+
+contributed by `cambid <https://github.com/cambid>`_ - many thanks!
+
 spaceapi
 ~~~~~~~~
 
@@ -1413,8 +1553,7 @@ Parameters:
         * system.lock: specify a command for locking the screen (defaults to 'i3exit lock')
         * system.suspend: specify a command for suspending (defaults to 'i3exit suspend')
         * system.hibernate: specify a command for hibernating (defaults to 'i3exit hibernate')
-        * system.popupcmd: specify a command to run instead of opening the default menu
-        
+
 Requirements:
         tkinter (python3-tk package on debian based systems either you can install it as python package)
 
@@ -1475,6 +1614,7 @@ Parameters:
     * title.max : Maximum character length for title before truncating. Defaults to 64.
     * title.placeholder : Placeholder text to be placed if title was truncated. Defaults to '...'.
     * title.scroll : Boolean flag for scrolling title. Defaults to False
+    * title.short : Boolean flag for short title. Defaults to False
 
 
 contributed by `UltimatePancake <https://github.com/UltimatePancake>`_ - many thanks!

From 470f05150d3c69631644885cda62d3a90a1fbae8 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 7 Aug 2022 10:32:28 +0200
Subject: [PATCH 356/506] [module/redshift] allow adjusting the color
 temperature

add a boolean flag ("adjust") to redshift that allows the user to have
bumblebee-status actually perform the color adjustment (by invoking
redshift in "one-shot" node).

Note that this only updates the color value each time the redshift
module is updated (every 10s, by default), and likely will collide with
any running redshift process.

fixes #908
---
 bumblebee_status/modules/core/redshift.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/redshift.py b/bumblebee_status/modules/core/redshift.py
index d50463f..c5835cd 100644
--- a/bumblebee_status/modules/core/redshift.py
+++ b/bumblebee_status/modules/core/redshift.py
@@ -12,6 +12,7 @@ Parameters:
     * redshift.lat : latitude if location is set to 'manual'
     * redshift.lon : longitude if location is set to 'manual'
     * redshift.show_transition: information about the transitions (x% day) defaults to True
+    * redshift.adjust: set this to 'true' (defaults to false) to let bumblebee-status adjust color temperature, instead of just showing the current settings
 """
 
 import re
@@ -38,7 +39,13 @@ def get_redshift_value(module):
     if location == "manual" and (lat is None or lon is None):
         location = "geoclue2"
 
-    command = ["redshift", "-p"]
+    command = ["redshift"]
+
+    if util.format.asbool(module.parameter("adjust", "false")) == True:
+        command.extend(["-o", "-v"])
+    else:
+        command.append("-p")
+
     if location == "manual":
         command.extend(["-l", "{}:{}".format(lat, lon)])
     if location == "geoclue2":

From 2ab14d9cd30df7058b6f6863bbb47d00b3890f4c Mon Sep 17 00:00:00 2001
From: Diego Pereyra <diesphink@gmail.com>
Date: Mon, 8 Aug 2022 21:59:27 -0300
Subject: [PATCH 357/506] Fix save token (using pickle)

---
 bumblebee_status/modules/contrib/gcalendar.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index e438bdd..c88cfad 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -29,6 +29,7 @@ import core.decorators
 
 import datetime
 import os.path
+import pickle
 
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
@@ -60,7 +61,8 @@ class Module(core.module.Module):
         # created automatically when the authorization flow completes for the first
         # time.
         if os.path.exists(self.__token):
-            creds = Credentials.from_authorized_user_file(self.__token, SCOPES)
+            with open(self.__token, 'rb') as token:
+                creds = pickle.load(token)
         # If there are no (valid) credentials available, let the user log in.
         if not creds or not creds.valid:
             if creds and creds.expired and creds.refresh_token:
@@ -71,8 +73,8 @@ class Module(core.module.Module):
                 )
                 creds = flow.run_local_server(port=0)
             # Save the credentials for the next run
-            with open(self.__token, "w") as token:
-                token.write(creds.to_json())
+            with open(self.__token, 'wb') as token:
+                pickle.dump(creds, token)
 
         try:
             service = build("calendar", "v3", credentials=creds)

From 124f13075d248a4c89a1bfce2df88dbab1e44e73 Mon Sep 17 00:00:00 2001
From: Diego Pereyra <diesphink@gmail.com>
Date: Mon, 8 Aug 2022 21:59:39 -0300
Subject: [PATCH 358/506] Fix for multiple calendars

---
 bumblebee_status/modules/contrib/gcalendar.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index c88cfad..769a24b 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -102,9 +102,6 @@ class Module(core.module.Module):
                 )
                 events = events_result.get("items", [])
 
-                if not events:
-                    return "No upcoming events found."
-
                 for event in events:
                     start = dtparse(
                         event["start"].get("dateTime", event["start"].get("date"))

From 55f3085c903d7dbcce5ed45d7ca97e7dfa3cc96f Mon Sep 17 00:00:00 2001
From: Diego Pereyra <diesphink@gmail.com>
Date: Mon, 8 Aug 2022 23:09:20 -0300
Subject: [PATCH 359/506] Added support for regolith fork of rofication
 (differs on the comm protocol: \n after command, receive values on csv)

---
 bumblebee_status/modules/contrib/rofication.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/rofication.py b/bumblebee_status/modules/contrib/rofication.py
index 79e6afd..1fd5355 100644
--- a/bumblebee_status/modules/contrib/rofication.py
+++ b/bumblebee_status/modules/contrib/rofication.py
@@ -5,6 +5,10 @@
     module will have normal highlighting if there are zero notifications,
                      "warning" highlighting if there are nonzero notifications,
                      "critical" highlighting if there are any critical notifications
+
+    Parameters:
+    * rofication.regolith: Switch to regolith fork of rofication, see <https://github.com/regolith-linux/regolith-rofication>.
+
 """
 
 import core.module
@@ -20,6 +24,7 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.full_text))
         self.__critical = False
         self.__numnotifications = 0
+        self.__regolith = self.parameter("regolith", False)
 
 
     def full_text(self, widgets):
@@ -27,10 +32,16 @@ class Module(core.module.Module):
             client.connect("/tmp/rofi_notification_daemon")
             # below code will fetch two numbers in a list, e.g. ['22', '1']
             # first is total number of notifications, second is number of critical notifications
-            client.sendall(bytes("num", "utf-8"))
+            if self.__regolith:
+                client.sendall(bytes("num\n", "utf-8"))
+            else:
+                client.sendall(bytes("num", "utf-8"))
             val = client.recv(512)
             val = val.decode("utf-8")
-            l = val.split('\n',2)
+            if self.__regolith:
+                l = val.split(',',2)
+            else:
+                l = val.split('\n',2)
             self.__numnotifications = int(l[0])
             self.__critical = bool(int(l[1]))
             return self.__numnotifications

From f9cfede0d07a270dd99bd7a0cb20f542834045e7 Mon Sep 17 00:00:00 2001
From: Diego Pereyra <diesphink@gmail.com>
Date: Mon, 8 Aug 2022 23:09:20 -0300
Subject: [PATCH 360/506] Added support for regolith fork of rofication
 (differs on the comm protocol: \n after command, receive values on csv)

---
 bumblebee_status/modules/contrib/rofication.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/rofication.py b/bumblebee_status/modules/contrib/rofication.py
index 79e6afd..1fd5355 100644
--- a/bumblebee_status/modules/contrib/rofication.py
+++ b/bumblebee_status/modules/contrib/rofication.py
@@ -5,6 +5,10 @@
     module will have normal highlighting if there are zero notifications,
                      "warning" highlighting if there are nonzero notifications,
                      "critical" highlighting if there are any critical notifications
+
+    Parameters:
+    * rofication.regolith: Switch to regolith fork of rofication, see <https://github.com/regolith-linux/regolith-rofication>.
+
 """
 
 import core.module
@@ -20,6 +24,7 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.full_text))
         self.__critical = False
         self.__numnotifications = 0
+        self.__regolith = self.parameter("regolith", False)
 
 
     def full_text(self, widgets):
@@ -27,10 +32,16 @@ class Module(core.module.Module):
             client.connect("/tmp/rofi_notification_daemon")
             # below code will fetch two numbers in a list, e.g. ['22', '1']
             # first is total number of notifications, second is number of critical notifications
-            client.sendall(bytes("num", "utf-8"))
+            if self.__regolith:
+                client.sendall(bytes("num\n", "utf-8"))
+            else:
+                client.sendall(bytes("num", "utf-8"))
             val = client.recv(512)
             val = val.decode("utf-8")
-            l = val.split('\n',2)
+            if self.__regolith:
+                l = val.split(',',2)
+            else:
+                l = val.split('\n',2)
             self.__numnotifications = int(l[0])
             self.__critical = bool(int(l[1]))
             return self.__numnotifications

From 80efa64614dc7b900639f4f6adec5cf4aac233ee Mon Sep 17 00:00:00 2001
From: Diego Pereyra <diesphink@gmail.com>
Date: Wed, 10 Aug 2022 12:02:35 -0300
Subject: [PATCH 361/506] Support for locale on gcalendar

---
 bumblebee_status/modules/contrib/gcalendar.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index 769a24b..6d0f4ed 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -11,6 +11,7 @@ Parameters:
     * gcalendar.time_format: Format time output. Defaults to "%H:%M".
     * gcalendar.date_format: Format date output. Defaults to "%d.%m.%y".
     * gcalendar.credentials_path: Path to credentials.json. Defaults to "~/".
+    * gcalendar.locale: locale to use rather than the system default.
 
 Requires these pip packages:
    * google-api-python-client 
@@ -30,6 +31,7 @@ import core.decorators
 import datetime
 import os.path
 import pickle
+import locale
 
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
@@ -50,6 +52,15 @@ class Module(core.module.Module):
         self.__credentials = os.path.join(self.__credentials_path, "credentials.json")
         self.__token = os.path.join(self.__credentials_path, ".gcalendar_token.json")
 
+        l = locale.getdefaultlocale()
+        if not l or l == (None, None):
+            l = ("en_US", "UTF-8")
+        lcl = self.parameter("locale", ".".join(l))
+        try:
+            locale.setlocale(locale.LC_TIME, lcl.split("."))
+        except Exception:
+            locale.setlocale(locale.LC_TIME, ("en_US", "UTF-8"))
+
     def first_event(self, widget):
         SCOPES = ["https://www.googleapis.com/auth/calendar.readonly"]
 

From bb36f98aaa515ed116c28ae1fcb37c18dc1251a2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 11 Aug 2022 16:53:49 +0200
Subject: [PATCH 362/506] [doc] add redshift.adjust parameter

---
 docs/modules.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/modules.rst b/docs/modules.rst
index c80320d..8d40f83 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -261,6 +261,7 @@ Parameters:
     * redshift.lat : latitude if location is set to 'manual'
     * redshift.lon : longitude if location is set to 'manual'
     * redshift.show_transition: information about the transitions (x% day) defaults to True
+    * redshift.adjust: set this to 'true' (defaults to false) to let bumblebee-status adjust color temperature, instead of just showing the current settings
 
 .. image:: ../screenshots/redshift.png
 

From 2b3b9c0ca0405afb2346903e56b60bd32dd01cdd Mon Sep 17 00:00:00 2001
From: Diego Pereyra <diesphink@gmail.com>
Date: Thu, 11 Aug 2022 12:26:04 -0300
Subject: [PATCH 363/506] Undo serialization using picke, added comment on
 minimum version for google-api-python-client

---
 bumblebee_status/modules/contrib/gcalendar.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index 6d0f4ed..efaabf7 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -14,7 +14,7 @@ Parameters:
     * gcalendar.locale: locale to use rather than the system default.
 
 Requires these pip packages:
-   * google-api-python-client 
+   * google-api-python-client >= 1.8.0
    * google-auth-httplib2 
    * google-auth-oauthlib
 """
@@ -30,7 +30,6 @@ import core.decorators
 
 import datetime
 import os.path
-import pickle
 import locale
 
 from google.auth.transport.requests import Request
@@ -72,8 +71,7 @@ class Module(core.module.Module):
         # created automatically when the authorization flow completes for the first
         # time.
         if os.path.exists(self.__token):
-            with open(self.__token, 'rb') as token:
-                creds = pickle.load(token)
+            creds = Credentials.from_authorized_user_file(self.__token, SCOPES)
         # If there are no (valid) credentials available, let the user log in.
         if not creds or not creds.valid:
             if creds and creds.expired and creds.refresh_token:
@@ -84,8 +82,8 @@ class Module(core.module.Module):
                 )
                 creds = flow.run_local_server(port=0)
             # Save the credentials for the next run
-            with open(self.__token, 'wb') as token:
-                pickle.dump(creds, token)
+            with open(self.__token, "w") as token:
+                token.write(creds.to_json())
 
         try:
             service = build("calendar", "v3", credentials=creds)

From 82e55ec517d5552a1a79a5bc39366a602ee85860 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 26 Aug 2022 21:14:28 +0200
Subject: [PATCH 364/506] [modules/pulseaudio] remove "warning" if "too loud"

Falls in the "meant well, but doesn't really make sense" category: When
the volume exceeds 100%, the widget was shown in "critical" state. Some
headsets, audio cards, etc. do require a high volume setting, however.
And anyhow, it's really up to the user.

fixes #913
---
 bumblebee_status/modules/core/pulseaudio.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 98ec4d4..70acb01 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -253,8 +253,6 @@ class Module(core.module.Module):
     def state(self, widget):
         if self._mute:
             return ["warning", "muted"]
-        if int(self._left) > int(100):
-            return ["critical", "unmuted"]
         return ["unmuted"]
 
 

From 7ee9645437917bd551e9a4fd23ecb79fd4d07ed8 Mon Sep 17 00:00:00 2001
From: tfwiii <tom@watsonian.com>
Date: Tue, 30 Aug 2022 02:01:25 +0700
Subject: [PATCH 365/506] Added secondary check for potential changes in public
 IP and a small bug fix arising from reliance on util.location

Added a second check for indications of possible change of public IP address since netifaces does not properly handle all Linux routing tables (ref: http://linux-ip.net/html/routing-tables.html) which can lead to changes being missed if only looking at defauilt route. Consequently an additional check for changes to the network interface names/numbers was added to further help in identifying potentially notable changes. Note that netifaces is no longer being maintained so the underlying issue with its handling of gateways is unlikely to be resolved (https://github.com/al45tair/netifaces). An alternative would be to use direct calls to the OS like 'ip route list table all' (note the difference to 'ip route list all') but this might lead to unpredicatble results between distributions/flavours so probably best to stick with a library for now. all') but this might lead to unpredicatble results between distributions/flavours so probably best to stick with a library for now.

Introduced time.sleep(2) following calls to util.location.reset() since it can take util.location a while to update following a call to .reset() which can cause calls to .location_info() to return unpredicatable/unuseful results.
---
 bumblebee_status/modules/contrib/publicip.py | 47 +++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 86a21d7..7fba374 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -6,8 +6,8 @@ Displays information about the public IP address associated with the default rou
     * City Name
     * Geographic Coordinates
 
-Left mouse click on the widget forces immediate update
-Any change to the default route will cause the widget to update
+Left mouse click on the widget forces immediate update.
+Any change to the default route will cause the widget to update.
 
 Requirements:
     * netifaces
@@ -21,7 +21,7 @@ Examples:
     * bumblebee-status -m publicip -p publicip.format="{ip} which is in {city_name}"
     * bumblebee-status -m publicip -p publicip.format="Your packets are right here: {coordinates}"
 
-contributed by `tfwiii <https://github.com/tfwiii>`_ - many thanks!
+contributed by `tfwiii <https://github.com/tfwiii>` - many thanks!
 """
 
 import re
@@ -57,9 +57,15 @@ class Module(core.module.Module):
         self.__monitor.start()
 
     def monitor(self):
-        current_default_route = None
         default_route = None
+        interfaces = None
+        # Initially set to True to force an info update on first pass
+        information_changed = True
+
+        self.update()
+
         while threading.main_thread().is_alive():
+            # Look for any changes in the netifaces default route information
             try:
                 current_default_route = netifaces.gateways()["default"][2]
             except:
@@ -67,11 +73,32 @@ class Module(core.module.Module):
                 current_default_route = None
             if current_default_route != default_route:
                 default_route = current_default_route
+                information_changed = True
+
+            # netifaces does not check ALL routing tables which might lead to false negatives
+            # (ref: http://linux-ip.net/html/routing-tables.html) so additionally... look for
+            # any changes in the netifaces interfaces information which might also be an inticator
+            # of a change of route/external IP
+            if not information_changed: # Only check if no routing table change found
+                try:
+                    current_interfaces = netifaces.interfaces()
+                except:
+                    # error reading interfaces information -> assume none exists
+                    current_interfaces = None
+                if current_interfaces != interfaces:
+                    interfaces = current_interfaces
+                    information_changed = True
+
+            # Update either routing or interface information has changed
+            if information_changed:
+                information_changed = False
                 self.update()
+
+            # Throttle the calls to netifaces
             time.sleep(1)
 
     def publicip(self, widget):
-        if widget.get("public_ip") == None:
+        if widget.get("public_ip") is None:
             return "n/a"
         return self._format.format(
             ip=widget.get("public_ip", "-"),
@@ -83,12 +110,17 @@ class Module(core.module.Module):
 
     def __click_update(self, event):
         util.location.reset()
+        # pause to allow reset time to complete
+        time.sleep(2)
 
     def update(self):
         widget = self.widget()
 
         try:
             util.location.reset()
+            # pause to allow reset time to complete
+            time.sleep(2)
+
             # Fetch fresh location information
             __info = util.location.location_info()
 
@@ -106,11 +138,12 @@ class Module(core.module.Module):
 
             # Update widget values
             core.event.trigger("update", [widget.module.id], redraw_only=True)
-        except:
+        except Exception as ex:
             widget.set("public_ip", None)
+            print(ex)
 
     def state(self, widget):
         return widget.get("state", None)
 
 
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
\ No newline at end of file

From d5d0d6a56cec31610e30b5b7ef73008cae78a85a Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:38:48 +0200
Subject: [PATCH 366/506] [module/pulseaudio] somewhat experimental immediate
 update

try to immediately update pulseaudio, if pactl subscribe exists & allows
us to monitor update.

see #913
---
 bumblebee_status/modules/core/pulseaudio.py | 46 +++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 70acb01..22d5b07 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -33,12 +33,17 @@ Requires the following executable:
 """
 
 import re
+import os
 import logging
 import functools
+import threading
+import subprocess
+import select
 
 import core.module
 import core.widget
 import core.input
+import core.event
 
 import util.cli
 import util.graph
@@ -103,6 +108,42 @@ class Module(core.module.Module):
         for event in events:
             core.input.register(self, button=event["button"], cmd=event["action"])
 
+        self.__monitor = threading.Thread(target=self.__subscribe, args=())
+        self.__monitor.start()
+
+    def __subscribe(self):
+        self.update2()
+        core.event.trigger("update", [self.id], redraw_only=True)
+        core.event.trigger("draw")
+        try:
+            proc = subprocess.Popen("pactl subscribe",
+                stdout = subprocess.PIPE,
+                stderr = subprocess.PIPE,
+                shell = True
+            )
+        except:
+            return
+        os.set_blocking(proc.stdout.fileno(), False)
+        while threading.main_thread().is_alive():
+            r, w, e = select.select([proc.stdout], [], [], 1)
+
+            if not (r or w or e):
+                continue # timeout
+
+            line = 'test'
+            update = False
+            while line:
+                line = proc.stdout.readline().decode("ascii", errors="ignore")
+                if "client" in line:
+                    update = True
+
+            if update:
+                self.update2()
+                core.event.trigger("update", [self.id], redraw_only=True)
+                core.event.trigger("draw")
+                while proc.stdout.readline().decode("ascii", errors="ignore"):
+                    pass
+
     def set_volume(self, amount):
         util.cli.execute(
             "pactl set-{}-{} @DEFAULT_{}@ {}".format(
@@ -200,6 +241,11 @@ class Module(core.module.Module):
         return output
 
     def update(self):
+        if self.__monitor.is_alive():
+            return
+        self.update2()
+
+    def update2(self):
         try:
             self._failed = False
             channel = "sinks" if self._channel == "sink" else "sources"

From b1fd18b9afc078e6f98bea2b5ad428e91545bb0d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:50:56 +0200
Subject: [PATCH 367/506] Revert "[module/pulseaudio] somewhat experimental
 immediate update"

This reverts commit d5d0d6a56cec31610e30b5b7ef73008cae78a85a.
---
 bumblebee_status/modules/core/pulseaudio.py | 46 ---------------------
 1 file changed, 46 deletions(-)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 22d5b07..70acb01 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -33,17 +33,12 @@ Requires the following executable:
 """
 
 import re
-import os
 import logging
 import functools
-import threading
-import subprocess
-import select
 
 import core.module
 import core.widget
 import core.input
-import core.event
 
 import util.cli
 import util.graph
@@ -108,42 +103,6 @@ class Module(core.module.Module):
         for event in events:
             core.input.register(self, button=event["button"], cmd=event["action"])
 
-        self.__monitor = threading.Thread(target=self.__subscribe, args=())
-        self.__monitor.start()
-
-    def __subscribe(self):
-        self.update2()
-        core.event.trigger("update", [self.id], redraw_only=True)
-        core.event.trigger("draw")
-        try:
-            proc = subprocess.Popen("pactl subscribe",
-                stdout = subprocess.PIPE,
-                stderr = subprocess.PIPE,
-                shell = True
-            )
-        except:
-            return
-        os.set_blocking(proc.stdout.fileno(), False)
-        while threading.main_thread().is_alive():
-            r, w, e = select.select([proc.stdout], [], [], 1)
-
-            if not (r or w or e):
-                continue # timeout
-
-            line = 'test'
-            update = False
-            while line:
-                line = proc.stdout.readline().decode("ascii", errors="ignore")
-                if "client" in line:
-                    update = True
-
-            if update:
-                self.update2()
-                core.event.trigger("update", [self.id], redraw_only=True)
-                core.event.trigger("draw")
-                while proc.stdout.readline().decode("ascii", errors="ignore"):
-                    pass
-
     def set_volume(self, amount):
         util.cli.execute(
             "pactl set-{}-{} @DEFAULT_{}@ {}".format(
@@ -241,11 +200,6 @@ class Module(core.module.Module):
         return output
 
     def update(self):
-        if self.__monitor.is_alive():
-            return
-        self.update2()
-
-    def update2(self):
         try:
             self._failed = False
             channel = "sinks" if self._channel == "sink" else "sources"

From ae04cc9897d7fc385001038e0714013b6702b189 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:38:48 +0200
Subject: [PATCH 368/506] [module/pulseaudio] somewhat experimental immediate
 update

try to immediately update pulseaudio, if pactl subscribe exists & allows
us to monitor update.

see #913
---
 bumblebee_status/modules/core/pulseaudio.py | 46 +++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 70acb01..22d5b07 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -33,12 +33,17 @@ Requires the following executable:
 """
 
 import re
+import os
 import logging
 import functools
+import threading
+import subprocess
+import select
 
 import core.module
 import core.widget
 import core.input
+import core.event
 
 import util.cli
 import util.graph
@@ -103,6 +108,42 @@ class Module(core.module.Module):
         for event in events:
             core.input.register(self, button=event["button"], cmd=event["action"])
 
+        self.__monitor = threading.Thread(target=self.__subscribe, args=())
+        self.__monitor.start()
+
+    def __subscribe(self):
+        self.update2()
+        core.event.trigger("update", [self.id], redraw_only=True)
+        core.event.trigger("draw")
+        try:
+            proc = subprocess.Popen("pactl subscribe",
+                stdout = subprocess.PIPE,
+                stderr = subprocess.PIPE,
+                shell = True
+            )
+        except:
+            return
+        os.set_blocking(proc.stdout.fileno(), False)
+        while threading.main_thread().is_alive():
+            r, w, e = select.select([proc.stdout], [], [], 1)
+
+            if not (r or w or e):
+                continue # timeout
+
+            line = 'test'
+            update = False
+            while line:
+                line = proc.stdout.readline().decode("ascii", errors="ignore")
+                if "client" in line:
+                    update = True
+
+            if update:
+                self.update2()
+                core.event.trigger("update", [self.id], redraw_only=True)
+                core.event.trigger("draw")
+                while proc.stdout.readline().decode("ascii", errors="ignore"):
+                    pass
+
     def set_volume(self, amount):
         util.cli.execute(
             "pactl set-{}-{} @DEFAULT_{}@ {}".format(
@@ -200,6 +241,11 @@ class Module(core.module.Module):
         return output
 
     def update(self):
+        if self.__monitor.is_alive():
+            return
+        self.update2()
+
+    def update2(self):
         try:
             self._failed = False
             channel = "sinks" if self._channel == "sink" else "sources"

From 8d2cdebbafdb01f7ffc912555413fbc8bb9ee6e0 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 31 Aug 2022 19:05:08 +0200
Subject: [PATCH 369/506] [modules/pulseaudio] fix pactl subscribe thread

calling "draw" too early causes status line to be messed up.

see #917
---
 bumblebee_status/modules/core/pulseaudio.py | 27 +++++++--------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 22d5b07..795751e 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -113,36 +113,27 @@ class Module(core.module.Module):
 
     def __subscribe(self):
         self.update2()
-        core.event.trigger("update", [self.id], redraw_only=True)
-        core.event.trigger("draw")
+        core.event.trigger("update", [self.id], redraw_only=False)
         try:
             proc = subprocess.Popen("pactl subscribe",
                 stdout = subprocess.PIPE,
-                stderr = subprocess.PIPE,
+                stderr = subprocess.STDOUT,
                 shell = True
             )
         except:
             return
-        os.set_blocking(proc.stdout.fileno(), False)
         while threading.main_thread().is_alive():
             r, w, e = select.select([proc.stdout], [], [], 1)
 
             if not (r or w or e):
                 continue # timeout
-
-            line = 'test'
-            update = False
-            while line:
-                line = proc.stdout.readline().decode("ascii", errors="ignore")
-                if "client" in line:
-                    update = True
-
-            if update:
-                self.update2()
-                core.event.trigger("update", [self.id], redraw_only=True)
-                core.event.trigger("draw")
-                while proc.stdout.readline().decode("ascii", errors="ignore"):
-                    pass
+            # whateve we got, use it
+            self.update2()
+            core.event.trigger("update", [self.id], redraw_only=True)
+            core.event.trigger("draw")
+            os.set_blocking(proc.stdout.fileno(), False)
+            proc.stdout.read()
+            os.set_blocking(proc.stdout.fileno(), True)
 
     def set_volume(self, amount):
         util.cli.execute(

From 0f74b690cac67c597bdde15770387e9283074787 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 31 Aug 2022 19:09:04 +0200
Subject: [PATCH 370/506] [modules/publicip] add nicer logging

---
 bumblebee_status/modules/contrib/publicip.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 7fba374..ecdbb53 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -36,6 +36,9 @@ import core.decorators
 
 import util.format
 import util.location
+import logging
+
+log = logging.getLogger(__name__)
 
 
 class Module(core.module.Module):
@@ -140,10 +143,10 @@ class Module(core.module.Module):
             core.event.trigger("update", [widget.module.id], redraw_only=True)
         except Exception as ex:
             widget.set("public_ip", None)
-            print(ex)
+            logging.error(str(ex))
 
     def state(self, widget):
         return widget.get("state", None)
 
 
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
\ No newline at end of file
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 1983408e58ebdb48d463ac299c26b21bdceb5cbd Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 31 Aug 2022 19:12:05 +0200
Subject: [PATCH 371/506] [util] fix location timeouts

---
 bumblebee_status/modules/contrib/publicip.py | 4 ----
 bumblebee_status/util/location.py            | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index ecdbb53..d79c2a1 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -113,16 +113,12 @@ class Module(core.module.Module):
 
     def __click_update(self, event):
         util.location.reset()
-        # pause to allow reset time to complete
-        time.sleep(2)
 
     def update(self):
         widget = self.widget()
 
         try:
             util.location.reset()
-            # pause to allow reset time to complete
-            time.sleep(2)
 
             # Fetch fresh location information
             __info = util.location.location_info()
diff --git a/bumblebee_status/util/location.py b/bumblebee_status/util/location.py
index 1974773..9cd3a10 100644
--- a/bumblebee_status/util/location.py
+++ b/bumblebee_status/util/location.py
@@ -89,6 +89,9 @@ def __get(name):
 def reset():
     """Resets the location library, ensuring that a new query will be started"""
     global __next
+    global __data
+
+    __data = None
     __next = 0
 
 

From 978519e130709ec8a0c3f186f7eb6d8444cf9dee Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:00:06 +0200
Subject: [PATCH 372/506] [modules/pulseaudio] redraw only

make sure that we only ever redraw see #917
---
 bumblebee_status/modules/core/pulseaudio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 795751e..c21c577 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -113,7 +113,7 @@ class Module(core.module.Module):
 
     def __subscribe(self):
         self.update2()
-        core.event.trigger("update", [self.id], redraw_only=False)
+        core.event.trigger("update", [self.id], redraw_only=True)
         try:
             proc = subprocess.Popen("pactl subscribe",
                 stdout = subprocess.PIPE,

From b90346424b0615e58ac9d166d87a17cad39c4bb0 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 1 Sep 2022 21:12:21 +0200
Subject: [PATCH 373/506] [core/output] rate-limit output (see #917)

according to research (Jakob Nielsen '93), roughly 0.1s is what is
required for the user to feel "instantaneous".

based on this, rate-limit updates to only once per ~0.03s (0.1 felt
really laggy for me, so let's be conservative)
---
 bumblebee_status/core/output.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index cee579f..21f74ae 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -1,6 +1,7 @@
 import sys
 import json
 import time
+import datetime
 
 import core.theme
 import core.event
@@ -145,6 +146,7 @@ class i3(object):
         self.__content = {}
         self.__theme = theme
         self.__config = config
+        self.__previous_draw = datetime.datetime.min
         core.event.register("update", self.update)
         core.event.register("start", self.draw, "start")
         core.event.register("draw", self.draw, "statusline")
@@ -176,6 +178,14 @@ class i3(object):
             self.__content[widget_id]["minimized"] = not self.__content[widget_id]["minimized"]
 
     def draw(self, what, args=None):
+
+        if what == "statusline":
+            now = datetime.datetime.now()
+            prev = self.__previous_draw
+            self.__previous_draw = now
+            if (now - prev).total_seconds() < 0.03:
+                return
+
         cb = getattr(self, what)
         data = cb(args) if args else cb()
         if "blocks" in data:

From 40041d60802a856b8ac575fb7ebd1ba70f758e1f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 4 Sep 2022 09:41:20 +0200
Subject: [PATCH 374/506] Revert "[core/output] rate-limit output (see #917)"

(did not fix the issue)

This reverts commit b90346424b0615e58ac9d166d87a17cad39c4bb0.
---
 bumblebee_status/core/output.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 21f74ae..cee579f 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -1,7 +1,6 @@
 import sys
 import json
 import time
-import datetime
 
 import core.theme
 import core.event
@@ -146,7 +145,6 @@ class i3(object):
         self.__content = {}
         self.__theme = theme
         self.__config = config
-        self.__previous_draw = datetime.datetime.min
         core.event.register("update", self.update)
         core.event.register("start", self.draw, "start")
         core.event.register("draw", self.draw, "statusline")
@@ -178,14 +176,6 @@ class i3(object):
             self.__content[widget_id]["minimized"] = not self.__content[widget_id]["minimized"]
 
     def draw(self, what, args=None):
-
-        if what == "statusline":
-            now = datetime.datetime.now()
-            prev = self.__previous_draw
-            self.__previous_draw = now
-            if (now - prev).total_seconds() < 0.03:
-                return
-
         cb = getattr(self, what)
         data = cb(args) if args else cb()
         if "blocks" in data:

From ee81f6198e8a0aacf4176161a1477420c00d3b1e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 4 Sep 2022 09:55:33 +0200
Subject: [PATCH 375/506] [modules/pulseaudio] rate-limit pulseaudio events

attempting a different tack: Reduce the amount of draws that are being
emitted by the pulseaudio module to max. 2/s. That hopefully increases
reactivity and at the same time keeps flickering to a minimum.

see #917
---
 bumblebee_status/modules/core/pulseaudio.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index c21c577..aa9eb3b 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -34,6 +34,7 @@ Requires the following executable:
 
 import re
 import os
+import time
 import logging
 import functools
 import threading
@@ -126,12 +127,16 @@ class Module(core.module.Module):
             r, w, e = select.select([proc.stdout], [], [], 1)
 
             if not (r or w or e):
+                self.update2()
+                core.event.trigger("update", [self.id], redraw_only=True)
+                core.event.trigger("draw")
                 continue # timeout
             # whateve we got, use it
             self.update2()
             core.event.trigger("update", [self.id], redraw_only=True)
             core.event.trigger("draw")
             os.set_blocking(proc.stdout.fileno(), False)
+            time.sleep(0.5)
             proc.stdout.read()
             os.set_blocking(proc.stdout.fileno(), True)
 

From ee9885a6010c9384d276b031e9adb23d347280be Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 4 Sep 2022 16:22:29 +0200
Subject: [PATCH 376/506] [core] fix concurrency issues

* initialize first line of output earlier (before modules are
  initialized, so that module/thread output cannot interfere)
* make sure that update and draw are protected against concurrent access
---
 bumblebee-status                            |  4 +++-
 bumblebee_status/core/output.py             | 23 ++++++++++++++-------
 bumblebee_status/modules/core/pulseaudio.py |  1 -
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index 698bcf8..e7b3ea3 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -75,6 +75,7 @@ def handle_events(config, update_lock):
 
 
 def main():
+    global started
     config = core.config.Config(sys.argv[1:])
     level = logging.DEBUG if config.debug() else logging.ERROR
     if config.logfile():
@@ -97,6 +98,8 @@ def main():
     core.input.register(None, core.input.WHEEL_UP, "i3-msg workspace prev_on_output")
     core.input.register(None, core.input.WHEEL_DOWN, "i3-msg workspace next_on_output")
 
+    core.event.trigger("start")
+
     update_lock = threading.Lock()
     event_thread = threading.Thread(target=handle_events, args=(config, update_lock, ))
     event_thread.daemon = True
@@ -127,7 +130,6 @@ def main():
     if util.format.asbool(config.get("engine.collapsible", True)) == True:
         core.input.register(None, core.input.MIDDLE_MOUSE, output.toggle_minimize)
 
-    core.event.trigger("start")
     started = True
     signal.signal(10, sig_USR1_handler)
     while True:
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index cee579f..1bd5038 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -1,6 +1,7 @@
 import sys
 import json
 import time
+import threading
 
 import core.theme
 import core.event
@@ -145,6 +146,7 @@ class i3(object):
         self.__content = {}
         self.__theme = theme
         self.__config = config
+        self.__lock = threading.Lock()
         core.event.register("update", self.update)
         core.event.register("start", self.draw, "start")
         core.event.register("draw", self.draw, "statusline")
@@ -176,14 +178,15 @@ class i3(object):
             self.__content[widget_id]["minimized"] = not self.__content[widget_id]["minimized"]
 
     def draw(self, what, args=None):
-        cb = getattr(self, what)
-        data = cb(args) if args else cb()
-        if "blocks" in data:
-            sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
-        if "suffix" in data:
-            sys.stdout.write(data["suffix"])
-        sys.stdout.write("\n")
-        sys.stdout.flush()
+        with self.__lock:
+            cb = getattr(self, what)
+            data = cb(args) if args else cb()
+            if "blocks" in data:
+                sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
+            if "suffix" in data:
+                sys.stdout.write(data["suffix"])
+            sys.stdout.write("\n")
+            sys.stdout.flush()
 
     def start(self):
         return {
@@ -244,6 +247,10 @@ class i3(object):
         return blocks
 
     def update(self, affected_modules=None, redraw_only=False, force=False):
+        with self.__lock:
+            self.update2(affected_modules, redraw_only, force)
+
+    def update2(self, affected_modules=None, redraw_only=False, force=False):
         now = time.time()
         for module in self.__modules:
             if affected_modules and not module.id in affected_modules:
diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index aa9eb3b..9e7150b 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -136,7 +136,6 @@ class Module(core.module.Module):
             core.event.trigger("update", [self.id], redraw_only=True)
             core.event.trigger("draw")
             os.set_blocking(proc.stdout.fileno(), False)
-            time.sleep(0.5)
             proc.stdout.read()
             os.set_blocking(proc.stdout.fileno(), True)
 

From 8d0f8a4177aa37efae3f395402b421035a76db99 Mon Sep 17 00:00:00 2001
From: FraSharp <s23265@iisve.it>
Date: Thu, 8 Sep 2022 12:11:27 +0200
Subject: [PATCH 377/506] [modules/pamixer] use -t flag to toggle mute instead
 of setting volume level to 0

Signed-off-by: FraSharp <s23265@iisve.it>
---
 bumblebee_status/modules/contrib/pamixer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/pamixer.py b/bumblebee_status/modules/contrib/pamixer.py
index 2396949..46f3bb5 100644
--- a/bumblebee_status/modules/contrib/pamixer.py
+++ b/bumblebee_status/modules/contrib/pamixer.py
@@ -49,7 +49,7 @@ class Module(core.module.Module):
             core.input.register(self, button=event["button"], cmd=event["action"])
 
     def toggle(self, event):
-        self.set_parameter("--set-level 0")
+        self.set_parameter("--toggle-mute")
 
     def increase_volume(self, event):
         self.set_parameter("--increase {}".format(self.__change))

From 87764dccf0c013f104c03396dd80f8f5e9b83bb9 Mon Sep 17 00:00:00 2001
From: Alex Kelly <kellya@arachnitech.com>
Date: Thu, 8 Sep 2022 11:06:06 -0400
Subject: [PATCH 378/506] [doc] fix missing bullet on scrolling.bounce

---
 docs/development/module.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/module.rst b/docs/development/module.rst
index 992ef05..32a653a 100644
--- a/docs/development/module.rst
+++ b/docs/development/module.rst
@@ -250,5 +250,5 @@ module using ``self.set()`` or via the CLI using the ``--parameter`` flag:
 
 - ``scrolling.width``: Integer, defaults to 30, determines the minimum width of the widgets, if ``makewide`` is specified
 - ``scrolling.makewide``: Boolean, defaults to true,  determines whether the widgets should be expanded to their minwidth
-  ``scrolling.bounce``: Boolean, defaults to true, determines whether the content should change directions when a scroll is completed, or just marquee through
+- ``scrolling.bounce``: Boolean, defaults to true, determines whether the content should change directions when a scroll is completed, or just marquee through
 

From 28601cf2b76a0faad3954f06cc74ffcf3bc3588e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 9 Sep 2022 08:39:05 +0200
Subject: [PATCH 379/506] Revert "Merge branch '917-event-based-pulseaudio'"

This reverts commit 72a888748e581ef11b31442b21b654ad31cda9bd, reversing
changes made to d57ef9364a742b5458deeb773908f793e1581807.

This merge causes really high CPU load if using both pasink and
pasource, because those two modules trigger each other, and there's not
a terrible lot I can do about that, unfortunately.
---
 bumblebee-status                            |  4 +-
 bumblebee_status/core/output.py             | 23 ++++--------
 bumblebee_status/modules/core/pulseaudio.py | 41 ---------------------
 3 files changed, 9 insertions(+), 59 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index e7b3ea3..698bcf8 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -75,7 +75,6 @@ def handle_events(config, update_lock):
 
 
 def main():
-    global started
     config = core.config.Config(sys.argv[1:])
     level = logging.DEBUG if config.debug() else logging.ERROR
     if config.logfile():
@@ -98,8 +97,6 @@ def main():
     core.input.register(None, core.input.WHEEL_UP, "i3-msg workspace prev_on_output")
     core.input.register(None, core.input.WHEEL_DOWN, "i3-msg workspace next_on_output")
 
-    core.event.trigger("start")
-
     update_lock = threading.Lock()
     event_thread = threading.Thread(target=handle_events, args=(config, update_lock, ))
     event_thread.daemon = True
@@ -130,6 +127,7 @@ def main():
     if util.format.asbool(config.get("engine.collapsible", True)) == True:
         core.input.register(None, core.input.MIDDLE_MOUSE, output.toggle_minimize)
 
+    core.event.trigger("start")
     started = True
     signal.signal(10, sig_USR1_handler)
     while True:
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 1bd5038..cee579f 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -1,7 +1,6 @@
 import sys
 import json
 import time
-import threading
 
 import core.theme
 import core.event
@@ -146,7 +145,6 @@ class i3(object):
         self.__content = {}
         self.__theme = theme
         self.__config = config
-        self.__lock = threading.Lock()
         core.event.register("update", self.update)
         core.event.register("start", self.draw, "start")
         core.event.register("draw", self.draw, "statusline")
@@ -178,15 +176,14 @@ class i3(object):
             self.__content[widget_id]["minimized"] = not self.__content[widget_id]["minimized"]
 
     def draw(self, what, args=None):
-        with self.__lock:
-            cb = getattr(self, what)
-            data = cb(args) if args else cb()
-            if "blocks" in data:
-                sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
-            if "suffix" in data:
-                sys.stdout.write(data["suffix"])
-            sys.stdout.write("\n")
-            sys.stdout.flush()
+        cb = getattr(self, what)
+        data = cb(args) if args else cb()
+        if "blocks" in data:
+            sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
+        if "suffix" in data:
+            sys.stdout.write(data["suffix"])
+        sys.stdout.write("\n")
+        sys.stdout.flush()
 
     def start(self):
         return {
@@ -247,10 +244,6 @@ class i3(object):
         return blocks
 
     def update(self, affected_modules=None, redraw_only=False, force=False):
-        with self.__lock:
-            self.update2(affected_modules, redraw_only, force)
-
-    def update2(self, affected_modules=None, redraw_only=False, force=False):
         now = time.time()
         for module in self.__modules:
             if affected_modules and not module.id in affected_modules:
diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 9e7150b..70acb01 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -33,18 +33,12 @@ Requires the following executable:
 """
 
 import re
-import os
-import time
 import logging
 import functools
-import threading
-import subprocess
-import select
 
 import core.module
 import core.widget
 import core.input
-import core.event
 
 import util.cli
 import util.graph
@@ -109,36 +103,6 @@ class Module(core.module.Module):
         for event in events:
             core.input.register(self, button=event["button"], cmd=event["action"])
 
-        self.__monitor = threading.Thread(target=self.__subscribe, args=())
-        self.__monitor.start()
-
-    def __subscribe(self):
-        self.update2()
-        core.event.trigger("update", [self.id], redraw_only=True)
-        try:
-            proc = subprocess.Popen("pactl subscribe",
-                stdout = subprocess.PIPE,
-                stderr = subprocess.STDOUT,
-                shell = True
-            )
-        except:
-            return
-        while threading.main_thread().is_alive():
-            r, w, e = select.select([proc.stdout], [], [], 1)
-
-            if not (r or w or e):
-                self.update2()
-                core.event.trigger("update", [self.id], redraw_only=True)
-                core.event.trigger("draw")
-                continue # timeout
-            # whateve we got, use it
-            self.update2()
-            core.event.trigger("update", [self.id], redraw_only=True)
-            core.event.trigger("draw")
-            os.set_blocking(proc.stdout.fileno(), False)
-            proc.stdout.read()
-            os.set_blocking(proc.stdout.fileno(), True)
-
     def set_volume(self, amount):
         util.cli.execute(
             "pactl set-{}-{} @DEFAULT_{}@ {}".format(
@@ -236,11 +200,6 @@ class Module(core.module.Module):
         return output
 
     def update(self):
-        if self.__monitor.is_alive():
-            return
-        self.update2()
-
-    def update2(self):
         try:
             self._failed = False
             channel = "sinks" if self._channel == "sink" else "sources"

From f4bd0fba0b7f0b4a0dc3a9b7715471d05ccf9ac0 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 9 Sep 2022 20:58:59 +0200
Subject: [PATCH 380/506] [core] fix concurrency issues

* initialize first line of output earlier (before modules are
  initialized, so that module/thread output cannot interfere)
* make sure that update and draw are protected against concurrent access
---
 bumblebee-status                |  5 ++++-
 bumblebee_status/core/output.py | 23 +++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index 698bcf8..4a9f7fb 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -75,6 +75,8 @@ def handle_events(config, update_lock):
 
 
 def main():
+    global started
+
     config = core.config.Config(sys.argv[1:])
     level = logging.DEBUG if config.debug() else logging.ERROR
     if config.logfile():
@@ -97,6 +99,8 @@ def main():
     core.input.register(None, core.input.WHEEL_UP, "i3-msg workspace prev_on_output")
     core.input.register(None, core.input.WHEEL_DOWN, "i3-msg workspace next_on_output")
 
+    core.event.trigger("start")
+
     update_lock = threading.Lock()
     event_thread = threading.Thread(target=handle_events, args=(config, update_lock, ))
     event_thread.daemon = True
@@ -127,7 +131,6 @@ def main():
     if util.format.asbool(config.get("engine.collapsible", True)) == True:
         core.input.register(None, core.input.MIDDLE_MOUSE, output.toggle_minimize)
 
-    core.event.trigger("start")
     started = True
     signal.signal(10, sig_USR1_handler)
     while True:
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index cee579f..1bd5038 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -1,6 +1,7 @@
 import sys
 import json
 import time
+import threading
 
 import core.theme
 import core.event
@@ -145,6 +146,7 @@ class i3(object):
         self.__content = {}
         self.__theme = theme
         self.__config = config
+        self.__lock = threading.Lock()
         core.event.register("update", self.update)
         core.event.register("start", self.draw, "start")
         core.event.register("draw", self.draw, "statusline")
@@ -176,14 +178,15 @@ class i3(object):
             self.__content[widget_id]["minimized"] = not self.__content[widget_id]["minimized"]
 
     def draw(self, what, args=None):
-        cb = getattr(self, what)
-        data = cb(args) if args else cb()
-        if "blocks" in data:
-            sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
-        if "suffix" in data:
-            sys.stdout.write(data["suffix"])
-        sys.stdout.write("\n")
-        sys.stdout.flush()
+        with self.__lock:
+            cb = getattr(self, what)
+            data = cb(args) if args else cb()
+            if "blocks" in data:
+                sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
+            if "suffix" in data:
+                sys.stdout.write(data["suffix"])
+            sys.stdout.write("\n")
+            sys.stdout.flush()
 
     def start(self):
         return {
@@ -244,6 +247,10 @@ class i3(object):
         return blocks
 
     def update(self, affected_modules=None, redraw_only=False, force=False):
+        with self.__lock:
+            self.update2(affected_modules, redraw_only, force)
+
+    def update2(self, affected_modules=None, redraw_only=False, force=False):
         now = time.time()
         for module in self.__modules:
             if affected_modules and not module.id in affected_modules:

From cc910f1198fa8a9b3702d72046c9fe4d7637a56a Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 9 Sep 2022 21:21:09 +0200
Subject: [PATCH 381/506] [modules/pulsectl] add preliminary version of
 event-based pulseaudio

add a new module based on pulsectl, with pulsein for microphone and
pulseout for speakers.

should eventually become a drop-in replacement for pasink and pasource.

see #917
---
 bumblebee_status/modules/core/pulsectl.py | 44 +++++++++++++++++++++++
 bumblebee_status/modules/core/pulsein.py  |  9 +++++
 bumblebee_status/modules/core/pulseout.py |  9 +++++
 themes/icons/ascii.json                   | 16 +++++++++
 themes/icons/awesome-fonts.json           | 18 +++++++++-
 5 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 bumblebee_status/modules/core/pulsectl.py
 create mode 100644 bumblebee_status/modules/core/pulsein.py
 create mode 100644 bumblebee_status/modules/core/pulseout.py

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
new file mode 100644
index 0000000..70fc356
--- /dev/null
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -0,0 +1,44 @@
+# pylint: disable=C0111,R0903
+
+import pulsectl
+
+import core.module
+import core.widget
+import core.decorators
+import core.input
+import core.event
+
+class Module(core.module.Module):
+    def __init__(self, config, theme, type):
+        super().__init__(config, theme, core.widget.Widget(self.display))
+        self.background = True
+
+        self.__type = type
+        self.__volume = "n/a"
+        self.__muted = False
+
+        self.process(None)
+
+    def display(self, _):
+        return f"{int(self.__volume*100)}%"
+
+    def process(self, _):
+        with pulsectl.Pulse(self.id + "proc") as pulse:
+            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[0]
+            self.__volume = dev.volume.value_flat
+            self.__muted = dev.mute
+        core.event.trigger("update", [self.id], redraw_only=True)
+        core.event.trigger("draw")
+
+    def update(self):
+        with pulsectl.Pulse(self.id) as pulse:
+            pulse.event_mask_set(self.__type)
+            pulse.event_callback_set(self.process)
+            pulse.event_listen()
+
+    def state(self, _):
+        if self.__muted:
+            return ["warning", "muted"]
+        return ["unmuted"]
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/bumblebee_status/modules/core/pulsein.py b/bumblebee_status/modules/core/pulsein.py
new file mode 100644
index 0000000..0034dd0
--- /dev/null
+++ b/bumblebee_status/modules/core/pulsein.py
@@ -0,0 +1,9 @@
+from .pulsectl import Module
+
+
+class Module(Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, "source")
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/bumblebee_status/modules/core/pulseout.py b/bumblebee_status/modules/core/pulseout.py
new file mode 100644
index 0000000..31fecec
--- /dev/null
+++ b/bumblebee_status/modules/core/pulseout.py
@@ -0,0 +1,9 @@
+from .pulsectl import Module
+
+
+class Module(Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, "sink")
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index 77ef931..089fa3c 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -64,6 +64,14 @@
       "prefix": "audio"
     }
   },
+  "pulseout": {
+    "muted": {
+      "prefix": "audio(mute)"
+    },
+    "unmuted": {
+      "prefix": "audio"
+    }
+  },
   "amixer": {
     "muted": {
       "prefix": "audio(mute)"
@@ -80,6 +88,14 @@
       "prefix": "mic"
     }
   },
+  "pulsein": {
+    "muted": {
+      "prefix": "mic(mute)"
+    },
+    "unmuted": {
+      "prefix": "mic"
+    }
+  },
   "nic": {
     "wireless-up": {
       "prefix": "wifi"
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index a3de1d2..acd1fc3 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -197,6 +197,14 @@
       "prefix": ""
     }
   },
+  "pulseout": {
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
+  },
   "amixer": {
     "muted": {
       "prefix": ""
@@ -213,6 +221,14 @@
       "prefix": ""
     }
   },
+  "pulsein": {
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
+  },
   "kernel": {
     "prefix": "\uf17c"
   },
@@ -707,4 +723,4 @@
   "thunderbird": {
     "prefix": ""
   }
-}
\ No newline at end of file
+}

From a1d94d4355a7553dfd9de793f4d50d7be5f072e7 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 9 Sep 2022 21:34:32 +0200
Subject: [PATCH 382/506] [modules/pulsectl] add mouse actions

add toggle mute on click and volume up/down on scroll
---
 bumblebee_status/modules/core/pulsectl.py | 48 ++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 70fc356..46f3775 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -4,10 +4,11 @@ import pulsectl
 
 import core.module
 import core.widget
-import core.decorators
 import core.input
 import core.event
 
+import util.format
+
 class Module(core.module.Module):
     def __init__(self, config, theme, type):
         super().__init__(config, theme, core.widget.Widget(self.display))
@@ -17,14 +18,57 @@ class Module(core.module.Module):
         self.__volume = "n/a"
         self.__muted = False
 
+        self.__change = util.format.asint(
+            self.parameter("percent_change", "2%").strip("%"), 0, 100
+        )
+
+        events = [
+            {
+                "type": "mute",
+                "action": self.toggle_mute,
+                "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"])
+
         self.process(None)
 
     def display(self, _):
         return f"{int(self.__volume*100)}%"
 
+    def toggle_mute(self, _):
+        with pulsectl.Pulse(self.id + "vol") as pulse:
+            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1]
+            pulse.mute(dev, not self.__muted)
+
+    def change_volume(self, amount):
+        with pulsectl.Pulse(self.id + "vol") as pulse:
+            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1]
+            vol = dev.volume
+            vol.value_flat += amount
+            pulse.volume_set(dev, vol)
+
+    def increase_volume(self, _):
+        self.change_volume(self.__change/100.0)
+
+    def decrease_volume(self, _):
+        self.change_volume(-self.__change/100.0)
+
     def process(self, _):
         with pulsectl.Pulse(self.id + "proc") as pulse:
-            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[0]
+            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1]
             self.__volume = dev.volume.value_flat
             self.__muted = dev.mute
         core.event.trigger("update", [self.id], redraw_only=True)

From 003a6efc8e6b929834ffb2a7ca419dbe5bfc8073 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 9 Sep 2022 21:40:03 +0200
Subject: [PATCH 383/506] [modules/pulsectl] figure out default devices

make sure the modules always refer to the default devices
---
 bumblebee_status/modules/core/pulsectl.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 46f3775..364156b 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -50,12 +50,12 @@ class Module(core.module.Module):
 
     def toggle_mute(self, _):
         with pulsectl.Pulse(self.id + "vol") as pulse:
-            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1]
+            dev = self.get_device(pulse)
             pulse.mute(dev, not self.__muted)
 
     def change_volume(self, amount):
         with pulsectl.Pulse(self.id + "vol") as pulse:
-            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1]
+            dev = self.get_device(pulse)
             vol = dev.volume
             vol.value_flat += amount
             pulse.volume_set(dev, vol)
@@ -66,9 +66,20 @@ class Module(core.module.Module):
     def decrease_volume(self, _):
         self.change_volume(-self.__change/100.0)
 
+    def get_device(self, pulse):
+        devs = pulse.sink_list() if self.__type == "sink" else pulse.source_list()
+        default = pulse.server_info().default_sink_name if self.__type == "sink" else pulse.server_info().default_source_name
+
+        for dev in devs:
+            if dev.name == default:
+                return dev
+        return devs[0] # fallback
+
+
+
     def process(self, _):
         with pulsectl.Pulse(self.id + "proc") as pulse:
-            dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1]
+            dev = self.get_device(pulse)
             self.__volume = dev.volume.value_flat
             self.__muted = dev.mute
         core.event.trigger("update", [self.id], redraw_only=True)

From ca6bf2e189958044f0f4de7e757cd660ec83617e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 10 Sep 2022 08:57:00 +0200
Subject: [PATCH 384/506] [modules/pulsectl] add option to automatically start
 pulseaudio

---
 bumblebee_status/modules/core/pulsectl.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 364156b..8d36646 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -7,6 +7,7 @@ import core.widget
 import core.input
 import core.event
 
+import util.cli
 import util.format
 
 class Module(core.module.Module):
@@ -43,6 +44,9 @@ class Module(core.module.Module):
         for event in events:
             core.input.register(self, button=event["button"], cmd=event["action"])
 
+        if util.format.asbool(self.parameter("autostart", False)):
+            util.cli.execute("pulseaudio --start", ignore_errors=True)
+
         self.process(None)
 
     def display(self, _):

From 20bc4b3fa6ef319b766339657095772804da3cb2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 10 Sep 2022 09:01:21 +0200
Subject: [PATCH 385/506] [modules/pulsectl] add parameter to set an upper
 limit

---
 bumblebee_status/modules/core/pulsectl.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 8d36646..f8fa6a2 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -22,6 +22,7 @@ class Module(core.module.Module):
         self.__change = util.format.asint(
             self.parameter("percent_change", "2%").strip("%"), 0, 100
         )
+        self.__limit = util.format.asint(self.parameter("limit", "0%").strip("%"), 0)
 
         events = [
             {
@@ -62,6 +63,8 @@ class Module(core.module.Module):
             dev = self.get_device(pulse)
             vol = dev.volume
             vol.value_flat += amount
+            if vol.value_flat > self.__limit/100:
+                vol.value_flat = self.__limit/100
             pulse.volume_set(dev, vol)
 
     def increase_volume(self, _):

From 025b1ec2f2f953fdd53e8fb7d4380b1e1c6c0c55 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 10 Sep 2022 09:04:52 +0200
Subject: [PATCH 386/506] [modules/pulsectl] add optional bar representation

---
 bumblebee_status/modules/core/pulsectl.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index f8fa6a2..fd2c8be 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -8,6 +8,7 @@ import core.input
 import core.event
 
 import util.cli
+import util.graph
 import util.format
 
 class Module(core.module.Module):
@@ -18,6 +19,7 @@ class Module(core.module.Module):
         self.__type = type
         self.__volume = "n/a"
         self.__muted = False
+        self.__showbars = util.format.asbool(self.parameter("showbars", False))
 
         self.__change = util.format.asint(
             self.parameter("percent_change", "2%").strip("%"), 0, 100
@@ -51,7 +53,10 @@ class Module(core.module.Module):
         self.process(None)
 
     def display(self, _):
-        return f"{int(self.__volume*100)}%"
+        res = f"{int(self.__volume*100)}%"
+        if self.__showbars:
+            res = f"{res} {util.graph.hbar(self.__volume*100)}"
+        return res
 
     def toggle_mute(self, _):
         with pulsectl.Pulse(self.id + "vol") as pulse:
@@ -63,7 +68,7 @@ class Module(core.module.Module):
             dev = self.get_device(pulse)
             vol = dev.volume
             vol.value_flat += amount
-            if vol.value_flat > self.__limit/100:
+            if self.__limit > 0 and vol.value_flat > self.__limit/100:
                 vol.value_flat = self.__limit/100
             pulse.volume_set(dev, vol)
 

From eb11c279f6e87d47f27b861ea9b7ecd8a9a5b162 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 10 Sep 2022 09:09:16 +0200
Subject: [PATCH 387/506] [modules/pulsectl] add device name mapping and
 display

---
 bumblebee_status/modules/core/pulsectl.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index fd2c8be..c60252e 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -18,8 +18,12 @@ class Module(core.module.Module):
 
         self.__type = type
         self.__volume = "n/a"
+        self.__devicename = "n/a"
         self.__muted = False
         self.__showbars = util.format.asbool(self.parameter("showbars", False))
+        self.__show_device_name = util.format.asbool(
+            self.parameter("showdevicename", False)
+        )
 
         self.__change = util.format.asint(
             self.parameter("percent_change", "2%").strip("%"), 0, 100
@@ -56,6 +60,15 @@ class Module(core.module.Module):
         res = f"{int(self.__volume*100)}%"
         if self.__showbars:
             res = f"{res} {util.graph.hbar(self.__volume*100)}"
+
+        if self.__show_device_name:
+            friendly_name = self.__devicename
+            icon = self.parameter("icon." + self.__devicename, "")
+            res = (
+                icon + " " + friendly_name + " | " + res
+                if icon != ""
+                else friendly_name + " | " + res
+            )
         return res
 
     def toggle_mute(self, _):
@@ -94,6 +107,7 @@ class Module(core.module.Module):
             dev = self.get_device(pulse)
             self.__volume = dev.volume.value_flat
             self.__muted = dev.mute
+            self.__devicename = dev.name
         core.event.trigger("update", [self.id], redraw_only=True)
         core.event.trigger("draw")
 

From a97f46c0879c5a545bc03eeae547b6121d72d36b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 10 Sep 2022 09:12:03 +0200
Subject: [PATCH 388/506] [modules/pulsectl] add documentation

---
 bumblebee_status/modules/core/pulsectl.py | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index c60252e..52d8907 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -1,5 +1,37 @@
 # pylint: disable=C0111,R0903
 
+"""Displays volume and mute status and controls for PulseAudio devices. Use wheel up and down to change volume, left click mutes, right click opens pavucontrol.
+
+Aliases: pulseout (for outputs, such as headsets, speakers), pulsein (for microphones)
+
+NOTE: Do **not** use this module directly, but rather use either pulseout or pulsein!
+NOTE2: For the parameter names below, please also use pulseout or pulsein, instead of pulsectl
+
+Parameters:
+    * pulsectl.autostart: If set to 'true' (default is 'false'), automatically starts the pulsectl daemon if it is not running
+    * pulsectl.percent_change: How much to change volume by when scrolling on the module (default is 2%)
+    * pulsectl.limit: Upper limit for setting the volume (default is 0%, which means 'no limit')
+    * pulsectl.showbars: 'true' for showing volume bars, requires --markup=pango;
+      'false' for not showing volume bars (default)
+    * pulsectl.showdevicename: If set to 'true' (default is 'false'), the currently selected default device is shown.
+      Per default, the sink/source name returned by "pactl list sinks short" is used as display name.
+
+      As this name is usually not particularly nice (e.g "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo"),
+      its possible to map the name to more a user friendly name.
+
+      e.g to map "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" to the name "Headset", add the following
+      bumblebee-status config entry: pulsectl.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=Headset
+
+      Furthermore its possible to specify individual (unicode) icons for all sinks/sources. e.g in order to use the icon 🎧 for the
+      "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" sink, add the following bumblebee-status config entry:
+      pulsectl.icon.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=🎧
+    * Per default a left mouse button click mutes/unmutes the device. In case you want to open a dropdown menu to change the current
+      default device add the following config entry to your bumblebee-status config: pulsectl.left-click=select_default_device_popup
+
+Requires the following Python module:
+    * pulsectl
+"""
+
 import pulsectl
 
 import core.module

From 2287dcab4864a2f0471d0eceaff057850f39af0c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 10 Sep 2022 09:13:55 +0200
Subject: [PATCH 389/506] [docs] add note for pulsectl being preferred over
 pulseaudio

---
 bumblebee_status/modules/core/pulseaudio.py | 2 ++
 bumblebee_status/modules/core/pulsectl.py   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 70acb01..431de10 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -2,6 +2,8 @@
 
 """Displays volume and mute status and controls for PulseAudio devices. Use wheel up and down to change volume, left click mutes, right click opens pavucontrol.
 
+!!! This module will eventually be deprecated (since it has bad performance and high CPU load) and be replaced with "pulsectl", which is a much better drop-in replacement !!!
+
 Aliases: pasink (use this to control output instead of input), pasource
 
 Parameters:
diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 52d8907..f76a38c 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -2,6 +2,8 @@
 
 """Displays volume and mute status and controls for PulseAudio devices. Use wheel up and down to change volume, left click mutes, right click opens pavucontrol.
 
+**Please prefer this module over the "pulseaudio" module, which will eventually be deprecated
+
 Aliases: pulseout (for outputs, such as headsets, speakers), pulsein (for microphones)
 
 NOTE: Do **not** use this module directly, but rather use either pulseout or pulsein!

From 910b9a896394463c78f53de9f301d132203c846b Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 10 Sep 2022 09:30:43 +0200
Subject: [PATCH 390/506] [doc] module doc update

---
 docs/modules.rst | 50 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index 8d40f83..e3a055f 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -215,6 +215,8 @@ pulseaudio
 
 Displays volume and mute status and controls for PulseAudio devices. Use wheel up and down to change volume, left click mutes, right click opens pavucontrol.
 
+!!! This module will eventually be deprecated (since it has bad performance and high CPU load) and be replaced with "pulsectl", which is a much better drop-in replacement !!!
+
 Aliases: pasink (use this to control output instead of input), pasource
 
 Parameters:
@@ -246,6 +248,42 @@ Requires the following executable:
 
 .. image:: ../screenshots/pulseaudio.png
 
+pulsectl
+~~~~~~~~
+
+Displays volume and mute status and controls for PulseAudio devices. Use wheel up and down to change volume, left click mutes, right click opens pavucontrol.
+
+**Please prefer this module over the "pulseaudio" module, which will eventually be deprecated
+
+Aliases: pulseout (for outputs, such as headsets, speakers), pulsein (for microphones)
+
+NOTE: Do **not** use this module directly, but rather use either pulseout or pulsein!
+NOTE2: For the parameter names below, please also use pulseout or pulsein, instead of pulsectl
+
+Parameters:
+    * pulsectl.autostart: If set to 'true' (default is 'false'), automatically starts the pulsectl daemon if it is not running
+    * pulsectl.percent_change: How much to change volume by when scrolling on the module (default is 2%)
+    * pulsectl.limit: Upper limit for setting the volume (default is 0%, which means 'no limit')
+    * pulsectl.showbars: 'true' for showing volume bars, requires --markup=pango;
+      'false' for not showing volume bars (default)
+    * pulsectl.showdevicename: If set to 'true' (default is 'false'), the currently selected default device is shown.
+      Per default, the sink/source name returned by "pactl list sinks short" is used as display name.
+
+      As this name is usually not particularly nice (e.g "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo"),
+      its possible to map the name to more a user friendly name.
+
+      e.g to map "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" to the name "Headset", add the following
+      bumblebee-status config entry: pulsectl.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=Headset
+
+      Furthermore its possible to specify individual (unicode) icons for all sinks/sources. e.g in order to use the icon 🎧 for the
+      "alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo" sink, add the following bumblebee-status config entry:
+      pulsectl.icon.alsa_output.usb-Logitech_Logitech_USB_Headset-00.analog-stereo=🎧
+    * Per default a left mouse button click mutes/unmutes the device. In case you want to open a dropdown menu to change the current
+      default device add the following config entry to your bumblebee-status config: pulsectl.left-click=select_default_device_popup
+
+Requires the following Python module:
+    * pulsectl
+
 redshift
 ~~~~~~~~
 
@@ -825,9 +863,10 @@ Parameters:
     * gcalendar.time_format: Format time output. Defaults to "%H:%M".
     * gcalendar.date_format: Format date output. Defaults to "%d.%m.%y".
     * gcalendar.credentials_path: Path to credentials.json. Defaults to "~/".
+    * gcalendar.locale: locale to use rather than the system default.
 
 Requires these pip packages:
-   * google-api-python-client 
+   * google-api-python-client >= 1.8.0
    * google-auth-httplib2 
    * google-auth-oauthlib
 
@@ -1301,8 +1340,8 @@ Displays information about the public IP address associated with the default rou
     * City Name
     * Geographic Coordinates
 
-Left mouse click on the widget forces immediate update
-Any change to the default route will cause the widget to update
+Left mouse click on the widget forces immediate update.
+Any change to the default route will cause the widget to update.
 
 Requirements:
     * netifaces
@@ -1316,7 +1355,7 @@ Examples:
     * bumblebee-status -m publicip -p publicip.format="{ip} which is in {city_name}"
     * bumblebee-status -m publicip -p publicip.format="Your packets are right here: {coordinates}"
 
-contributed by `tfwiii <https://github.com/tfwiii>`_ - many thanks!
+contributed by `tfwiii <https://github.com/tfwiii>` - many thanks!
 
 rofication
 ~~~~~~~~~~
@@ -1329,6 +1368,9 @@ module will have normal highlighting if there are zero notifications,
                  "warning" highlighting if there are nonzero notifications,
                  "critical" highlighting if there are any critical notifications
 
+Parameters:
+* rofication.regolith: Switch to regolith fork of rofication, see <https://github.com/regolith-linux/regolith-rofication>.
+
 rotation
 ~~~~~~~~
 

From 21cbbe685d14ce2831c1d0f3c07b18427816e563 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 11 Sep 2022 13:12:51 +0200
Subject: [PATCH 391/506] [modules/scroll] add preliminary version of scrolling
 module

add a scrolling module that can be used to scroll the whole bar to an
arbitrary number of widgets.

its parameter is "width", which determines the number of widgets to
display.

see #921
---
 bumblebee_status/core/module.py         |  9 +++++
 bumblebee_status/core/output.py         | 23 +++++++++++-
 bumblebee_status/modules/core/scroll.py | 50 +++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 bumblebee_status/modules/core/scroll.py

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 84c3ab5..56070bf 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -112,6 +112,15 @@ class Module(core.input.Object):
     def hidden(self):
         return False
 
+    """Override this to show the module even if it normally would be scrolled away
+
+    :return: True if the module should be hidden, False otherwise
+    :rtype: boolean
+    """
+
+    def scroll(self):
+        return True
+
     """Retrieve CLI/configuration parameters for this module. For example, if
     the module is called "test" and the user specifies "-p test.x=123" on the
     commandline, using self.parameter("x") retrieves the value 123.
diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index 1bd5038..b17811e 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -146,11 +146,14 @@ class i3(object):
         self.__content = {}
         self.__theme = theme
         self.__config = config
+        self.__offset = 0
         self.__lock = threading.Lock()
         core.event.register("update", self.update)
         core.event.register("start", self.draw, "start")
         core.event.register("draw", self.draw, "statusline")
         core.event.register("stop", self.draw, "stop")
+        core.event.register("output.scroll-left", self.scroll_left)
+        core.event.register("output.scroll-right", self.scroll_right)
 
     def content(self):
         return self.__content
@@ -182,7 +185,7 @@ class i3(object):
             cb = getattr(self, what)
             data = cb(args) if args else cb()
             if "blocks" in data:
-                sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
+                sys.stdout.write(json.dumps(data, default=dump_json))
             if "suffix" in data:
                 sys.stdout.write(data["suffix"])
             sys.stdout.write("\n")
@@ -223,13 +226,29 @@ class i3(object):
             blk.set("__state", state)
         return blk
 
+    def scroll_left(self):
+        if self.__offset > 0:
+            self.__offset -= 1
+
+    def scroll_right(self):
+        self.__offset += 1
+
     def blocks(self, module):
         blocks = []
         if module.minimized:
             blocks.extend(self.separator_block(module, module.widgets()[0]))
             blocks.append(self.__content_block(module, module.widgets()[0]))
+            self.__widgetcount += 1
             return blocks
+
+        width = self.__config.get("output.width", 0)
         for widget in module.widgets():
+            if module.scroll() == True and width > 0:
+                self.__widgetcount += 1
+                if self.__widgetcount-1 < self.__offset:
+                    continue
+                if self.__widgetcount-1 >= self.__offset + width:
+                    continue
             if widget.module and self.__config.autohide(widget.module.name):
                 if not any(
                     state in widget.state() for state in ["warning", "critical", "no-autohide"]
@@ -244,6 +263,7 @@ class i3(object):
             blocks.extend(self.separator_block(module, widget))
             blocks.append(self.__content_block(module, widget))
             core.event.trigger("next-widget")
+        core.event.trigger("output.done", self.__offset, self.__widgetcount)
         return blocks
 
     def update(self, affected_modules=None, redraw_only=False, force=False):
@@ -274,6 +294,7 @@ class i3(object):
 
     def statusline(self):
         blocks = []
+        self.__widgetcount = 0
         for module in self.__modules:
             blocks.extend(self.blocks(module))
         return {"blocks": blocks, "suffix": ","}
diff --git a/bumblebee_status/modules/core/scroll.py b/bumblebee_status/modules/core/scroll.py
new file mode 100644
index 0000000..44f9c5e
--- /dev/null
+++ b/bumblebee_status/modules/core/scroll.py
@@ -0,0 +1,50 @@
+# pylint: disable=C0111,R0903
+
+"""
+"""
+
+import core.module
+import core.widget
+import core.input
+import core.event
+
+import util.format
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, [])
+        self.__offset = 0
+        self.__widgetcount = 0
+        w = self.add_widget(full_text = "<")
+        core.input.register(w, button=core.input.LEFT_MOUSE, cmd=self.scroll_left)
+        w = self.add_widget(full_text = ">")
+        core.input.register(w, button=core.input.LEFT_MOUSE, cmd=self.scroll_right)
+        self.__width = util.format.asint(self.parameter("width"))
+        config.set("output.width", self.__width)
+        core.event.register("output.done", self.update_done)
+
+
+    def scroll_left(self, _):
+        if self.__offset > 0:
+            core.event.trigger("output.scroll-left")
+
+    def scroll_right(self, _):
+        if self.__offset + self.__width < self.__widgetcount:
+            core.event.trigger("output.scroll-right")
+
+    def update_done(self, offset, widgetcount):
+        self.__offset = offset
+        self.__widgetcount = widgetcount
+
+    def scroll(self):
+        return False
+
+    def state(self, widget):
+        if widget.id == self.widgets()[0].id:
+            if self.__offset == 0:
+                return ["warning"]
+        if self.__offset + self.__width >= self.__widgetcount:
+            return ["warning"]
+        return []
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 3f97ea6a39da58361792750c23eff7640d06c1d7 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 11 Sep 2022 13:16:06 +0200
Subject: [PATCH 392/506] [doc] add scroll menu

see #921
---
 bumblebee_status/modules/core/scroll.py | 5 ++++-
 docs/modules.rst                        | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/scroll.py b/bumblebee_status/modules/core/scroll.py
index 44f9c5e..33fdd7b 100644
--- a/bumblebee_status/modules/core/scroll.py
+++ b/bumblebee_status/modules/core/scroll.py
@@ -1,6 +1,9 @@
 # pylint: disable=C0111,R0903
 
-"""
+"""Displays two widgets that can be used to scroll the whole status bar
+
+Parameters:
+    * scroll.width: Width (in number of widgets) to display
 """
 
 import core.module
diff --git a/docs/modules.rst b/docs/modules.rst
index e3a055f..0f3aa15 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -303,6 +303,14 @@ Parameters:
 
 .. image:: ../screenshots/redshift.png
 
+scroll
+~~~~~~
+
+Displays two widgets that can be used to scroll the whole status bar
+
+Parameters:
+    * scroll.width: Width (in number of widgets) to display
+
 sensors2
 ~~~~~~~~
 

From c40f59f7beae4141e1241cfdcd8417c5d0ad554a Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 11 Sep 2022 16:00:35 +0200
Subject: [PATCH 393/506] [modules/scroll] edge case error

---
 bumblebee_status/modules/core/scroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/scroll.py b/bumblebee_status/modules/core/scroll.py
index 33fdd7b..b897c5b 100644
--- a/bumblebee_status/modules/core/scroll.py
+++ b/bumblebee_status/modules/core/scroll.py
@@ -46,7 +46,7 @@ class Module(core.module.Module):
         if widget.id == self.widgets()[0].id:
             if self.__offset == 0:
                 return ["warning"]
-        if self.__offset + self.__width >= self.__widgetcount:
+        elif self.__offset + self.__width >= self.__widgetcount:
             return ["warning"]
         return []
 

From 754707379a12058b4c66802c3f0545c0e634103d Mon Sep 17 00:00:00 2001
From: Alex Kelly <kellya@arachnitech.com>
Date: Mon, 12 Sep 2022 13:29:19 -0400
Subject: [PATCH 394/506] Add active-task display and scrolling

This adds an option allowing you to specify
"taskwarrior.show_active=true" in your bar configuration and will
display the current, active task id and description on the status bar, but will show the
number of pending tasks if one isn't active.

This also adds the scrolling decorator, since task descriptions can be
quite long.
---
 bumblebee_status/modules/contrib/taskwarrior.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/taskwarrior.py b/bumblebee_status/modules/contrib/taskwarrior.py
index 0d540b5..7bc4c39 100644
--- a/bumblebee_status/modules/contrib/taskwarrior.py
+++ b/bumblebee_status/modules/contrib/taskwarrior.py
@@ -27,12 +27,22 @@ class Module(core.module.Module):
         """Return a string with the number of pending tasks from TaskWarrior."""
         try:
             taskrc = self.parameter("taskrc", "~/.taskrc")
+            show_active = self.parameter("show_active", False)
             w = TaskWarrior(config_filename=taskrc)
-            pending_tasks = w.filter_tasks({"status": "pending"})
-            self.__pending_tasks = str(len(pending_tasks))
+            active_tasks = (
+                w.filter_tasks({"start.any": "", "status": "pending"}) or None
+            )
+            if show_active and active_tasks:
+                reporting_tasks = (
+                    f"{active_tasks[0]['id']} - {active_tasks[0]['description']}"
+                )
+            else:
+                reporting_tasks = len(w.filter_tasks({"status": "pending"}))
+            self.__pending_tasks = reporting_tasks
         except:
             self.__pending_tasks = "n/a"
 
+    @core.decorators.scrollable
     def output(self, _):
         """Format the task counter to output in bumblebee."""
         return "{}".format(self.__pending_tasks)

From e76a6e0ba30a86ea20e827fd166d678e34209aa2 Mon Sep 17 00:00:00 2001
From: Alex Kelly <kellya@arachnitech.com>
Date: Mon, 12 Sep 2022 13:36:05 -0400
Subject: [PATCH 395/506] [doc] update document to reflec the show_active param
 for taskwarrior

---
 docs/modules.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/modules.rst b/docs/modules.rst
index e3a055f..49d0256 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1612,6 +1612,7 @@ Requires the following library:
 
 Parameters:
     * taskwarrior.taskrc : path to the taskrc file (defaults to ~/.taskrc)
+    * taskwarrior.show_active: true/false(default) to show the active task ID and description when one is active, otherwise show the total number pending.
 
 
 contributed by `chdorb <https://github.com/chdorb>`_ - many thanks!

From 54d5e83909454972e63a4fedbec85d3d071fec45 Mon Sep 17 00:00:00 2001
From: Alex Kelly <kellya@arachnitech.com>
Date: Mon, 12 Sep 2022 13:43:10 -0400
Subject: [PATCH 396/506] [modules/taskwarrior] Update docstring with
 show.active stuff

---
 bumblebee_status/modules/contrib/taskwarrior.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/taskwarrior.py b/bumblebee_status/modules/contrib/taskwarrior.py
index 7bc4c39..9aa6157 100644
--- a/bumblebee_status/modules/contrib/taskwarrior.py
+++ b/bumblebee_status/modules/contrib/taskwarrior.py
@@ -24,7 +24,12 @@ class Module(core.module.Module):
         self.__pending_tasks = "0"
 
     def update(self):
-        """Return a string with the number of pending tasks from TaskWarrior."""
+        """Return a string with the number of pending tasks from TaskWarrior
+        or the descripton of an active task.
+
+        if show.active is set in the config, show the description of the
+        current active task, otherwise the number of pending tasks will be displayed.
+        """
         try:
             taskrc = self.parameter("taskrc", "~/.taskrc")
             show_active = self.parameter("show_active", False)
@@ -33,6 +38,8 @@ class Module(core.module.Module):
                 w.filter_tasks({"start.any": "", "status": "pending"}) or None
             )
             if show_active and active_tasks:
+                # this is using the first element of the list, if there happen
+                # to be other active tasks, they won't be displayed.
                 reporting_tasks = (
                     f"{active_tasks[0]['id']} - {active_tasks[0]['description']}"
                 )

From 5b864e4924237cbdcf3d0adc1f54dbfff18e914f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:07:49 +0200
Subject: [PATCH 397/506] [doc] add logo - thanks to kellya!

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 861b89c..7288f54 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+![bumblebee-status logo](https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg | width=100)
+(logo courtesy of [kellya](https://github.com/kellya) - thank you!)
+
 # bumblebee-status
 
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)

From 578f806504d4bb4161fae01488ddee6473e4a227 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:09:45 +0200
Subject: [PATCH 398/506] [doc] image not working?

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7288f54..b919652 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![bumblebee-status logo](https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg | width=100)
+![bumblebee-status logo](https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg)
 (logo courtesy of [kellya](https://github.com/kellya) - thank you!)
 
 # bumblebee-status

From a07f40d05104992903527f3ffc19a457ec251607 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:11:26 +0200
Subject: [PATCH 399/506] [doc] logo as img tag

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b919652..dc98656 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![bumblebee-status logo](https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg)
+<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100">
 (logo courtesy of [kellya](https://github.com/kellya) - thank you!)
 
 # bumblebee-status

From 9fe4e6c347e4cf809a505507d843cb562ab62b75 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:12:04 +0200
Subject: [PATCH 400/506] [doc] minor reformatting

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dc98656..914da48 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
-<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100">
-(logo courtesy of [kellya](https://github.com/kellya) - thank you!)
+<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100" style="display:inline">
 
 # bumblebee-status
 
+logo courtesy of [kellya](https://github.com/kellya) - thank you!
+
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)

From 84a3ebf47c0e7db14f50c341479ff1c2e5e8e0e2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:13:04 +0200
Subject: [PATCH 401/506] [doc] test

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 914da48..4e71183 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 <img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100" style="display:inline">
 
+<h1 style="display:inline">bumblebee-status</h1>
+
 # bumblebee-status
 
 logo courtesy of [kellya](https://github.com/kellya) - thank you!

From 700f977c87784079833fc530e55e5c77653761f8 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:13:52 +0200
Subject: [PATCH 402/506] [doc] play with formatting

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4e71183..69e1d82 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100" style="display:inline">
-
-<h1 style="display:inline">bumblebee-status</h1>
+<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100" style="display:inline-block"><h1 style="display:inline-block">bumblebee-status</h1>
 
 # bumblebee-status
 

From aa86ac931fdf0ddb7ef9dfaae22cdf6c8f11dd41 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:17:27 +0200
Subject: [PATCH 403/506] [doc] another attempt

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 69e1d82..b90c1d8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100" style="display:inline-block"><h1 style="display:inline-block">bumblebee-status</h1>
+<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100" style="display:inline-block">bumblebee-status
+=====================================================
 
 # bumblebee-status
 

From d158fbccbad72d7eb55185fdb4442f89e91a850e Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:18:04 +0200
Subject: [PATCH 404/506] [doc] reduce logo size a bit

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b90c1d8..27031d1 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="100" style="display:inline-block">bumblebee-status
+<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="50" style="display:inline-block">bumblebee-status
 =====================================================
 
-# bumblebee-status
-
 logo courtesy of [kellya](https://github.com/kellya) - thank you!
 
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)

From 245cacac42b9f0837134588f88741fe9fbc66572 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:19:23 +0200
Subject: [PATCH 405/506] [doc] add logo to readthedocs

---
 docs/index.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index f405d91..7ed65a3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,9 +3,11 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to bumblebee-status's documentation!
+<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="50" style="display:inline-block">Welcome to bumblebee-status's documentation!
 ============================================
 
+logo courtesy of [kellya](https://github.com/kellya) - thank you!
+
 bumblebee-status is a modular, theme-able status line generator for the
 `i3 window manager <https://i3wm.org/>`__.
 

From 5ddc0d84a34960878793b128e874da2beb7d1f39 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:26:08 +0200
Subject: [PATCH 406/506] [docs] need to figure out how to include into
 readthedocs

---
 docs/index.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 7ed65a3..f405d91 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,11 +3,9 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-<img src="https://github.com/kellya/bumblebee-status-icon/blob/main/img/bumblebee_status_rtl.svg" width="50" style="display:inline-block">Welcome to bumblebee-status's documentation!
+Welcome to bumblebee-status's documentation!
 ============================================
 
-logo courtesy of [kellya](https://github.com/kellya) - thank you!
-
 bumblebee-status is a modular, theme-able status line generator for the
 `i3 window manager <https://i3wm.org/>`__.
 

From 7e6ae7c7bef44fd8e7747e4d1bad188b36cc8e68 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:59:59 +0200
Subject: [PATCH 407/506] [themes] add plain zengarden theme

---
 themes/zengarden.json | 79 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 themes/zengarden.json

diff --git a/themes/zengarden.json b/themes/zengarden.json
new file mode 100644
index 0000000..2ee7c29
--- /dev/null
+++ b/themes/zengarden.json
@@ -0,0 +1,79 @@
+{
+	"icons": [ "paxy97", "awesome-fonts" ],
+	"defaults": {
+		"warning": {
+			"bg": "#353839",
+			"fg": "#b38a32"
+		},
+		"critical": {
+			"bg": "#353839",
+			"fg": "#d94070"
+		},
+		"default-separators": false,
+    "separator": "",
+		"separator-block-width": 2
+	},
+	"bg": "#353839",
+	"fg": "#c4b6a3",
+    "dnf": {
+        "good": {
+            "bg": "#353839",
+            "fg": "#378c5d"
+        }
+    },
+    "apt": {
+        "good": {
+            "bg": "#353839",
+            "fg": "#378c5d"
+        }
+    },
+    "battery": {
+        "charged": {
+            "bg": "#353839",
+            "fg": "#378c5d"
+        },
+        "AC": {
+            "bg": "#353839",
+            "fg": "#378c5d"
+        }
+    },
+    "bluetooth": {
+        "ON": {
+            "bg": "#353839",
+            "fg": "#378c5d"
+        }
+    },
+    "git": {
+        "modified": { "fg": "#174572" },
+        "deleted": { "fg": "#ba1d58" },
+        "new": { "fg": "#967117" }
+    },
+    "pomodoro": {
+        "paused": {
+            "bg": "#353839",
+            "fg": "#d79921"
+        },
+        "work": {
+            "bg": "#353839",
+            "fg": "#378c5d"
+        },
+        "break": {
+            "bg": "#353839",
+            "fg": "#378c5d"
+        }
+    },
+	"keys": {
+		"Key.cmd": {
+			"fg": "#477ab7"
+		},
+		"Key.shift": {
+			"fg": "#b38a32"
+		},
+		"Key.ctrl": {
+			"fg": "#377c8b"
+		},
+		"Key.alt": {
+			"fg": "#e05b1f"
+		}
+	}
+}

From 46b379815b64c52477eda35725c2917f0c1e55ab Mon Sep 17 00:00:00 2001
From: Alex Kelly <kellya@arachnitech.com>
Date: Tue, 13 Sep 2022 11:58:03 -0400
Subject: [PATCH 408/506] added logo and favicon to the conf

---
 docs/conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index 2097441..ae2e4c4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,6 +49,8 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 # a list of builtin themes.
 #
 html_theme = "sphinx_rtd_theme"
+html_logo = "https://raw.githubusercontent.com/kellya/bumblebee-status-icon/main/img/bumblebee_status_rtl.svg"
+html_favicon = "https://raw.githubusercontent.com/kellya/bumblebee-status-icon/main/img/favicon/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

From 71d65fafc6ccaca2b9888a211fe94503aa0a1c28 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 18:56:39 +0200
Subject: [PATCH 409/506] [doc] attempt to use relative paths

---
 docs/conf.py     |   4 ++--
 docs/favicon.ico | Bin 0 -> 15406 bytes
 docs/logo.png    | Bin 0 -> 14743 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 docs/favicon.ico
 create mode 100644 docs/logo.png

diff --git a/docs/conf.py b/docs/conf.py
index ae2e4c4..722e6f6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,8 +49,8 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 # a list of builtin themes.
 #
 html_theme = "sphinx_rtd_theme"
-html_logo = "https://raw.githubusercontent.com/kellya/bumblebee-status-icon/main/img/bumblebee_status_rtl.svg"
-html_favicon = "https://raw.githubusercontent.com/kellya/bumblebee-status-icon/main/img/favicon/favicon.ico"
+html_logo = "logo.png"
+html_favicon = "favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/favicon.ico b/docs/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2da8b14a78889de71003006ee5c5a1777509eb1f
GIT binary patch
literal 15406
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

literal 0
HcmV?d00001

diff --git a/docs/logo.png b/docs/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b21c23a34ec5b26f9d2e66afb6c1152f2730b73f
GIT binary patch
literal 14743
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
X|2xR}-JdS74VJ2sreZnDBIN%7USP}}

literal 0
HcmV?d00001


From 01cf02c560270373eb895d7dc3b1128f10acf131 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 19:02:12 +0200
Subject: [PATCH 410/506] [docs] transparent logo

---
 docs/logo.png | Bin 14743 -> 50895 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/logo.png b/docs/logo.png
index b21c23a34ec5b26f9d2e66afb6c1152f2730b73f..c0d96c96e05a5ba47c59baf89e89547ef0f61bf8 100644
GIT binary patch
literal 50895
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
Ay#N3J

literal 14743
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
X|2xR}-JdS74VJ2sreZnDBIN%7USP}}


From 7a1022de4657b407572629fe82836b205fed07d7 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 19:02:49 +0200
Subject: [PATCH 411/506] [docs] add logo attribution

---
 docs/index.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index f405d91..1ba4303 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,6 +9,8 @@ Welcome to bumblebee-status's documentation!
 bumblebee-status is a modular, theme-able status line generator for the
 `i3 window manager <https://i3wm.org/>`__.
 
+Logo courtesy of [kellya](https://github.com/kellya) - thank you!
+
 Focus is on:
 
  - ease of use, sane defaults (no mandatory configuration file)

From 97a022e452d6183b6e0a3cdd1b3ca09b090b7fb1 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Wed, 14 Sep 2022 21:12:01 +0200
Subject: [PATCH 412/506] [modules/pulsectl] add friendly name support

thanks to @anopheles for figuring out this is still missing
---
 bumblebee_status/modules/core/pulsectl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index f76a38c..94f6994 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -96,7 +96,7 @@ class Module(core.module.Module):
             res = f"{res} {util.graph.hbar(self.__volume*100)}"
 
         if self.__show_device_name:
-            friendly_name = self.__devicename
+            friendly_name = self.parameter(self.__devicename, self.__devicename)
             icon = self.parameter("icon." + self.__devicename, "")
             res = (
                 icon + " " + friendly_name + " | " + res

From a5e0b01e3bf3ca8521cf838bf05a9775365e3aad Mon Sep 17 00:00:00 2001
From: Alex Kelly <kellya@arachnitech.com>
Date: Thu, 15 Sep 2022 11:48:43 -0400
Subject: [PATCH 413/506] [modules/taskwarrior] add state handling

Sets one of two states:
  "stopped" - Default, no running task
  "active"  - When an active task is running.
---
 bumblebee_status/modules/contrib/taskwarrior.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bumblebee_status/modules/contrib/taskwarrior.py b/bumblebee_status/modules/contrib/taskwarrior.py
index 9aa6157..d7add1c 100644
--- a/bumblebee_status/modules/contrib/taskwarrior.py
+++ b/bumblebee_status/modules/contrib/taskwarrior.py
@@ -22,6 +22,7 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.output))
 
         self.__pending_tasks = "0"
+        self.__status = "stopped"
 
     def update(self):
         """Return a string with the number of pending tasks from TaskWarrior
@@ -43,16 +44,23 @@ class Module(core.module.Module):
                 reporting_tasks = (
                     f"{active_tasks[0]['id']} - {active_tasks[0]['description']}"
                 )
+                self.__status = "active"
             else:
                 reporting_tasks = len(w.filter_tasks({"status": "pending"}))
+                self.__status = "stopped"
             self.__pending_tasks = reporting_tasks
         except:
             self.__pending_tasks = "n/a"
+            self.__status = "stopped"
 
     @core.decorators.scrollable
     def output(self, _):
         """Format the task counter to output in bumblebee."""
         return "{}".format(self.__pending_tasks)
 
+    def state(self, widget):
+        """Return the set status to reflect state"""
+        return self.__status
+
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From c637392bd0d56c253277b8174be47bf806b2b725 Mon Sep 17 00:00:00 2001
From: Alex Kelly <kellya@arachnitech.com>
Date: Fri, 16 Sep 2022 15:36:06 -0400
Subject: [PATCH 414/506] Correct battery modules handling of critical/warning
 states

The logic for the critical/warning handling on the battery modules was
applied BEFORE the discharging-<pct> logic.  This made it  possible for
those discharging states to get applied over a critical/warning and
allow a theme to override the critical/warning colors with a state of
"discharging-10", for example.

This change moves that logic after the discharging state, so that it
will always "win" if critical or warning states are set.

This also adds the "discharging" battery state to the critical/warning
check so the state will apply if the battery is not on AC power, but
would return normal otherwise.  Meaning, if the battery is "critical"
from a percentage check, but is plugged into power, the critical state
is removed.
---
 .../modules/contrib/battery-upower.py         | 19 +++++++++++++------
 bumblebee_status/modules/contrib/battery.py   | 17 ++++++++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/bumblebee_status/modules/contrib/battery-upower.py b/bumblebee_status/modules/contrib/battery-upower.py
index 3cc9e7f..ff65acd 100644
--- a/bumblebee_status/modules/contrib/battery-upower.py
+++ b/bumblebee_status/modules/contrib/battery-upower.py
@@ -211,7 +211,9 @@ class UPowerManager:
         battery_proxy = self.bus.get_object(self.UPOWER_NAME, battery)
         battery_proxy_interface = dbus.Interface(battery_proxy, self.DBUS_PROPERTIES)
 
-        return bool(battery_proxy_interface.Get(self.UPOWER_NAME + ".Device", "IsPresent"))
+        return bool(
+            battery_proxy_interface.Get(self.UPOWER_NAME + ".Device", "IsPresent")
+        )
 
     def is_loading(self, battery):
         battery_proxy = self.bus.get_object(self.UPOWER_NAME, battery)
@@ -309,11 +311,6 @@ class Module(core.module.Module):
         if capacity < 0:
             return ["critical", "unknown"]
 
-        if capacity < int(self.parameter("critical", 10)):
-            state.append("critical")
-        elif capacity < int(self.parameter("warning", 20)):
-            state.append("warning")
-
         if widget.get("ac"):
             state.append("AC")
         else:
@@ -339,6 +336,16 @@ class Module(core.module.Module):
                     state.append("charged")
                 else:
                     state.append("charging")
+        if (
+            capacity < int(self.parameter("critical", 10))
+            and self.power.get_state(self.device) == "Discharging"
+        ):
+            state.append("critical")
+        elif (
+            capacity < int(self.parameter("warning", 20))
+            and self.power.get_state(self.device) == "Discharging"
+        ):
+            state.append("warning")
         return state
 
 
diff --git a/bumblebee_status/modules/contrib/battery.py b/bumblebee_status/modules/contrib/battery.py
index 6182f20..7c65642 100644
--- a/bumblebee_status/modules/contrib/battery.py
+++ b/bumblebee_status/modules/contrib/battery.py
@@ -180,11 +180,6 @@ class Module(core.module.Module):
             log.debug("battery state: {}".format(state))
             return ["critical", "unknown"]
 
-        if capacity < int(self.parameter("critical", 10)):
-            state.append("critical")
-        elif capacity < int(self.parameter("warning", 20)):
-            state.append("warning")
-
         if widget.get("ac"):
             state.append("AC")
         else:
@@ -209,6 +204,18 @@ class Module(core.module.Module):
                     state.append("charged")
                 else:
                     state.append("charging")
+
+        if (
+            capacity < int(self.parameter("critical", 10))
+            and self.__manager.charge_any(self._batteries) == "Discharging"
+        ):
+            state.append("critical")
+        elif (
+            capacity < int(self.parameter("warning", 20))
+            and self.__manager.charge_any(self._batteries) == "Discharging"
+        ):
+            state.append("warning")
+
         return state
 
 

From d94ee9416a5c1faa39f28817651b762050325b33 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 17 Sep 2022 16:07:05 +0200
Subject: [PATCH 415/506] [doc] various updates

---
 bumblebee_status/modules/contrib/arandr.py      | 3 +++
 bumblebee_status/modules/contrib/taskwarrior.py | 1 +
 docs/modules.rst                                | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/bumblebee_status/modules/contrib/arandr.py b/bumblebee_status/modules/contrib/arandr.py
index b207524..8328f7e 100644
--- a/bumblebee_status/modules/contrib/arandr.py
+++ b/bumblebee_status/modules/contrib/arandr.py
@@ -8,6 +8,9 @@ saved screen layout as well as toggle on/off individual connected displays.
 Parameters:
     * No configuration parameters
 
+Requires the following python modules:
+    * tkinter
+
 Requires the following executable:
     * arandr
     * xrandr
diff --git a/bumblebee_status/modules/contrib/taskwarrior.py b/bumblebee_status/modules/contrib/taskwarrior.py
index d7add1c..81040e4 100644
--- a/bumblebee_status/modules/contrib/taskwarrior.py
+++ b/bumblebee_status/modules/contrib/taskwarrior.py
@@ -5,6 +5,7 @@ Requires the following library:
 
 Parameters:
     * taskwarrior.taskrc : path to the taskrc file (defaults to ~/.taskrc)
+    * taskwarrior.show_active: true/false(default) to show the active task ID and description when one is active, otherwise show the total number pending.
 
 
 contributed by `chdorb <https://github.com/chdorb>`_ - many thanks!
diff --git a/docs/modules.rst b/docs/modules.rst
index 49d0256..85c7a6d 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -446,6 +446,9 @@ saved screen layout as well as toggle on/off individual connected displays.
 Parameters:
     * No configuration parameters
 
+Requires the following python modules:
+    * tkinter
+
 Requires the following executable:
     * arandr
     * xrandr

From e5f36053aff760a1a9f3d9a7f48a21daccd412ae Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 17 Sep 2022 16:12:29 +0200
Subject: [PATCH 416/506] [workflow] add experimental AUR release workflow

OK, so I don't know how to test this, but *theoretically*, this should
automatically push releases to AUR.
---
 .github/workflows/aurpublish.yml | 29 ++++++++++++++++++++
 PKGBUILD.template                | 45 ++++++++++++++++++++++++++++++++
 create-pkgbuild.py               | 28 ++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 .github/workflows/aurpublish.yml
 create mode 100644 PKGBUILD.template
 create mode 100644 create-pkgbuild.py

diff --git a/.github/workflows/aurpublish.yml b/.github/workflows/aurpublish.yml
new file mode 100644
index 0000000..c2ede44
--- /dev/null
+++ b/.github/workflows/aurpublish.yml
@@ -0,0 +1,29 @@
+---
+name: Upload AUR Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  aur-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+      - name: Create PKGBUILD
+        run: |
+          python ./create-pkgbuild.py > ./PKGBUILD
+      - name: Publish AUR package
+        uses: KSXGitHub/github-actions-deploy-aur@v2.5.0
+        with:
+          pkgname: bumblebee-status
+          pkgbuild: ./PKGBUILD
+          commit_username: ${{ secrets.AUR_USERNAME }}
+          commit_email: ${{ secrets.AUR_EMAIL }}
+          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          commit_message: Update AUR package
+          ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
diff --git a/PKGBUILD.template b/PKGBUILD.template
new file mode 100644
index 0000000..08b511d
--- /dev/null
+++ b/PKGBUILD.template
@@ -0,0 +1,45 @@
+# Maintainer: Tobias Witek <tobi@tobi-wan-kenobi.at>
+# Contributor: Daniel M. Capella <polycitizen@gmail.com>
+# Contributor: spookykidmm <https://github.com/spookykidmm>
+
+pkgname=bumblebee-status
+pkgver=<PKGVERSION>
+pkgrel=1
+pkgdesc='Modular, theme-able status line generator for the i3 window manager'
+arch=('any')
+url=https://github.com/tobi-wan-kenobi/bumblebee-status
+license=('MIT')
+depends=('python' 'python-netifaces' 'python-psutil' 'python-requests')
+optdepends=('xorg-xbacklight: to display a displays brightness'
+            'xorg-xset: enable/disable automatic screen locking'
+            'libnotify: enable/disable automatic screen locking'
+            'dnf: display DNF package update information'
+            'xorg-setxkbmap: display/change the current keyboard layout'
+            'redshift: display the redshifts current color'
+            'pulseaudio: control pulseaudio sink/sources'
+            'xorg-xrandr: enable/disable screen outputs'
+            'pacman: display current status of pacman'
+            'iputils: display a ping'
+            'python-i3ipc: display titlebar'
+            'fakeroot: dependency of the pacman module'
+            'python-pytz: timezone conversion for datetimetz module'
+            'python-tzlocal: retrieve system timezone for datetimetz module'
+)
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha512sums=('<SHA512SUM>')
+
+package() {
+  install -d "$pkgdir"/usr/bin \
+    "$pkgdir"/usr/share/$pkgname/bumblebee_status/{core,util} \
+    "$pkgdir"/usr/share/$pkgname/bumblebee_status/modules/{core,contrib} \
+    "$pkgdir"/usr/share/$pkgname/themes/icons
+  ln -s /usr/share/$pkgname/$pkgname "$pkgdir"/usr/bin/$pkgname
+  ln -s /usr/share/$pkgname/bumblebee-ctl "$pkgdir"/usr/bin/bumblebee-ctl
+
+  cd $pkgname-$pkgver
+  cp -a --parents $pkgname bumblebee_status/{,core/,util/,modules/core/,modules/contrib/}*.py \
+    themes/{,icons/}*.json $pkgdir/usr/share/$pkgname
+  cp -r bin $pkgdir/usr/share/$pkgname/
+
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/create-pkgbuild.py b/create-pkgbuild.py
new file mode 100644
index 0000000..0ab79e3
--- /dev/null
+++ b/create-pkgbuild.py
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+import sys
+import json
+import hashlib
+import requests
+
+rv = requests.request(
+    "GET",
+    "https://api.github.com/repos/tobi-wan-kenobi/bumblebee-status/releases/latest",
+)
+
+if rv.status_code != 200:
+    sys.exit(1)
+
+release = json.loads(rv.text)
+
+tar = requests.get(f"https://github.com/tobi-wan-kenobi/bumblebee-status/archive/{release['name']}.tar.gz")
+checksum = hashlib.sha512(tar.content).hexdigest()
+
+template = ""
+with open("./PKGBUILD.template") as f:
+    template = f.read()
+
+template = template.replace("<PKGVERSION>", release["name"].lstrip("v"))
+template = template.replace("<SHA512SUM>", checksum)
+
+print(template)

From 0151d2045115b8441c9166d7cbc06234990b2985 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 18 Sep 2022 09:04:08 +0200
Subject: [PATCH 417/506] [doc] update badges

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27031d1..96a8e99 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,13 @@
 logo courtesy of [kellya](https://github.com/kellya) - thank you!
 
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)
+![Contributors](https://img.shields.io/github/contributors-anon/tobi-wan-kenobi/bumblebee-status)
+![Commits since release](https://img.shields.io/github/commits-since/tobi-wan-kenobi/bumblebee-status/latest)
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
-[![PyPI version](https://badge.fury.io/py/bumblebee-status.svg)](https://badge.fury.io/py/bumblebee-status)
+![PyPI version](https://img.shields.io/pypi/v/bumblebee-status)
 [![Tests](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml)
+
 [![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)
 [![Test Coverage](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/coverage.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/coverage)
 [![Issue Count](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/issue_count.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)

From 38d3a6d4c4c7d6a43afab929bad40373b0e8299c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 18 Sep 2022 09:04:39 +0200
Subject: [PATCH 418/506] [doc] rearrange badges

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 96a8e99..2f41627 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@
 logo courtesy of [kellya](https://github.com/kellya) - thank you!
 
 [![Documentation Status](https://readthedocs.org/projects/bumblebee-status/badge/?version=main)](https://bumblebee-status.readthedocs.io/en/main/?badge=main)
-![Contributors](https://img.shields.io/github/contributors-anon/tobi-wan-kenobi/bumblebee-status)
 ![Commits since release](https://img.shields.io/github/commits-since/tobi-wan-kenobi/bumblebee-status/latest)
 ![AUR version (release)](https://img.shields.io/aur/version/bumblebee-status)
 ![AUR version (git)](https://img.shields.io/aur/version/bumblebee-status-git)
 ![PyPI version](https://img.shields.io/pypi/v/bumblebee-status)
+![Contributors](https://img.shields.io/github/contributors-anon/tobi-wan-kenobi/bumblebee-status)
 [![Tests](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml/badge.svg?branch=main)](https://github.com/tobi-wan-kenobi/bumblebee-status/actions/workflows/autotest.yml)
 
 [![Code Climate](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status/badges/gpa.svg)](https://codeclimate.com/github/tobi-wan-kenobi/bumblebee-status)

From 1c19250fe549c036c971d22d84c21fe3e62f48b1 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 18 Sep 2022 16:50:43 +0200
Subject: [PATCH 419/506] [core/output] fix broken output

---
 bumblebee_status/core/output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/core/output.py b/bumblebee_status/core/output.py
index b17811e..9ff3010 100644
--- a/bumblebee_status/core/output.py
+++ b/bumblebee_status/core/output.py
@@ -185,7 +185,7 @@ class i3(object):
             cb = getattr(self, what)
             data = cb(args) if args else cb()
             if "blocks" in data:
-                sys.stdout.write(json.dumps(data, default=dump_json))
+                sys.stdout.write(json.dumps(data["blocks"], default=dump_json))
             if "suffix" in data:
                 sys.stdout.write(data["suffix"])
             sys.stdout.write("\n")

From 7ec3adfa4732638d143fa0aa04ed740c662f3637 Mon Sep 17 00:00:00 2001
From: Jose Javier ALONSO MOYA <jalonsomoya@muclrnd1009.muc.amadeus.net>
Date: Tue, 20 Sep 2022 14:59:25 +0200
Subject: [PATCH 420/506] contrib/network_traffic dependency in docs

---
 docs/modules.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index c211e0c..96b8d21 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1126,7 +1126,9 @@ network_traffic
 ~~~~~~~~~~~~~~~
 
 Displays network traffic
-   * No extra configuration needed
+
+Requires the following library:
+    * netifaces
 
 contributed by `izn <https://github.com/izn>`_ - many thanks!
 

From 7ae95ad6b6f57fae2526e410bac75aa4039c5d93 Mon Sep 17 00:00:00 2001
From: Ben Westover <kwestover.kw@gmail.com>
Date: Tue, 20 Sep 2022 23:15:38 -0400
Subject: [PATCH 421/506] Don't install manpages to /usr/usr

`data_files` shouldn't have `usr/` in it; this causes the manpages to be installed to `/usr/usr/share/man/man1` instead of `/usr/share/man/man1`.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a63be64..a756c8a 100755
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
         ("share/bumblebee-status/themes", glob.glob("themes/*.json")),
         ("share/bumblebee-status/themes/icons", glob.glob("themes/icons/*.json")),
         ("share/bumblebee-status/utility", glob.glob("bin/*")),
-        ("usr/share/man/man1", glob.glob("man/*.1")),
+        ("share/man/man1", glob.glob("man/*.1")),
     ],
     packages=find_packages(exclude=["tests", "tests.*"])
 )

From 88f24100ffc89ed443e0c3d40af77ae2f2b9e46f Mon Sep 17 00:00:00 2001
From: Ramon Saraiva <ramonsaraiva@gmail.com>
Date: Tue, 27 Sep 2022 11:10:33 -0300
Subject: [PATCH 422/506] [themes] add moonlight theme (powerline)

---
 docs/themes.rst                            |   5 +++++
 screenshots/themes/moonlight-powerline.png | Bin 0 -> 11940 bytes
 themes/moonlight-powerline.json            |  24 +++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 screenshots/themes/moonlight-powerline.png
 create mode 100644 themes/moonlight-powerline.json

diff --git a/docs/themes.rst b/docs/themes.rst
index 759ea86..16f69a6 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -97,3 +97,8 @@ List of available themes
    :alt: Default
 
    Default (nothing or -t default)
+
+.. figure:: ../screenshots/themes/moonlight-powerline.png
+   :alt: Moonlight Powerline
+
+   Moonlight Powerline (-t moonlight-powerline) (contributed by `Ramon Saraiva <https://github.com/ramonsaraiva>`__)
diff --git a/screenshots/themes/moonlight-powerline.png b/screenshots/themes/moonlight-powerline.png
new file mode 100644
index 0000000000000000000000000000000000000000..025df6b55ac105e1103be2beced31669c60cd9f3
GIT binary patch
literal 11940
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
YV2-Q>kW%wQZ0CTqxPn-v$Pd5&1N{&{%>V!Z

literal 0
HcmV?d00001

diff --git a/themes/moonlight-powerline.json b/themes/moonlight-powerline.json
new file mode 100644
index 0000000..b46b96a
--- /dev/null
+++ b/themes/moonlight-powerline.json
@@ -0,0 +1,24 @@
+{
+    "icons": ["awesome-fonts"],
+    "defaults": {
+        "separator-block-width": 0,
+        "warning": {
+            "fg": "#e4f3fa",
+            "bg": "#fc7b7b"
+        },
+        "critical": {
+            "fg": "#e4f3fa",
+            "bg": "#ff5370"
+        }
+    },
+    "cycle": [
+        {
+            "fg": "#e4f3fa",
+            "bg": "#403c64"
+        },
+        {
+            "fg": "#e4f3fa",
+            "bg": "#212337"
+        }
+    ]
+}

From 61fe7f6d3e2f9df32f4a58c46b23cb626689f9a8 Mon Sep 17 00:00:00 2001
From: tfwiii <tom@watsonian.com>
Date: Thu, 6 Oct 2022 13:49:37 +0700
Subject: [PATCH 423/506] Handled fail where core.location does not provide
 values for latitude and longitude. Added handling for coordinates N, S, E, W.

---
 bumblebee_status/modules/contrib/publicip.py | 25 ++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index d79c2a1..ca0cd31 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -116,6 +116,8 @@ class Module(core.module.Module):
 
     def update(self):
         widget = self.widget()
+        __lat = None
+        __lon = None
 
         try:
             util.location.reset()
@@ -123,10 +125,23 @@ class Module(core.module.Module):
             # Fetch fresh location information
             __info = util.location.location_info()
 
-            # Contstruct coordinates string
-            __lat = "{:.2f}".format(__info["latitude"])
-            __lon = "{:.2f}".format(__info["longitude"])
-            __coords = __lat + "°N" + "," + " " + __lon + "°E"
+            # Contstruct coordinates string if util.location has provided required info
+            if __lat and __lon:
+                __lat = "{:.2f}".format(__info["latitude"])
+                __lon = "{:.2f}".format(__info["longitude"])
+                if __lat < 0:
+                    __coords = __lat + "°S"
+                else:
+                    __coords = __lat + "°N"
+                __coords += ","
+                if __lon < 0:
+                    __coords += __lon + "°W"
+                else:
+                    __coords += __lon + "°E"
+            else:
+                __lat = "Unknown"
+                __lon = "Unknown"
+                __coords = "Unknown" 
 
             # Set widget values
             widget.set("public_ip", __info["public_ip"])
@@ -139,6 +154,8 @@ class Module(core.module.Module):
             core.event.trigger("update", [widget.module.id], redraw_only=True)
         except Exception as ex:
             widget.set("public_ip", None)
+            print("OH NOES!")
+            print(__info)
             logging.error(str(ex))
 
     def state(self, widget):

From 605b749e2269a722c90ed9e5633c0e4715c41a1f Mon Sep 17 00:00:00 2001
From: tfwiii <tom@watsonian.com>
Date: Thu, 6 Oct 2022 14:21:43 +0700
Subject: [PATCH 424/506] Removed debugging prints

---
 bumblebee_status/modules/contrib/publicip.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index ca0cd31..7f91271 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -154,8 +154,6 @@ class Module(core.module.Module):
             core.event.trigger("update", [widget.module.id], redraw_only=True)
         except Exception as ex:
             widget.set("public_ip", None)
-            print("OH NOES!")
-            print(__info)
             logging.error(str(ex))
 
     def state(self, widget):

From cace02909e8e15a00def57fb0215076031581475 Mon Sep 17 00:00:00 2001
From: tfwiii <tom@watsonian.com>
Date: Sat, 8 Oct 2022 10:42:12 +0700
Subject: [PATCH 425/506] Bug fix improvements to publicip and util.location

Fixed publicip bug arising from last PR review
Simplified ip change detection code
Added pause after location.reset() call to allow completion before query
util.location - change order of information providers as default was not returning geo coords
---
 bumblebee_status/modules/contrib/publicip.py | 78 +++++++++-----------
 bumblebee_status/util/location.py            | 22 +++---
 2 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 7f91271..9a8f468 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -60,43 +60,34 @@ class Module(core.module.Module):
         self.__monitor.start()
 
     def monitor(self):
-        default_route = None
-        interfaces = None
+        __previous_ips = set()
+        __current_ips = set()
         # Initially set to True to force an info update on first pass
-        information_changed = True
+        __information_changed = True
 
         self.update()
 
         while threading.main_thread().is_alive():
-            # Look for any changes in the netifaces default route information
+            __current_ips.clear()
+            # Look for any changes to IP addresses
             try:
-                current_default_route = netifaces.gateways()["default"][2]
+                for interface in netifaces.interfaces():
+                    __current_ips.add(netifaces.ifaddresses(interface)[2][0]['addr'])
+                    
             except:
-                # error reading out default gw -> assume none exists
-                current_default_route = None
-            if current_default_route != default_route:
-                default_route = current_default_route
-                information_changed = True
+            # If not ip address information found clear __current_ips
+                __current_ips.clear()
+            
+            # If a change of any interfaces' IP then flag change
+            if __current_ips.symmetric_difference(__previous_ips):
+                __previous_ips = __current_ips.copy()
+                __information_changed = True
 
-            # netifaces does not check ALL routing tables which might lead to false negatives
-            # (ref: http://linux-ip.net/html/routing-tables.html) so additionally... look for
-            # any changes in the netifaces interfaces information which might also be an inticator
-            # of a change of route/external IP
-            if not information_changed: # Only check if no routing table change found
-                try:
-                    current_interfaces = netifaces.interfaces()
-                except:
-                    # error reading interfaces information -> assume none exists
-                    current_interfaces = None
-                if current_interfaces != interfaces:
-                    interfaces = current_interfaces
-                    information_changed = True
-
-            # Update either routing or interface information has changed
-            if information_changed:
-                information_changed = False
+            # Update if change is flagged
+            if __information_changed:
+                __information_changed = False
                 self.update()
-
+            
             # Throttle the calls to netifaces
             time.sleep(1)
 
@@ -104,11 +95,11 @@ class Module(core.module.Module):
         if widget.get("public_ip") is None:
             return "n/a"
         return self._format.format(
-            ip=widget.get("public_ip", "-"),
-            country_name=widget.get("country_name", "-"),
-            country_code=widget.get("country_code", "-"),
-            city_name=widget.get("city_name", "-"),
-            coordinates=widget.get("coordinates", "-"),
+            ip = widget.get("public_ip", "-"),
+            country_name = widget.get("country_name", "-"),
+            country_code = widget.get("country_code", "-"),
+            city_name = widget.get("city_name", "-"),
+            coordinates = widget.get("coordinates", "-"),
         )
 
     def __click_update(self, event):
@@ -116,31 +107,30 @@ class Module(core.module.Module):
 
     def update(self):
         widget = self.widget()
-        __lat = None
-        __lon = None
 
         try:
             util.location.reset()
+            time.sleep(5) # wait for reset to complete before querying results
 
             # Fetch fresh location information
             __info = util.location.location_info()
+            __raw_lat = __info["latitude"]
+            __raw_lon = __info["longitude"]
 
             # Contstruct coordinates string if util.location has provided required info
-            if __lat and __lon:
-                __lat = "{:.2f}".format(__info["latitude"])
-                __lon = "{:.2f}".format(__info["longitude"])
+            if isinstance(__raw_lat, float) and isinstance(__raw_lon, float):
+                __lat = float("{:.2f}".format(__raw_lat))
+                __lon = float("{:.2f}".format(__raw_lon))
                 if __lat < 0:
-                    __coords = __lat + "°S"
+                    __coords = str(__lat) + "°S"
                 else:
-                    __coords = __lat + "°N"
+                    __coords = str(__lat) + "°N"
                 __coords += ","
                 if __lon < 0:
-                    __coords += __lon + "°W"
+                    __coords += str(__lon) + "°W"
                 else:
-                    __coords += __lon + "°E"
+                    __coords += str(__lon) + "°E"
             else:
-                __lat = "Unknown"
-                __lon = "Unknown"
                 __coords = "Unknown" 
 
             # Set widget values
diff --git a/bumblebee_status/util/location.py b/bumblebee_status/util/location.py
index 9cd3a10..3d9494f 100644
--- a/bumblebee_status/util/location.py
+++ b/bumblebee_status/util/location.py
@@ -18,17 +18,6 @@ __document = None
 __data = {}
 __next = 0
 __sources = [
-    {
-        "url": "http://ipapi.co/json",
-        "mapping": {
-            "latitude": "latitude",
-            "longitude": "longitude",
-            "country_name": "country_name",
-            "country_code": "country_code",
-            "city": "city_name",
-            "ip": "public_ip",
-        },
-    },
     {
         "url": "http://free.ipwhois.io/json/",
         "mapping": {
@@ -51,6 +40,17 @@ __sources = [
             "query": "public_ip",
         },
     },
+    {
+        "url": "http://ipapi.co/json",
+        "mapping": {
+            "latitude": "latitude",
+            "longitude": "longitude",
+            "country_name": "country_name",
+            "country_code": "country_code",
+            "city": "city_name",
+            "ip": "public_ip",
+        },
+    }
 ]
 
 

From 697c3310a0b8be0866710d59dca434a9a437d2e0 Mon Sep 17 00:00:00 2001
From: tfwiii <tom@watsonian.com>
Date: Wed, 12 Oct 2022 13:52:55 +0700
Subject: [PATCH 426/506] publicip - Bug Fix - IP address changes wer being
 missed if an interface was present but did not have an IPv4 address
 associated with it. Added exception handling to mitigate this.

---
 bumblebee_status/modules/contrib/publicip.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 9a8f468..8ae10a0 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -72,8 +72,10 @@ class Module(core.module.Module):
             # Look for any changes to IP addresses
             try:
                 for interface in netifaces.interfaces():
-                    __current_ips.add(netifaces.ifaddresses(interface)[2][0]['addr'])
-                    
+                    try:
+                        __current_ips.add(netifaces.ifaddresses(interface)[2][0]['addr'])
+                    except:
+                        pass
             except:
             # If not ip address information found clear __current_ips
                 __current_ips.clear()

From 07e2364f7897600cd16a52212fbe4b7af5fb31b3 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 26 Nov 2022 10:11:51 +0100
Subject: [PATCH 427/506] [main] fix i3 protocol buf on error messages ("could
 not parse JSON")

Errors during startup currently cause bumblebee-status to mistakenly
output the first line of output (the "version" line) of the i3 protocol
twice, causing an error message that says "could not parse JSON")

see #940
---
 bumblebee-status | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee-status b/bumblebee-status
index 4a9f7fb..74d2afe 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -100,6 +100,7 @@ def main():
     core.input.register(None, core.input.WHEEL_DOWN, "i3-msg workspace next_on_output")
 
     core.event.trigger("start")
+    started = True
 
     update_lock = threading.Lock()
     event_thread = threading.Thread(target=handle_events, args=(config, update_lock, ))
@@ -131,7 +132,6 @@ def main():
     if util.format.asbool(config.get("engine.collapsible", True)) == True:
         core.input.register(None, core.input.MIDDLE_MOUSE, output.toggle_minimize)
 
-    started = True
     signal.signal(10, sig_USR1_handler)
     while True:
         if update_lock.acquire(blocking=False) == True:

From 0bc2c6b8e1e50ae85ccc0f97d4e98fcb1382a620 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 26 Nov 2022 10:17:09 +0100
Subject: [PATCH 428/506] [tests] remove unsupported python version

---
 .github/workflows/autotest.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 652bab0..5049462 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v3
@@ -24,7 +24,7 @@ jobs:
           cache: 'pip'
       - name: Install Ubuntu dependencies
         run: sudo apt-get install -y libdbus-1-dev libgit2-dev libvirt-dev taskwarrior
-      - name: Install Python dependencies 
+      - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -U coverage pytest pytest-mock freezegun
@@ -38,7 +38,7 @@ jobs:
       - name: Run tests
         run: |
           coverage run --source=. -m pytest tests -v
-      - name: Report coverage 
+      - name: Report coverage
         uses: paambaati/codeclimate-action@v3.0.0
         with:
           coverageCommand: coverage3 xml

From 1fef60b32c5fffce0a9242d4609eec1185a37696 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 26 Nov 2022 12:05:42 +0100
Subject: [PATCH 429/506] [tests] fix location tests

---
 bumblebee_status/util/location.py |  4 ++--
 tests/util/test_location.py       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bumblebee_status/util/location.py b/bumblebee_status/util/location.py
index 3d9494f..00ac5fd 100644
--- a/bumblebee_status/util/location.py
+++ b/bumblebee_status/util/location.py
@@ -32,8 +32,8 @@ __sources = [
     {
         "url": "http://ip-api.com/json",
         "mapping": {
-            "latitude": "lat",
-            "longitude": "lon",
+            "lat": "latitude",
+            "lon": "longitude",
             "country": "country_name",
             "countryCode": "country_code",
             "city": "city_name",
diff --git a/tests/util/test_location.py b/tests/util/test_location.py
index e04e600..b86f62e 100644
--- a/tests/util/test_location.py
+++ b/tests/util/test_location.py
@@ -14,16 +14,16 @@ def urllib_req(mocker):
 def secondaryLocation():
     return {
         "country": "Middle Earth",
-        "longitude": "10.0",
-        "latitude": "20.5",
-        "ip": "127.0.0.1",
+        "lon": "10.0",
+        "lat": "20.5",
+        "query": "127.0.0.1",
     }
 
 
 @pytest.fixture
 def primaryLocation():
     return {
-        "country_name": "Rivia",
+        "country": "Rivia",
         "longitude": "-10.0",
         "latitude": "-23",
         "ip": "127.0.0.6",
@@ -33,7 +33,7 @@ def primaryLocation():
 def test_primary_provider(urllib_req, primaryLocation):
     urllib_req.urlopen.return_value.read.return_value = json.dumps(primaryLocation)
 
-    assert util.location.country() == primaryLocation["country_name"]
+    assert util.location.country() == primaryLocation["country"]
     assert util.location.coordinates() == (
         primaryLocation["latitude"],
         primaryLocation["longitude"],
@@ -48,10 +48,10 @@ def test_secondary_provider(mocker, urllib_req, secondaryLocation):
 
     assert util.location.country() == secondaryLocation["country"]
     assert util.location.coordinates() == (
-        secondaryLocation["latitude"],
-        secondaryLocation["longitude"],
+        secondaryLocation["lat"],
+        secondaryLocation["lon"],
     )
-    assert util.location.public_ip() == secondaryLocation["ip"]
+    assert util.location.public_ip() == secondaryLocation["query"]
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 79ce2167b0f829d150c605b8f392b0ce9c828a55 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 26 Nov 2022 12:09:04 +0100
Subject: [PATCH 430/506] [autotest] update codeclimate action

---
 .github/workflows/autotest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 5049462..7b6deba 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           coverage run --source=. -m pytest tests -v
       - name: Report coverage
-        uses: paambaati/codeclimate-action@v3.0.0
+        uses: paambaati/codeclimate-action@v3.2.0
         with:
           coverageCommand: coverage3 xml
           debug: true

From 6a93238bda95e74e2ea786502759690212621782 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 27 Nov 2022 09:46:55 +0100
Subject: [PATCH 431/506] [core] log exceptions

to enable error investigation, log exceptions.

see #940
---
 bumblebee-status | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee-status b/bumblebee-status
index 74d2afe..e714daa 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -149,6 +149,7 @@ if __name__ == "__main__":
         main()
     except Exception as e:
         # really basic errors -> make sure these are shown in the status bar by minimal config
+        logging.exception(e)
         if not started:
             print("{\"version\":1}")
             print("[")

From 87a2890b4845d839d7cd1bbbe04f4f9422f1d2b4 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 27 Nov 2022 12:02:38 +0100
Subject: [PATCH 432/506] [modules/pulsectl] fix case when no devices are
 available

no devices lead to an exception that completely stopped bumblebee-status
from processing data.

handle this case more gracefully by defaulting to a volume of 0%. if
this proves to be an issue, we can still add error indicators later.

see #940
---
 bumblebee_status/modules/core/pulsectl.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 94f6994..9ea0642 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -51,7 +51,7 @@ class Module(core.module.Module):
         self.background = True
 
         self.__type = type
-        self.__volume = "n/a"
+        self.__volume = 0
         self.__devicename = "n/a"
         self.__muted = False
         self.__showbars = util.format.asbool(self.parameter("showbars", False))
@@ -108,11 +108,15 @@ class Module(core.module.Module):
     def toggle_mute(self, _):
         with pulsectl.Pulse(self.id + "vol") as pulse:
             dev = self.get_device(pulse)
+            if not dev:
+                return
             pulse.mute(dev, not self.__muted)
 
     def change_volume(self, amount):
         with pulsectl.Pulse(self.id + "vol") as pulse:
             dev = self.get_device(pulse)
+            if not dev:
+                return
             vol = dev.volume
             vol.value_flat += amount
             if self.__limit > 0 and vol.value_flat > self.__limit/100:
@@ -132,16 +136,22 @@ class Module(core.module.Module):
         for dev in devs:
             if dev.name == default:
                 return dev
-        return devs[0] # fallback
+        if len(devs) == 0:
+            return None
 
+        return devs[0] # fallback
 
 
     def process(self, _):
         with pulsectl.Pulse(self.id + "proc") as pulse:
             dev = self.get_device(pulse)
-            self.__volume = dev.volume.value_flat
-            self.__muted = dev.mute
-            self.__devicename = dev.name
+            if not dev:
+                self.__volume = 0
+                self.__devicename = "n/a"
+            else:
+                self.__volume = dev.volume.value_flat
+                self.__muted = dev.mute
+                self.__devicename = dev.name
         core.event.trigger("update", [self.id], redraw_only=True)
         core.event.trigger("draw")
 

From a6f2e6fc5e41615ee0216c5f4926e692373ebfda Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 27 Nov 2022 17:41:48 +0100
Subject: [PATCH 433/506] [modules/mpd] make mpd port configurable

fixes #941
---
 bumblebee_status/modules/contrib/mpd.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/mpd.py b/bumblebee_status/modules/contrib/mpd.py
index 92568d1..35cb2f6 100644
--- a/bumblebee_status/modules/contrib/mpd.py
+++ b/bumblebee_status/modules/contrib/mpd.py
@@ -42,6 +42,7 @@ Parameters:
            if {file} = '/foo/bar.baz', then {file2} = 'bar'
 
     * mpd.host: MPD host to connect to. (mpc behaviour by default)
+    * mpd.port: MPD port to connect to. (mpc behaviour by default)
     * mpd.layout: Space-separated list of widgets to add. Possible widgets are the buttons/toggles mpd.prev, mpd.next, mpd.shuffle and mpd.repeat, and the main display with play/pause function mpd.main.
 
 contributed by `alrayyes <https://github.com/alrayyes>`_ - many thanks!
@@ -73,10 +74,12 @@ class Module(core.module.Module):
         self._repeat = False
         self._tags = defaultdict(lambda: "")
 
-        if not self.parameter("host"):
-            self._hostcmd = ""
-        else:
-            self._hostcmd = " -h " + self.parameter("host")
+        self._hostcmd = ""
+        if self.parameter("host"):
+            self._hostcmd = " -h {}".format(self.parameter("host"))
+        if self.parameter("port"):
+            self._hostcmd += " -p {}".format(self.parameter("port"))
+
 
         # Create widgets
         widget_map = {}

From f0ce6a1f7fdf4e1c2712f170c5d076264d9fdc28 Mon Sep 17 00:00:00 2001
From: pvutov <github@pvutov.imap.cc>
Date: Wed, 30 Nov 2022 21:04:33 +0200
Subject: [PATCH 434/506] Documentation: Fix the default format string for
 nvidiagpu

---
 docs/modules.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index 96b8d21..d9b853f 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1155,7 +1155,7 @@ nvidiagpu
 Displays GPU name, temperature and memory usage.
 
 Parameters:
-   * nvidiagpu.format: Format string (defaults to '{name}: {temp}°C %{usedmem}/{totalmem} MiB')
+   * nvidiagpu.format: Format string (defaults to '{name}: {temp}°C %{mem_used}/{mem_total} MiB')
      Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem} {gpu_usage_pct} {mem_usage_pct} {mem_io_pct}
 
 Requires nvidia-smi

From b327162f3b4c8aecb184a270d0455fecc156ed3c Mon Sep 17 00:00:00 2001
From: arivarton <accounts@arivarton.com>
Date: Wed, 4 Jan 2023 21:34:21 +0100
Subject: [PATCH 435/506] Added a max_chars parameter to be able to control the
 widget width.

Also moved the try block a bit further up to catch network errors.
---
 bumblebee_status/modules/contrib/gcalendar.py | 57 +++++++++++--------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index efaabf7..49805e3 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -3,7 +3,9 @@
 Events that are set as 'all-day' will not be shown.
 
 Requires credentials.json from a google api application where the google calendar api is installed.
-On first time run the browser will open and google will ask for permission for this app to access the google calendar and then save a .gcalendar_token.json file to the credentials_path directory which stores this permission.
+On first time run the browser will open and google will ask for permission for this app to access
+the google calendar and then save a .gcalendar_token.json file to the credentials_path directory
+which stores this permission.
 
 A refresh is done every 15 minutes.
 
@@ -12,10 +14,11 @@ Parameters:
     * gcalendar.date_format: Format date output. Defaults to "%d.%m.%y".
     * gcalendar.credentials_path: Path to credentials.json. Defaults to "~/".
     * gcalendar.locale: locale to use rather than the system default.
+    * gcalendar.max_chars: Maximum of characters to display.
 
 Requires these pip packages:
    * google-api-python-client >= 1.8.0
-   * google-auth-httplib2 
+   * google-auth-httplib2
    * google-auth-oauthlib
 """
 
@@ -51,6 +54,13 @@ class Module(core.module.Module):
         self.__credentials = os.path.join(self.__credentials_path, "credentials.json")
         self.__token = os.path.join(self.__credentials_path, ".gcalendar_token.json")
 
+        self.__max_chars = self.parameter("max_chars", None)
+        try:
+            if self.__max_chars:
+                self.__max_chars = int(self.__max_chars)
+        except ValueError:
+            self.__max_chars = None
+
         l = locale.getdefaultlocale()
         if not l or l == (None, None):
             l = ("en_US", "UTF-8")
@@ -63,29 +73,26 @@ class Module(core.module.Module):
     def first_event(self, widget):
         SCOPES = ["https://www.googleapis.com/auth/calendar.readonly"]
 
-        """Shows basic usage of the Google Calendar API.
-        Prints the start and name of the next 10 events on the user's calendar.
-        """
         creds = None
-        # The file token.json stores the user's access and refresh tokens, and is
-        # created automatically when the authorization flow completes for the first
-        # time.
-        if os.path.exists(self.__token):
-            creds = Credentials.from_authorized_user_file(self.__token, SCOPES)
-        # If there are no (valid) credentials available, let the user log in.
-        if not creds or not creds.valid:
-            if creds and creds.expired and creds.refresh_token:
-                creds.refresh(Request())
-            else:
-                flow = InstalledAppFlow.from_client_secrets_file(
-                    self.__credentials, SCOPES
-                )
-                creds = flow.run_local_server(port=0)
-            # Save the credentials for the next run
-            with open(self.__token, "w") as token:
-                token.write(creds.to_json())
-
         try:
+            # The file token.json stores the user's access and refresh tokens, and is
+            # created automatically when the authorization flow completes for the first
+            # time.
+            if os.path.exists(self.__token):
+                creds = Credentials.from_authorized_user_file(self.__token, SCOPES)
+            # If there are no (valid) credentials available, let the user log in.
+            if not creds or not creds.valid:
+                if creds and creds.expired and creds.refresh_token:
+                    creds.refresh(Request())
+                else:
+                    flow = InstalledAppFlow.from_client_secrets_file(
+                        self.__credentials, SCOPES
+                    )
+                    creds = flow.run_local_server(port=0)
+                # Save the credentials for the next run
+                with open(self.__token, "w") as token:
+                    token.write(creds.to_json())
+
             service = build("calendar", "v3", credentials=creds)
 
             # Call the Calendar API
@@ -137,7 +144,7 @@ class Module(core.module.Module):
                                 .strftime(f"{self.__time_format}"),
                                 gevent["summary"],
                             )
-                        )
+                        )[: self.__max_chars]
                     else:
                         return str(
                             "%s %s"
@@ -147,7 +154,7 @@ class Module(core.module.Module):
                                 .strftime(f"{self.__date_format} {self.__time_format}"),
                                 gevent["summary"],
                             )
-                        )
+                        )[: self.__max_chars]
             return "No upcoming events found."
 
         except:

From ae29c1b79f142eafb90d8cf7dfaea381e7cc7cfd Mon Sep 17 00:00:00 2001
From: arivarton <accounts@arivarton.com>
Date: Sun, 29 Jan 2023 13:05:13 +0100
Subject: [PATCH 436/506] Divided date/time and summary into two widgets and
 made the summary widget scrollable.

---
 bumblebee_status/modules/contrib/gcalendar.py | 77 ++++++++++---------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/bumblebee_status/modules/contrib/gcalendar.py b/bumblebee_status/modules/contrib/gcalendar.py
index 49805e3..6848ba8 100644
--- a/bumblebee_status/modules/contrib/gcalendar.py
+++ b/bumblebee_status/modules/contrib/gcalendar.py
@@ -14,7 +14,6 @@ Parameters:
     * gcalendar.date_format: Format date output. Defaults to "%d.%m.%y".
     * gcalendar.credentials_path: Path to credentials.json. Defaults to "~/".
     * gcalendar.locale: locale to use rather than the system default.
-    * gcalendar.max_chars: Maximum of characters to display.
 
 Requires these pip packages:
    * google-api-python-client >= 1.8.0
@@ -30,10 +29,12 @@ from dateutil.parser import parse as dtparse
 import core.module
 import core.widget
 import core.decorators
+import util.format
 
 import datetime
 import os.path
 import locale
+import time
 
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
@@ -41,11 +42,15 @@ from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 
+# Minutes
+update_every = 15
+
 
 class Module(core.module.Module):
-    @core.decorators.every(minutes=15)
+    @core.decorators.every(minutes=update_every)
     def __init__(self, config, theme):
-        super().__init__(config, theme, core.widget.Widget(self.first_event))
+        super().__init__(config, theme, [core.widget.Widget(self.__datetime), core.widget.Widget(self.__summary)])
+        self.__error = False
         self.__time_format = self.parameter("time_format", "%H:%M")
         self.__date_format = self.parameter("date_format", "%d.%m.%y")
         self.__credentials_path = os.path.expanduser(
@@ -54,13 +59,6 @@ class Module(core.module.Module):
         self.__credentials = os.path.join(self.__credentials_path, "credentials.json")
         self.__token = os.path.join(self.__credentials_path, ".gcalendar_token.json")
 
-        self.__max_chars = self.parameter("max_chars", None)
-        try:
-            if self.__max_chars:
-                self.__max_chars = int(self.__max_chars)
-        except ValueError:
-            self.__max_chars = None
-
         l = locale.getdefaultlocale()
         if not l or l == (None, None):
             l = ("en_US", "UTF-8")
@@ -70,10 +68,25 @@ class Module(core.module.Module):
         except Exception:
             locale.setlocale(locale.LC_TIME, ("en_US", "UTF-8"))
 
-    def first_event(self, widget):
+        self.__last_update = time.time()
+        self.__gcalendar_date, self.__gcalendar_summary = self.__fetch_from_calendar()
+
+    def hidden(self):
+        return self.__error
+
+    def __datetime(self, _):
+        return self.__gcalendar_date
+
+    @core.decorators.scrollable
+    def __summary(self, _):
+        return self.__gcalendar_summary
+
+
+    def __fetch_from_calendar(self):
         SCOPES = ["https://www.googleapis.com/auth/calendar.readonly"]
 
         creds = None
+
         try:
             # The file token.json stores the user's access and refresh tokens, and is
             # created automatically when the authorization flow completes for the first
@@ -132,33 +145,27 @@ class Module(core.module.Module):
                             }
                         )
             sorted_list = sorted(event_list, key=lambda t: t["date"])
+            next_event = sorted_list[0]
 
-            for gevent in sorted_list:
-                if gevent["date"] >= datetime.datetime.now(datetime.timezone.utc):
-                    if gevent["date"].date() == datetime.datetime.utcnow().date():
-                        return str(
-                            "%s %s"
-                            % (
-                                gevent["date"]
-                                .astimezone()
-                                .strftime(f"{self.__time_format}"),
-                                gevent["summary"],
-                            )
-                        )[: self.__max_chars]
-                    else:
-                        return str(
-                            "%s %s"
-                            % (
-                                gevent["date"]
-                                .astimezone()
-                                .strftime(f"{self.__date_format} {self.__time_format}"),
-                                gevent["summary"],
-                            )
-                        )[: self.__max_chars]
-            return "No upcoming events found."
+            if next_event["date"] >= datetime.datetime.now(datetime.timezone.utc):
+                if next_event["date"].date() == datetime.datetime.utcnow().date():
+                    dt = next_event["date"].astimezone()\
+                            .strftime(f"{self.__time_format}")
+                else:
+                    dt = next_event["date"].astimezone()\
+                            .strftime(f"{self.__date_format} {self.__time_format}")
+                return (dt, next_event["summary"])
 
+            return (None, "No upcoming events.")
         except:
-            return None
+            self.__error = True
 
+    def update(self):
+        # Since scrolling runs the update command and therefore negates the
+        # every decorator, this need to be stopped
+        # to not break the API rules of google.
+        if self.__last_update+(update_every*60) < time.time():
+            self.__last_update = time.time()
+            self.__gcalendar_date, self.__gcalendar_summary = self.__fetch_from_calendar()
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 30362cb1244183b43df37ca5bfc2b0115e455d30 Mon Sep 17 00:00:00 2001
From: James Baumgarten <jebaum@ucla.edu>
Date: Fri, 3 Feb 2023 21:23:34 -0700
Subject: [PATCH 437/506] add pipewire module

---
 bumblebee_status/modules/contrib/pipewire.py | 90 ++++++++++++++++++++
 themes/icons/awesome-fonts.json              |  8 ++
 2 files changed, 98 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/pipewire.py

diff --git a/bumblebee_status/modules/contrib/pipewire.py b/bumblebee_status/modules/contrib/pipewire.py
new file mode 100644
index 0000000..d5f46ea
--- /dev/null
+++ b/bumblebee_status/modules/contrib/pipewire.py
@@ -0,0 +1,90 @@
+"""get volume level or control it
+
+Requires the following executable:
+    * wpctl
+
+Parameters:
+    * wpctl.percent_change: How much to change volume by when scrolling on the module (default is 4%)
+
+heavily based on amixer module
+"""
+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.__change = (
+            util.format.asint(self.parameter("percent_change", "4%").strip("%"), 0, 200)
+            / 100.0
+        )  # divide by 100 because wpctl represents 100% volume as 1.00, 50% as 0.50, etc
+
+        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):
+        util.cli.execute("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")
+
+    def increase_volume(self, event):
+        util.cli.execute(
+            "wpctl set-volume --limit 1.0 @DEFAULT_AUDIO_SINK@ {}+".format(
+                self.__change
+            )
+        )
+
+    def decrease_volume(self, event):
+        util.cli.execute(
+            "wpctl set-volume --limit 1.0 @DEFAULT_AUDIO_SINK@ {}-".format(
+                self.__change
+            )
+        )
+
+    def volume(self, widget):
+        return "{}%".format(int(float(self.__level) * 100))
+
+    def update(self):
+        try:
+            # `wpctl get-volume` will return a string like "Volume: n.nn" or "Volume: n.nn [MUTED]"
+            volume = util.cli.execute("wpctl get-volume @DEFAULT_AUDIO_SINK@")
+            v = re.search("\d\.\d+", volume)
+            m = re.search("MUTED", volume)
+            self.__level = v.group()
+            self.__muted = True if m else False
+        except Exception:
+            self.__level = "N/A"
+
+    def state(self, widget):
+        if self.__muted:
+            return ["warning", "muted"]
+        return ["unmuted"]
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index acd1fc3..e3aeebe 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -229,6 +229,14 @@
       "prefix": ""
     }
   },
+  "pipewire": {
+    "muted": {
+      "prefix": ""
+    },
+    "unmuted": {
+      "prefix": ""
+    }
+  },
   "kernel": {
     "prefix": "\uf17c"
   },

From be332005fae58eca48d2f7274403088d15348791 Mon Sep 17 00:00:00 2001
From: James Baumgarten <jebaum@ucla.edu>
Date: Fri, 10 Feb 2023 08:52:53 -0700
Subject: [PATCH 438/506] fix bug in pipewire module

---
 bumblebee_status/modules/contrib/pipewire.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee_status/modules/contrib/pipewire.py b/bumblebee_status/modules/contrib/pipewire.py
index d5f46ea..4c0f23a 100644
--- a/bumblebee_status/modules/contrib/pipewire.py
+++ b/bumblebee_status/modules/contrib/pipewire.py
@@ -68,6 +68,8 @@ class Module(core.module.Module):
         )
 
     def volume(self, widget):
+        if self.__level == "N/A":
+            return self.__level
         return "{}%".format(int(float(self.__level) * 100))
 
     def update(self):

From 7161ef211cbd463a8174169cf17b32c719548827 Mon Sep 17 00:00:00 2001
From: Clemens Beck <github@beckcl.dev>
Date: Sun, 19 Feb 2023 02:37:13 +0100
Subject: [PATCH 439/506] [modules/gitlab] add module

---
 bumblebee_status/modules/contrib/gitlab.py |  78 +++++++++++++++++++++
 requirements/modules/gitlab.txt            |   1 +
 screenshots/gitlab.png                     | Bin 0 -> 2456 bytes
 tests/modules/contrib/test_gitlab.py       |  42 +++++++++++
 themes/icons/ascii.json                    |   3 +
 themes/icons/awesome-fonts.json            |   3 +
 6 files changed, 127 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/gitlab.py
 create mode 100644 requirements/modules/gitlab.txt
 create mode 100644 screenshots/gitlab.png
 create mode 100644 tests/modules/contrib/test_gitlab.py

diff --git a/bumblebee_status/modules/contrib/gitlab.py b/bumblebee_status/modules/contrib/gitlab.py
new file mode 100644
index 0000000..126650d
--- /dev/null
+++ b/bumblebee_status/modules/contrib/gitlab.py
@@ -0,0 +1,78 @@
+# pylint: disable=C0111,R0903
+
+"""
+Displays the GitLab todo count:
+
+    * https://docs.gitlab.com/ee/user/todos.html
+    * https://docs.gitlab.com/ee/api/todos.html
+
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
+Requires the following library:
+    * requests
+
+Errors:
+    if the GitLab todo query failed, the shown value is `n/a`
+
+Parameters:
+    * gitlab.token: GitLab personal access token, the token needs to have the "read_api" scope.
+    * gitlab.host: Host of the GitLab instance, default is "gitlab.com".
+    * gitlab.actions: Comma separated actions to be parsed (e.g.: gitlab.actions=assigned,approval_required)
+"""
+
+import json
+import requests
+import shutil
+import util
+
+import core.module
+import core.widget
+import core.decorators
+import core.input
+
+
+class Module(core.module.Module):
+    @core.decorators.every(minutes=5)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.gitlab))
+
+        self.background = True
+        self.__label = ""
+        self.__host = self.parameter("host", "gitlab.com")
+
+        self.__actions = []
+        actions = self.parameter("actions", "")
+        if actions:
+            self.__actions = util.format.aslist(actions)
+
+        self.__requests = requests.Session()
+        self.__requests.headers.update({"PRIVATE-TOKEN": self.parameter("token", "")})
+
+        cmd = "xdg-open"
+        if not shutil.which(cmd):
+            cmd = "x-www-browser"
+
+        core.input.register(
+            self,
+            button=core.input.LEFT_MOUSE,
+            cmd="{cmd} https:/{host}//dashboard/todos".format(
+                cmd=cmd, host=self.__host
+            ),
+        )
+
+    def gitlab(self, _):
+        return self.__label
+
+    def update(self):
+        try:
+            url = "https://{host}/api/v4/todos".format(host=self.__host)
+            response = self.__requests.get(url)
+            todos = response.json()
+            if self.__actions:
+                todos = [t for t in todos if t["action_name"] in self.__actions]
+            self.__label = str(len(todos))
+        except Exception as e:
+            self.__label = "n/a"
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/requirements/modules/gitlab.txt b/requirements/modules/gitlab.txt
new file mode 100644
index 0000000..f229360
--- /dev/null
+++ b/requirements/modules/gitlab.txt
@@ -0,0 +1 @@
+requests
diff --git a/screenshots/gitlab.png b/screenshots/gitlab.png
new file mode 100644
index 0000000000000000000000000000000000000000..d488db0dd458860553f6cf7e01cf97432458f41e
GIT binary patch
literal 2456
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
N95W*;6ve<T?q9eNko*7u

literal 0
HcmV?d00001

diff --git a/tests/modules/contrib/test_gitlab.py b/tests/modules/contrib/test_gitlab.py
new file mode 100644
index 0000000..d3a3b9a
--- /dev/null
+++ b/tests/modules/contrib/test_gitlab.py
@@ -0,0 +1,42 @@
+import pytest
+from unittest import TestCase, mock
+
+import core.config
+import core.widget
+import modules.contrib.gitlab
+
+from requests import Session
+from requests.models import Response
+
+pytest.importorskip("requests")
+
+
+def build_gitlab_module(actions=""):
+    config = core.config.Config(["-p", "gitlab.actions={}".format(actions)])
+    return modules.contrib.gitlab.Module(config=config, theme=None)
+
+def mock_todo_api_response():
+    res = mock.Mock()
+    res.json = lambda: [
+        {"action_name": "assigned"},
+        {"action_name": "assigned"},
+        {"action_name": "approval_required"},
+    ]
+    res.status_code = 200
+    return res
+
+class TestGitlabUnit(TestCase):
+    def test_load_module(self):
+        __import__("modules.contrib.gitlab")
+
+    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    def test_unfiltered(self, _):
+        module = build_gitlab_module()
+        module.update()
+        assert module.widgets()[0].full_text() == "3"
+
+    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    def test_filtered(self, _):
+        module = build_gitlab_module(actions="approval_required")
+        module.update()
+        assert module.widgets()[0].full_text() == "1"
diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index 089fa3c..d353386 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -309,6 +309,9 @@
   "github": {
     "prefix": "github"
   },
+  "gitlab": {
+    "prefix": "gitlab"
+  },
   "deezer": {
     "prefix": ""
   },
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index e3aeebe..4015e43 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -581,6 +581,9 @@
   "github": {
     "prefix": "  "
   },
+  "gitlab": {
+    "prefix": ""
+  },
   "deezer": {
     "prefix": "  "
   },

From 99bd2a81b6c4a27dc15d5bd6ad1cabb2d11669fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20L=C3=BCftinger?= <lukas.lueftinger@outlook.com>
Date: Wed, 15 Mar 2023 19:01:48 +0100
Subject: [PATCH 440/506] remove unnecessary playerctl calls to determine
 whether widgets should be hidden

---
 bumblebee_status/modules/contrib/playerctl.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 bumblebee_status/modules/contrib/playerctl.py

diff --git a/bumblebee_status/modules/contrib/playerctl.py b/bumblebee_status/modules/contrib/playerctl.py
old mode 100755
new mode 100644
index bd8876c..c405a0e
--- a/bumblebee_status/modules/contrib/playerctl.py
+++ b/bumblebee_status/modules/contrib/playerctl.py
@@ -34,6 +34,7 @@ class Module(core.module.Module):
         self.background = True
 
         self.__hide = util.format.asbool(self.parameter("hide", "false"));
+        self.__hidden = self.__hide
 
         self.__layout = util.format.aslist(
             self.parameter(
@@ -87,7 +88,7 @@ class Module(core.module.Module):
                 core.input.register(widget, **callback_options)
 
     def hidden(self):
-        return self.__hide and self.status() == None
+        return self.__hidden
 
     def status(self):
         try:
@@ -101,6 +102,10 @@ class Module(core.module.Module):
 
     def update(self):
         playback_status = self.status()
+        if not playback_status:
+            self.__hidden = self.__hide
+        else:
+            self.__hidden = False
         for widget in self.widgets():
             if playback_status:
                 if widget.name == "playerctl.pause":

From 61e38c609426361a19c50526c730a2d67f9ff031 Mon Sep 17 00:00:00 2001
From: C H <hedges.colin@gmail.com>
Date: Sat, 25 Mar 2023 15:27:42 -0700
Subject: [PATCH 441/506] Added path for themes directory when installed via
 pipx

---
 bumblebee_status/core/theme.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index d91b060..1426450 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -25,6 +25,7 @@ if os.environ.get("XDG_DATA_DIRS"):
 PATHS.extend([
     os.path.expanduser("~/.config/bumblebee-status/themes"),
     os.path.expanduser("~/.local/share/bumblebee-status/themes"),  # PIP
+    os.path.expanduser("~/.local/pipx/venvs/bumblebee-status/share/bumblebee-status/themes"),  # PIPX
     "/usr/share/bumblebee-status/themes",
 ])
 

From 2e1289f778b047a4dbc22f93e84415eb24160c01 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Tue, 11 Apr 2023 12:42:55 +0200
Subject: [PATCH 442/506] [core] fix importlib.util error

add explicit import of importlib.util

fixes #962
---
 bumblebee_status/core/module.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py
index 56070bf..37a3143 100644
--- a/bumblebee_status/core/module.py
+++ b/bumblebee_status/core/module.py
@@ -1,5 +1,6 @@
 import os
 import importlib
+import importlib.util
 import logging
 import threading
 

From f34e02d824f98560871a263db4b79ebd76c04284 Mon Sep 17 00:00:00 2001
From: dmturner <daveturner101@gmail.com>
Date: Thu, 13 Apr 2023 12:49:39 +0100
Subject: [PATCH 443/506] Change OpenWeatherMap request url from HTTP to HTTPS

---
 bumblebee_status/modules/contrib/weather.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/weather.py b/bumblebee_status/modules/contrib/weather.py
index 72e0c27..4166995 100644
--- a/bumblebee_status/modules/contrib/weather.py
+++ b/bumblebee_status/modules/contrib/weather.py
@@ -13,7 +13,7 @@ Parameters:
     * weather.unit: metric (default), kelvin, imperial
     * weather.showcity: If set to true, show location information, otherwise hide it (defaults to true)
     * weather.showminmax: If set to true, show the minimum and maximum temperature, otherwise hide it (defaults to false)
-    * weather.apikey: API key from http://api.openweathermap.org
+    * weather.apikey: API key from https://api.openweathermap.org
 
 
 contributed by `TheEdgeOfRage <https://github.com/TheEdgeOfRage>`_ - many thanks!
@@ -116,7 +116,7 @@ class Module(core.module.Module):
 
     def update(self):
         try:
-            weather_url = "http://api.openweathermap.org/data/2.5/weather?appid={}".format(
+            weather_url = "https://api.openweathermap.org/data/2.5/weather?appid={}".format(
                 self.__apikey
             )
             weather_url = "{}&units={}".format(weather_url, self.__unit)

From 42e041ce03613c2176f3187ca26a13f1b276d4a5 Mon Sep 17 00:00:00 2001
From: Duarte Figueiredo <duarte.figueiredo@outlook.com>
Date: Sun, 16 Apr 2023 11:24:51 +0100
Subject: [PATCH 444/506] [modules/wakatime] - New module that connects to
 https://wakatime.com and displays coding duration stats

---
 bumblebee_status/modules/contrib/wakatime.py |  95 +++++++++++++++++++
 screenshots/wakatime.png                     | Bin 0 -> 1820 bytes
 tests/modules/contrib/test_wakatime.py       |  56 +++++++++++
 themes/icons/awesome-fonts.json              |   3 +
 4 files changed, 154 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/wakatime.py
 create mode 100644 screenshots/wakatime.png
 create mode 100644 tests/modules/contrib/test_wakatime.py

diff --git a/bumblebee_status/modules/contrib/wakatime.py b/bumblebee_status/modules/contrib/wakatime.py
new file mode 100644
index 0000000..7e4e33e
--- /dev/null
+++ b/bumblebee_status/modules/contrib/wakatime.py
@@ -0,0 +1,95 @@
+# pylint: disable=C0111,R0903
+
+"""
+Displays the WakaTime daily/weekly/monthly times:
+
+    * https://wakatime.com/developers#stats
+
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
+Requires the following library:
+    * requests
+
+Errors:
+    if the Wakatime status query failed, the shown value is `n/a`
+
+Parameters:
+    * wakatime.token: Wakatime secret api key, you can get it in https://wakatime.com/settings/account.
+    * wakatime.range: Range of the output, default is "Today". Can be one of “Today”, “Yesterday”, “Last 7 Days”, “Last 7 Days from Yesterday”, “Last 14 Days”, “Last 30 Days”, “This Week”, “Last Week”, “This Month”, or “Last Month”.
+    * wakatime.format: Format of the output, default is "digital"
+        Valid inputs are:
+          * "decimal" -> 1.37
+          * "digital" -> 1:22
+          * "seconds" -> 4931.29
+          * "text" -> 1 hr 22 mins
+          * "%H:%M:%S" -> 01:22:31 (or any other valid format)
+"""
+
+import base64
+import shutil
+import time
+from typing import Final, List
+
+import requests
+
+import core.decorators
+import core.input
+import core.module
+import core.widget
+
+HOST_API: Final[str] = "https://wakatime.com"
+SUMMARIES_URL: Final[str] = f"{HOST_API}/api/v1/users/current/summaries"
+UTF8: Final[str] = "utf-8"
+FORMAT_PARAMETERS: Final[List[str]] = ["decimal", "digital", "seconds", "text"]
+
+
+class Module(core.module.Module):
+    @core.decorators.every(minutes=5)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.wakatime))
+
+        self.background = True
+        self.__label = ""
+
+        self.__output_format = self.parameter("format", "digital")
+        self.__range = self.parameter("range", "Today")
+
+        self.__requests = requests.Session()
+
+        token = self.__encode_to_base_64(self.parameter("token", ""))
+        self.__requests.headers.update({"Authorization": f"Basic {token}"})
+
+        cmd = "xdg-open"
+        if not shutil.which(cmd):
+            cmd = "x-www-browser"
+
+        core.input.register(
+            self,
+            button=core.input.LEFT_MOUSE,
+            cmd=f"{cmd} {HOST_API}/dashboard",
+        )
+
+    def wakatime(self, _):
+        return self.__label
+
+    def update(self):
+        try:
+            self.__label = self.__get_waka_time(self.__range)
+        except Exception:
+            self.__label = "n/a"
+
+    def __get_waka_time(self, since_date: str) -> str:
+        response = self.__requests.get(f"{SUMMARIES_URL}?range={since_date}")
+
+        data = response.json()
+        grand_total = data["cumulative_total"]
+
+        if self.__output_format in FORMAT_PARAMETERS:
+            return str(grand_total[self.__output_format])
+        else:
+            total_seconds = int(grand_total["seconds"])
+            return time.strftime(self.__output_format, time.gmtime(total_seconds))
+
+    @staticmethod
+    def __encode_to_base_64(s: str) -> str:
+        return base64.b64encode(s.encode(UTF8)).decode(UTF8)
diff --git a/screenshots/wakatime.png b/screenshots/wakatime.png
new file mode 100644
index 0000000000000000000000000000000000000000..82c8c797827652308f6ca4989b90f3d713817063
GIT binary patch
literal 1820
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
KMNUMnLSTZgu5yI{

literal 0
HcmV?d00001

diff --git a/tests/modules/contrib/test_wakatime.py b/tests/modules/contrib/test_wakatime.py
new file mode 100644
index 0000000..d6091b4
--- /dev/null
+++ b/tests/modules/contrib/test_wakatime.py
@@ -0,0 +1,56 @@
+from unittest import TestCase, mock
+
+import pytest
+from requests import Session
+
+import core.config
+import core.widget
+import modules.contrib.wakatime
+
+pytest.importorskip("requests")
+
+
+def build_wakatime_module(waka_format=None, waka_range=None):
+    config = core.config.Config([
+        "-p",
+        f"wakatime.format={waka_format}" if waka_format else "",
+        f"wakatime.range={waka_range}" if waka_range else ""
+    ])
+
+    return modules.contrib.wakatime.Module(config=config, theme=None)
+
+
+def mock_todo_api_response():
+    res = mock.Mock()
+    res.json = lambda: {
+        "cumulative_total": {
+            "text": "3 hrs 2 mins",
+            "seconds": 10996,
+            "digital": "3:02",
+            "decimal": "3.03"
+        },
+    }
+
+    res.status_code = 200
+    return res
+
+
+class TestWakatimeUnit(TestCase):
+    def test_load_module(self):
+        __import__("modules.contrib.wakatime")
+
+    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    def test_default_values(self, mock_get):
+        module = build_wakatime_module()
+        module.update()
+        assert module.widgets()[0].full_text() == "3:02"
+
+        mock_get.assert_called_with('https://wakatime.com/api/v1/users/current/summaries?range=today')
+
+    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    def test_custom_configs(self, mock_get):
+        module = build_wakatime_module(waka_format="text", waka_range="last 7 days")
+        module.update()
+        assert module.widgets()[0].full_text() == "3 hrs 2 mins"
+
+        mock_get.assert_called_with('https://wakatime.com/api/v1/users/current/summaries?range=last 7 days')
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 4015e43..cd4191a 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -584,6 +584,9 @@
   "gitlab": {
     "prefix": ""
   },
+  "wakatime": {
+    "prefix": "W"
+  },
   "deezer": {
     "prefix": "  "
   },

From 2b4e2b2c8268a690c5dbe6f3c7194e83244bf445 Mon Sep 17 00:00:00 2001
From: Duarte Figueiredo <duarte.figueiredo@outlook.com>
Date: Sun, 16 Apr 2023 11:29:31 +0100
Subject: [PATCH 445/506] rename mock_summaries_api_response test function

---
 tests/modules/contrib/test_wakatime.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/modules/contrib/test_wakatime.py b/tests/modules/contrib/test_wakatime.py
index d6091b4..b76165c 100644
--- a/tests/modules/contrib/test_wakatime.py
+++ b/tests/modules/contrib/test_wakatime.py
@@ -20,7 +20,7 @@ def build_wakatime_module(waka_format=None, waka_range=None):
     return modules.contrib.wakatime.Module(config=config, theme=None)
 
 
-def mock_todo_api_response():
+def mock_summaries_api_response():
     res = mock.Mock()
     res.json = lambda: {
         "cumulative_total": {
@@ -39,7 +39,7 @@ class TestWakatimeUnit(TestCase):
     def test_load_module(self):
         __import__("modules.contrib.wakatime")
 
-    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    @mock.patch.object(Session, "get", return_value=mock_summaries_api_response())
     def test_default_values(self, mock_get):
         module = build_wakatime_module()
         module.update()
@@ -47,7 +47,7 @@ class TestWakatimeUnit(TestCase):
 
         mock_get.assert_called_with('https://wakatime.com/api/v1/users/current/summaries?range=today')
 
-    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    @mock.patch.object(Session, "get", return_value=mock_summaries_api_response())
     def test_custom_configs(self, mock_get):
         module = build_wakatime_module(waka_format="text", waka_range="last 7 days")
         module.update()

From 1b0478edd421e1c6378abe8c829fd24246253881 Mon Sep 17 00:00:00 2001
From: Duarte Figueiredo <duarte.figueiredo@outlook.com>
Date: Sun, 16 Apr 2023 11:38:13 +0100
Subject: [PATCH 446/506] changed icon from normal w to font-awesome clock

---
 screenshots/wakatime.png        | Bin 1820 -> 1729 bytes
 themes/icons/awesome-fonts.json |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/screenshots/wakatime.png b/screenshots/wakatime.png
index 82c8c797827652308f6ca4989b90f3d713817063..a40a865881e42115a01e8ba9ef982736cd8f91d3 100644
GIT binary patch
literal 1729
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
X*`jvYTDPW%00000NkvXXu0mjf$P`y{

literal 1820
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
KMNUMnLSTZgu5yI{

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index cd4191a..e9ec1b8 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -585,7 +585,7 @@
     "prefix": ""
   },
   "wakatime": {
-    "prefix": "W"
+    "prefix": "\uF017"
   },
   "deezer": {
     "prefix": "  "

From cad45ecd2c70d86662f7bf16a594a439b181649f Mon Sep 17 00:00:00 2001
From: Duarte Figueiredo <duarte.figueiredo@outlook.com>
Date: Wed, 19 Apr 2023 11:50:25 +0100
Subject: [PATCH 447/506] [modules/todoist] - New module that connects to
 https://api.todoist.com and displays number of tasks due

---
 bumblebee_status/modules/contrib/todoist.py |  77 ++++++++++++++++++++
 screenshots/todoist.png                     | Bin 0 -> 744 bytes
 tests/modules/contrib/test_todoist.py       |  58 +++++++++++++++
 themes/icons/awesome-fonts.json             |   3 +
 4 files changed, 138 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/todoist.py
 create mode 100644 screenshots/todoist.png
 create mode 100644 tests/modules/contrib/test_todoist.py

diff --git a/bumblebee_status/modules/contrib/todoist.py b/bumblebee_status/modules/contrib/todoist.py
new file mode 100644
index 0000000..c254139
--- /dev/null
+++ b/bumblebee_status/modules/contrib/todoist.py
@@ -0,0 +1,77 @@
+# pylint: disable=C0111,R0903
+
+"""
+Displays the nº of Todoist tasks that are due:
+
+    * https://developer.todoist.com/rest/v2/#get-active-tasks
+
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
+Requires the following library:
+    * requests
+
+Errors:
+    if the Todoist get active tasks query failed, the shown value is `n/a`
+
+Parameters:
+    * todoist.token: Todoist api token, you can get it in https://todoist.com/app/settings/integrations/developer.
+    * todoist.filter: a filter statement defined by Todoist (https://todoist.com/help/articles/introduction-to-filters), eg: "!assigned to: others & (Overdue | due: today)"
+"""
+
+import shutil
+from typing import Final
+
+import requests
+
+import core.decorators
+import core.input
+import core.module
+import core.widget
+
+HOST_API: Final[str] = "https://api.todoist.com"
+HOST_WEBSITE: Final[str] = "https://todoist.com/app/today"
+
+TASKS_URL: Final[str] = f"{HOST_API}/rest/v2/tasks"
+
+
+class Module(core.module.Module):
+    @core.decorators.every(minutes=5)
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.todoist))
+
+        self.__user_id = None
+        self.background = True
+        self.__label = ""
+
+        token = self.parameter("token", "")
+        self.__filter = self.parameter("filter", "")
+
+        self.__requests = requests.Session()
+        self.__requests.headers.update({"Authorization": f"Bearer {token}"})
+
+        cmd = "xdg-open"
+        if not shutil.which(cmd):
+            cmd = "x-www-browser"
+
+        core.input.register(
+            self,
+            button=core.input.LEFT_MOUSE,
+            cmd=f"{cmd} {HOST_WEBSITE}",
+        )
+
+    def todoist(self, _):
+        return self.__label
+
+    def update(self):
+        try:
+            self.__label = self.__get_pending_tasks()
+        except Exception:
+            self.__label = "n/a"
+
+    def __get_pending_tasks(self) -> str:
+        params = {"filter": self.__filter} if self.__filter else None
+
+        response = self.__requests.get(TASKS_URL, params=params)
+        data = response.json()
+
+        return str(len(data))
diff --git a/screenshots/todoist.png b/screenshots/todoist.png
new file mode 100644
index 0000000000000000000000000000000000000000..66e1bae2c0d08ab0b97d8806d3eb239751557ba4
GIT binary patch
literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq002e+000{Z0ssI2PF!yK00087Nkl<ZcwS>*
z7?waxLUA~uQ7;VzH0q_HfQa&vjGTJ^geli=+<b-`0A+z{fGRPy(-{%vr72Tqz9$Y$
zo-zYdJ64pJU%Gt7>Kiw20(Gt5uo+F((<>0&==bk|f|%xDBBH!>|Neb+<8c6>N=)ro
z5zsUD?%iLvZsU90URttbMNMrZ9O>zsW154Bi1HG;!%@N6bLXc{n+4}$YR8I<Ol*Lp
zl#I%I++IpZ%D~h}5K-!-Gw050>6if3)Hk$3L@>4ELHNCtn4AHO8FfuVOpSODX<mBs
z<_(+;1n19R)YdhHs7Xo9h6rM6$Aj>D>E+9p5Ho=R7Zx6isU0gK!As}PUjTZbth@%o
zy?F7mt{yaT2Zuz%t;f`k2jTLPn}`2~jay2~YSPkkyL%=8OVqb--v$LoVVZ!6Nbr)E
zcMybITi0~?@)bP;3kcUgF#N@f7Z5en@)8<ycJT%#kRwNrVM<{l61)TqHfdQkh={VP
zE`;IZ8}j`5bGUzK<Ru{5v11odrILycrW6_?!An4}YV}&6BjDohp8ijtK7-3b0H$_4
zh<Gn8ShxhJQs2-LQwj}{=B4-Gx<W!q87S!D=KJ{Z6J#j}z|@Wh5$~nF`wjrpo}7Xv
zrW6_?*-JnG46u;Un1_!Zp@~BPrgl6CmzS(;oRPV};s>Z~+qRvUCSW3>yo8+l@dKbr
zOzl`vd_o$qDr;<Ne-Ey#foveMw1)cRz=1<&&YYb!YhFi3@5)tcfyLdECr@qd-7w9;
zL_~RM>((9UZpQ(DDlxTVMQhfqN7szhTqrK7Jb3Uhu*LNH^&23$bm<BUOGivYup*+o
zWNK~)3`lhQF#u2vP$i~zIwPXIBnD3Ob`I`7exbM!P!_o`96&^@mxd4;_0mv4!_-T|
a3;+O6N~CrC#>K_}0000<MNUMnLSTXc+*gAD

literal 0
HcmV?d00001

diff --git a/tests/modules/contrib/test_todoist.py b/tests/modules/contrib/test_todoist.py
new file mode 100644
index 0000000..75d42a7
--- /dev/null
+++ b/tests/modules/contrib/test_todoist.py
@@ -0,0 +1,58 @@
+from unittest import TestCase, mock
+
+import pytest
+from requests import Session
+
+import core.config
+import core.widget
+import modules.contrib.todoist
+
+pytest.importorskip("requests")
+
+
+def build_todoist_module(todoist_filter=None):
+    config = core.config.Config([
+        "-p",
+        f"todoist.filter={todoist_filter}" if todoist_filter else ""
+    ])
+
+    return modules.contrib.todoist.Module(config=config, theme=None)
+
+
+def mock_tasks_api_response():
+    res = mock.Mock()
+    res.json = lambda: [
+        {
+            "id": "-1",
+            "project_id": "-1"
+        },
+        {
+            "id": "-2",
+            "project_id": "-2"
+        }
+    ]
+
+    res.status_code = 200
+    return res
+
+
+class TestTodoistUnit(TestCase):
+    def test_load_module(self):
+        __import__("modules.contrib.todoist")
+
+    @mock.patch.object(Session, "get", return_value=mock_tasks_api_response())
+    def test_default_values(self, mock_get):
+        module = build_todoist_module()
+        module.update()
+        assert module.widgets()[0].full_text() == "2"
+
+        mock_get.assert_called_with('https://api.todoist.com/rest/v2/tasks', params=None)
+
+    @mock.patch.object(Session, "get", return_value=mock_tasks_api_response())
+    def test_custom_filter(self, mock_get):
+        module = build_todoist_module(todoist_filter="!assigned to: others & (Overdue | due: today)")
+        module.update()
+        assert module.widgets()[0].full_text() == "2"
+
+        mock_get.assert_called_with('https://api.todoist.com/rest/v2/tasks',
+                                    params={'filter': '!assigned to: others & (Overdue | due: today)'})
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index e9ec1b8..60f8f51 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -587,6 +587,9 @@
   "wakatime": {
     "prefix": "\uF017"
   },
+  "todoist": {
+    "prefix": "\uF14A"
+  },
   "deezer": {
     "prefix": "  "
   },

From 592d08c082d84c6f7e654c6b575032f5955aecd9 Mon Sep 17 00:00:00 2001
From: Duarte Figueiredo <duarte.figueiredo@outlook.com>
Date: Wed, 19 Apr 2023 12:01:07 +0100
Subject: [PATCH 448/506] removed Final import because of python3.7 backwards
 compatibility

---
 bumblebee_status/modules/contrib/todoist.py  | 7 +++----
 bumblebee_status/modules/contrib/wakatime.py | 9 ++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bumblebee_status/modules/contrib/todoist.py b/bumblebee_status/modules/contrib/todoist.py
index c254139..5fae228 100644
--- a/bumblebee_status/modules/contrib/todoist.py
+++ b/bumblebee_status/modules/contrib/todoist.py
@@ -19,7 +19,6 @@ Parameters:
 """
 
 import shutil
-from typing import Final
 
 import requests
 
@@ -28,10 +27,10 @@ import core.input
 import core.module
 import core.widget
 
-HOST_API: Final[str] = "https://api.todoist.com"
-HOST_WEBSITE: Final[str] = "https://todoist.com/app/today"
+HOST_API = "https://api.todoist.com"
+HOST_WEBSITE = "https://todoist.com/app/today"
 
-TASKS_URL: Final[str] = f"{HOST_API}/rest/v2/tasks"
+TASKS_URL = f"{HOST_API}/rest/v2/tasks"
 
 
 class Module(core.module.Module):
diff --git a/bumblebee_status/modules/contrib/wakatime.py b/bumblebee_status/modules/contrib/wakatime.py
index 7e4e33e..1ac4461 100644
--- a/bumblebee_status/modules/contrib/wakatime.py
+++ b/bumblebee_status/modules/contrib/wakatime.py
@@ -28,7 +28,6 @@ Parameters:
 import base64
 import shutil
 import time
-from typing import Final, List
 
 import requests
 
@@ -37,10 +36,10 @@ import core.input
 import core.module
 import core.widget
 
-HOST_API: Final[str] = "https://wakatime.com"
-SUMMARIES_URL: Final[str] = f"{HOST_API}/api/v1/users/current/summaries"
-UTF8: Final[str] = "utf-8"
-FORMAT_PARAMETERS: Final[List[str]] = ["decimal", "digital", "seconds", "text"]
+HOST_API = "https://wakatime.com"
+SUMMARIES_URL = f"{HOST_API}/api/v1/users/current/summaries"
+UTF8 = "utf-8"
+FORMAT_PARAMETERS = ["decimal", "digital", "seconds", "text"]
 
 
 class Module(core.module.Module):

From a6de61b751b5f35629fc142a702890811f36e2c4 Mon Sep 17 00:00:00 2001
From: Duarte Figueiredo <duarte.figueiredo@outlook.com>
Date: Sat, 6 May 2023 10:56:17 +0100
Subject: [PATCH 449/506] Updated gitlab module to have state of warning when
 there is at least 1 notification, just like the github module

---
 bumblebee_status/modules/contrib/gitlab.py | 19 +++++++++---
 tests/modules/contrib/test_gitlab.py       | 36 +++++++++++++++++++---
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/bumblebee_status/modules/contrib/gitlab.py b/bumblebee_status/modules/contrib/gitlab.py
index 126650d..24f2eb8 100644
--- a/bumblebee_status/modules/contrib/gitlab.py
+++ b/bumblebee_status/modules/contrib/gitlab.py
@@ -20,15 +20,15 @@ Parameters:
     * gitlab.actions: Comma separated actions to be parsed (e.g.: gitlab.actions=assigned,approval_required)
 """
 
-import json
-import requests
 import shutil
-import util
 
-import core.module
-import core.widget
+import requests
+
 import core.decorators
 import core.input
+import core.module
+import core.widget
+import util
 
 
 class Module(core.module.Module):
@@ -74,5 +74,14 @@ class Module(core.module.Module):
         except Exception as e:
             self.__label = "n/a"
 
+    def state(self, widget):
+        state = []
+
+        try:
+            if int(self.__label) > 0:
+                state.append("warning")
+        except ValueError:
+            pass
+        return state
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/modules/contrib/test_gitlab.py b/tests/modules/contrib/test_gitlab.py
index d3a3b9a..016a2ab 100644
--- a/tests/modules/contrib/test_gitlab.py
+++ b/tests/modules/contrib/test_gitlab.py
@@ -1,13 +1,12 @@
-import pytest
 from unittest import TestCase, mock
 
+import pytest
+from requests import Session
+
 import core.config
 import core.widget
 import modules.contrib.gitlab
 
-from requests import Session
-from requests.models import Response
-
 pytest.importorskip("requests")
 
 
@@ -15,6 +14,7 @@ def build_gitlab_module(actions=""):
     config = core.config.Config(["-p", "gitlab.actions={}".format(actions)])
     return modules.contrib.gitlab.Module(config=config, theme=None)
 
+
 def mock_todo_api_response():
     res = mock.Mock()
     res.json = lambda: [
@@ -25,6 +25,7 @@ def mock_todo_api_response():
     res.status_code = 200
     return res
 
+
 class TestGitlabUnit(TestCase):
     def test_load_module(self):
         __import__("modules.contrib.gitlab")
@@ -40,3 +41,30 @@ class TestGitlabUnit(TestCase):
         module = build_gitlab_module(actions="approval_required")
         module.update()
         assert module.widgets()[0].full_text() == "1"
+
+    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    def test_state_warning(self, _):
+        module = build_gitlab_module(actions="approval_required")
+        module.update()
+
+        assert module.state(None) == ["warning"]
+
+    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    def test_state_normal(self, _):
+        module = build_gitlab_module(actions="empty_filter")
+        module.update()
+
+        assert module.state(None) == []
+
+    @mock.patch.object(Session, "get", return_value=mock_todo_api_response())
+    def test_state_normal_before_update(self, _):
+        module = build_gitlab_module(actions="approval_required")
+
+        assert module.state(None) == []
+
+    @mock.patch.object(Session, "get", side_effect=Exception("Something went wrong"))
+    def test_state_normal_if_na(self, _):
+        module = build_gitlab_module(actions="approval_required")
+        module.update()
+
+        assert module.state(None) == []

From 6b4898017f00aa373da6b2e5e053eb21832ec9c8 Mon Sep 17 00:00:00 2001
From: Duarte Figueiredo <duarte.figueiredo@outlook.com>
Date: Sat, 6 May 2023 11:20:45 +0100
Subject: [PATCH 450/506] Fixed typo in 'today' that is currently breaking the
 tests

---
 tests/modules/contrib/test_wakatime.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/contrib/test_wakatime.py b/tests/modules/contrib/test_wakatime.py
index b76165c..9ee062e 100644
--- a/tests/modules/contrib/test_wakatime.py
+++ b/tests/modules/contrib/test_wakatime.py
@@ -45,7 +45,7 @@ class TestWakatimeUnit(TestCase):
         module.update()
         assert module.widgets()[0].full_text() == "3:02"
 
-        mock_get.assert_called_with('https://wakatime.com/api/v1/users/current/summaries?range=today')
+        mock_get.assert_called_with('https://wakatime.com/api/v1/users/current/summaries?range=Today')
 
     @mock.patch.object(Session, "get", return_value=mock_summaries_api_response())
     def test_custom_configs(self, mock_get):

From e9696b2150fe5d91ca4418d83676204a8f06032d Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 11 May 2023 08:30:59 +0200
Subject: [PATCH 451/506] [readthedocs] explicitly specify build OS

fixes #970
---
 .readthedocs.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 6823857..63fb402 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -3,4 +3,7 @@ version: 2
 python:
    install:
    - requirements: docs/requirements.txt
-
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"

From 14f19c897a5147f4a99f4928950d719f333e12b2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 11 May 2023 08:45:03 +0200
Subject: [PATCH 452/506] [modules/pulsectl] add default device selection

re-enable functionality to add a popup that allows the user to select
the default source/sink.

fixes #965
---
 bumblebee-status                          | 11 +++++++----
 bumblebee_status/modules/core/pulsectl.py | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/bumblebee-status b/bumblebee-status
index e714daa..a16c747 100755
--- a/bumblebee-status
+++ b/bumblebee-status
@@ -68,10 +68,13 @@ def handle_commands(config, update_lock):
 
 def handle_events(config, update_lock):
     while True:
-        line = sys.stdin.readline().strip(",").strip()
-        if line == "[": continue
-        logging.info("input event: {}".format(line))
-        process_event(line, config, update_lock)
+        try:
+            line = sys.stdin.readline().strip(",").strip()
+            if line == "[": continue
+            logging.info("input event: {}".format(line))
+            process_event(line, config, update_lock)
+        except Exception as e:
+            logging.error(e)
 
 
 def main():
diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 9ea0642..901202a 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -35,6 +35,8 @@ Requires the following Python module:
 """
 
 import pulsectl
+import logging
+import functools
 
 import core.module
 import core.widget
@@ -45,6 +47,11 @@ import util.cli
 import util.graph
 import util.format
 
+try:
+    import util.popup
+except ImportError as e:
+    logging.warning("Couldn't import util.popup: %s. Popups won't work!", e)
+
 class Module(core.module.Module):
     def __init__(self, config, theme, type):
         super().__init__(config, theme, core.widget.Widget(self.display))
@@ -161,6 +168,21 @@ class Module(core.module.Module):
             pulse.event_callback_set(self.process)
             pulse.event_listen()
 
+    def select_default_device_popup(self, widget):
+        with pulsectl.Pulse(self.id) as pulse:
+            devs = pulse.sink_list() if self.__type == "sink" else pulse.source_list()
+        menu = util.popup.menu()
+        for dev in devs:
+            menu.add_menuitem(
+                dev.description,
+                callback=functools.partial(self.__on_default_changed, dev),
+            )
+        menu.show(widget)
+
+    def __on_default_changed(self, dev):
+        with pulsectl.Pulse(self.id) as pulse:
+            pulse.default_set(dev)
+
     def state(self, _):
         if self.__muted:
             return ["warning", "muted"]

From 8967eec44bce74969a1b6ae820ac2d4292c503c4 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 11 May 2023 14:28:32 +0200
Subject: [PATCH 453/506] [module/watson] Add formatting string

Make it possible to customize the watson message in the widget

see #963
---
 bumblebee_status/modules/contrib/watson.py | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/bumblebee_status/modules/contrib/watson.py b/bumblebee_status/modules/contrib/watson.py
index d7b260b..a717342 100644
--- a/bumblebee_status/modules/contrib/watson.py
+++ b/bumblebee_status/modules/contrib/watson.py
@@ -5,6 +5,10 @@
 Requires the following executable:
     * watson
 
+Parameters:
+    * watson.format: Output format, defaults to "{project} [{tags}]"
+      Supported fields are: {project}, {tags}, {relative_start}, {absolute_start}
+
 contributed by `bendardenne <https://github.com/bendardenne>`_ - many thanks!
 """
 
@@ -26,11 +30,11 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.text))
 
         self.__tracking = False
-        self.__project = ""
+        self.__info = {}
+        self.__format = self.parameter("format", "{project} [{tags}]")
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.toggle)
 
     def toggle(self, widget):
-        self.__project = "hit"
         if self.__tracking:
             util.cli.execute("watson stop")
         else:
@@ -39,20 +43,27 @@ class Module(core.module.Module):
 
     def text(self, widget):
         if self.__tracking:
-            return self.__project
+            return self.__format.format(**self.__info)
         else:
             return "Paused"
 
     def update(self):
         output = util.cli.execute("watson status")
-        if re.match(r"No project started", output):
+
+        m = re.search(r"Project ([^\[\]]+)(?: \[(.+)\])? started (.+) \((.+)\)", output)
+
+        if m:
+            self.__tracking = True
+            self.__info = {
+                "project": m.group(1),
+                "tags": m.group(2) or "",
+                "relative_start": m.group(3),
+                "absolute_start": m.group(4),
+            }
+        else:
             self.__tracking = False
             return
 
-        self.__tracking = True
-        m = re.search(r"Project (.+) started", output)
-        self.__project = m.group(1)
-
     def state(self, widget):
         return "on" if self.__tracking else "off"
 

From b3007dd04225cc2a30ce45c26f8e878d1d52aff6 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Sun, 28 May 2023 17:03:58 +0200
Subject: [PATCH 454/506] use API token instead of password hash in pihole
 module

* with newer versions of pi-hole, it is not possible
  anymore to use the password hash for the API authentication.
  Instead, one needs to use the dedicated API token for that.
  In order to stay backwards compatible, and not break existing
  bumblebee_status setups, the 'pwhash' parameter is still supported
  (in case someone runs an outdated pi-hole version).

* the new pi-hole API endpoints do not allow to access the summary
  endpoint without an API token. So, therefore '&auth=<api token>' was
  added.
---
 bumblebee_status/modules/contrib/pihole.py | 34 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/bumblebee_status/modules/contrib/pihole.py b/bumblebee_status/modules/contrib/pihole.py
index 7334abf..6e07287 100644
--- a/bumblebee_status/modules/contrib/pihole.py
+++ b/bumblebee_status/modules/contrib/pihole.py
@@ -4,13 +4,20 @@
 
 Parameters:
     * pihole.address     : pi-hole address (e.q: http://192.168.1.3)
-    * pihole.pwhash      : pi-hole webinterface password hash (can be obtained from the /etc/pihole/SetupVars.conf file)
+
+
+    * pihole.apitoken    : pi-hole API token (can be obtained in the pi-hole webinterface (Settings -> API)
+
+    OR (deprecated!)
+
+    *  pihole.pwhash     : pi-hole webinterface password hash (can be obtained from the /etc/pihole/SetupVars.conf file)
+
 
 contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 """
 
 import requests
-
+import logging
 import core.module
 import core.widget
 import core.input
@@ -22,7 +29,18 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.pihole_status))
 
         self._pihole_address = self.parameter("address", "")
-        self._pihole_pw_hash = self.parameter("pwhash", "")
+        pihole_pw_hash = self.parameter("pwhash", "")
+        pihole_api_token = self.parameter("apitoken", "")
+
+        self._pihole_secret = (
+            pihole_api_token if pihole_api_token != "" else pihole_pw_hash
+        )
+
+        if pihole_pw_hash != "":
+            logging.warn(
+                "pihole: The 'pwhash' parameter is deprecated - consider using the 'apitoken' parameter instead!"
+            )
+
         self._pihole_status = None
         self._ads_blocked_today = "-"
         self.update_pihole_status()
@@ -42,7 +60,11 @@ class Module(core.module.Module):
 
     def update_pihole_status(self):
         try:
-            data = requests.get(self._pihole_address + "/admin/api.php?summary").json()
+            data = requests.get(
+                self._pihole_address
+                + "/admin/api.php?summary&auth="
+                + self._pihole_secret
+            ).json()
             self._pihole_status = True if data["status"] == "enabled" else False
             self._ads_blocked_today = data["ads_blocked_today"]
         except Exception as e:
@@ -56,13 +78,13 @@ class Module(core.module.Module):
                     req = requests.get(
                         self._pihole_address
                         + "/admin/api.php?disable&auth="
-                        + self._pihole_pw_hash
+                        + self._pihole_secret
                     )
                 else:
                     req = requests.get(
                         self._pihole_address
                         + "/admin/api.php?enable&auth="
-                        + self._pihole_pw_hash
+                        + self._pihole_secret
                     )
                 if req is not None:
                     if req.status_code == 200:

From 0b4ff04be56fb79bfe4b7b4a7d85b2000486f157 Mon Sep 17 00:00:00 2001
From: SuperQ <superq@gmail.com>
Date: Mon, 19 Jun 2023 14:03:42 +0200
Subject: [PATCH 455/506] [modules/cpu3] Add new CPU module

Based on cpu2 module, but use `sensors -j` and some json path walking to
better parse CPU temp and fan speeds. The output of `sensors -u` can
contain many duplicates of the same sensor name, but from different
sensor device paths.

Signed-off-by: SuperQ <superq@gmail.com>
---
 bumblebee_status/modules/contrib/cpu3.py | 158 +++++++++++++++++++++++
 requirements/modules/cpu3.txt            |   2 +
 tests/modules/contrib/test_cpu3.py       |   6 +
 3 files changed, 166 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/cpu3.py
 create mode 100644 requirements/modules/cpu3.txt
 create mode 100644 tests/modules/contrib/test_cpu3.py

diff --git a/bumblebee_status/modules/contrib/cpu3.py b/bumblebee_status/modules/contrib/cpu3.py
new file mode 100644
index 0000000..5321012
--- /dev/null
+++ b/bumblebee_status/modules/contrib/cpu3.py
@@ -0,0 +1,158 @@
+"""Multiwidget CPU module
+
+Can display any combination of:
+
+    * max CPU frequency
+    * total CPU load in percents (integer value)
+    * per-core CPU load as graph - either mono or colored
+    * CPU temperature (in Celsius degrees)
+    * CPU fan speed
+
+Requirements:
+
+    * the psutil Python module for the first three items from the list above
+    * sensors executable for the rest
+
+Parameters:
+    * cpu3.layout: Space-separated list of widgets to add.
+      Possible widgets are:
+
+         * cpu3.maxfreq
+         * cpu3.cpuload
+         * cpu3.coresload
+         * cpu3.temp
+         * cpu3.fanspeed
+    * cpu3.colored: 1 for colored per core load graph, 0 for mono (default)
+    * cpu3.temp_json: json path to look for in the output of 'sensors -j';
+      required if cpu3.temp widget is used
+    * cpu3.fan_json: json path to look for in the output of 'sensors -j';
+      required if cpu3.fanspeed widget is used
+
+Note: if you are getting 'n/a' for CPU temperature / fan speed, then you're
+lacking the aforementioned json path settings or they have wrong values.
+
+Example json paths:
+  * `cpu3.temp_json="coretemp-isa-0000.Package id 0.temp1_input"`
+  * `cpu3.fan_json="thinkpad-isa-0000.fan1.fan1_input"`
+
+contributed by `SuperQ <https://github.com/SuperQ>`
+based on cpu2 by `<somospocos <https://github.com/somospocos>`
+"""
+
+import json
+import psutil
+
+import core.module
+
+import util.cli
+import util.graph
+import util.format
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, [])
+
+        self.__layout = self.parameter(
+            "layout", "cpu3.maxfreq cpu3.cpuload cpu3.coresload cpu3.temp cpu3.fanspeed"
+        )
+        self.__widget_names = self.__layout.split()
+        self.__colored = util.format.asbool(self.parameter("colored", False))
+        for widget_name in self.__widget_names:
+            if widget_name == "cpu3.maxfreq":
+                widget = self.add_widget(name=widget_name, full_text=self.maxfreq)
+                widget.set("type", "freq")
+            elif widget_name == "cpu3.cpuload":
+                widget = self.add_widget(name=widget_name, full_text=self.cpuload)
+                widget.set("type", "load")
+            elif widget_name == "cpu3.coresload":
+                widget = self.add_widget(name=widget_name, full_text=self.coresload)
+                widget.set("type", "loads")
+            elif widget_name == "cpu3.temp":
+                widget = self.add_widget(name=widget_name, full_text=self.temp)
+                widget.set("type", "temp")
+            elif widget_name == "cpu3.fanspeed":
+                widget = self.add_widget(name=widget_name, full_text=self.fanspeed)
+                widget.set("type", "fan")
+            if self.__colored:
+                widget.set("pango", True)
+        self.__temp_json = self.parameter("temp_json")
+        if self.__temp_json is None:
+            self.__temp = "n/a"
+        self.__fan_json = self.parameter("fan_json")
+        if self.__fan_json is None:
+            self.__fan = "n/a"
+        # maxfreq is loaded only once at startup
+        if "cpu3.maxfreq" in self.__widget_names:
+            self.__maxfreq = psutil.cpu_freq().max / 1000
+
+    def maxfreq(self, _):
+        return "{:.2f}GHz".format(self.__maxfreq)
+
+    def cpuload(self, _):
+        return "{:>3}%".format(self.__cpuload)
+
+    def add_color(self, bar):
+        """add color as pango markup to a bar"""
+        if bar in ["▁", "▂"]:
+            color = self.theme.color("green", "green")
+        elif bar in ["▃", "▄"]:
+            color = self.theme.color("yellow", "yellow")
+        elif bar in ["▅", "▆"]:
+            color = self.theme.color("orange", "orange")
+        elif bar in ["▇", "█"]:
+            color = self.theme.color("red", "red")
+        colored_bar = '<span foreground="{}">{}</span>'.format(color, bar)
+        return colored_bar
+
+    def coresload(self, _):
+        mono_bars = [util.graph.hbar(x) for x in self.__coresload]
+        if not self.__colored:
+            return "".join(mono_bars)
+        colored_bars = [self.add_color(x) for x in mono_bars]
+        return "".join(colored_bars)
+
+    def temp(self, _):
+        if self.__temp == "n/a" or self.__temp == 0:
+            return "n/a"
+        return "{}°C".format(self.__temp)
+
+    def fanspeed(self, _):
+        if self.__fanspeed == "n/a":
+            return "n/a"
+        return "{}RPM".format(self.__fanspeed)
+
+    def _parse_sensors_output(self):
+        output = util.cli.execute("sensors -j")
+        json_data = json.loads(output)
+
+        temp = "n/a"
+        fan = "n/a"
+        temp_json = json_data
+        fan_json = json_data
+        for path in self.__temp_json.split('.'):
+            temp_json = temp_json[path]
+        for path in self.__fan_json.split('.'):
+            fan_json = fan_json[path]
+        if temp_json is not None:
+            temp = float(temp_json)
+        if fan_json is not None:
+            fan = int(fan_json)
+        return temp, fan
+
+    def update(self):
+        if "cpu3.maxfreq" in self.__widget_names:
+            self.__maxfreq = psutil.cpu_freq().max / 1000
+        if "cpu3.cpuload" in self.__widget_names:
+            self.__cpuload = round(psutil.cpu_percent(percpu=False))
+        if "cpu3.coresload" in self.__widget_names:
+            self.__coresload = psutil.cpu_percent(percpu=True)
+        if "cpu3.temp" in self.__widget_names or "cpu3.fanspeed" in self.__widget_names:
+            self.__temp, self.__fanspeed = self._parse_sensors_output()
+
+    def state(self, widget):
+        """for having per-widget icons"""
+        return [widget.get("type", "")]
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/requirements/modules/cpu3.txt b/requirements/modules/cpu3.txt
new file mode 100644
index 0000000..a28f112
--- /dev/null
+++ b/requirements/modules/cpu3.txt
@@ -0,0 +1,2 @@
+json
+psutil
diff --git a/tests/modules/contrib/test_cpu3.py b/tests/modules/contrib/test_cpu3.py
new file mode 100644
index 0000000..9eac30d
--- /dev/null
+++ b/tests/modules/contrib/test_cpu3.py
@@ -0,0 +1,6 @@
+import pytest
+
+pytest.importorskip("psutil")
+
+def test_load_module():
+    __import__("modules.contrib.cpu3")

From 2ef6f84df3e369daac29116373dea71a105a3650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Eust=C3=A1quio?= <hugo.silva@engdb.com.br>
Date: Thu, 29 Jun 2023 14:38:54 -0300
Subject: [PATCH 456/506] Adding suport for multiple sound cards, not only
 devices.

---
 bumblebee_status/modules/contrib/amixer.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/amixer.py b/bumblebee_status/modules/contrib/amixer.py
index b0fda92..6f44e8c 100644
--- a/bumblebee_status/modules/contrib/amixer.py
+++ b/bumblebee_status/modules/contrib/amixer.py
@@ -4,12 +4,15 @@ Requires the following executable:
     * amixer
 
 Parameters:
+    * amixer.card: Sound Card to use (default is 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 <https://github.com/zetxx>`_ - many thanks!
 
 input handling contributed by `ardadem <https://github.com/ardadem>`_ - many thanks!
+
+multiple audio cards contributed by `hugoeustaquio <https://github.com/hugoeustaquio>`_ - many thanks!
 """
 import re
 
@@ -26,6 +29,7 @@ class Module(core.module.Module):
 
         self.__level = "n/a"
         self.__muted = True
+        self.__card = self.parameter("card", "0")
         self.__device = self.parameter("device", "Master,0")
         self.__change = util.format.asint(
             self.parameter("percent_change", "4%").strip("%"), 0, 100
@@ -62,7 +66,7 @@ class Module(core.module.Module):
         self.set_parameter("{}%-".format(self.__change))
 
     def set_parameter(self, parameter):
-        util.cli.execute("amixer -q set {} {}".format(self.__device, parameter))
+        util.cli.execute("amixer -c {} -q set {} {}".format(self.__card, self.__device, parameter))
 
     def volume(self, widget):
         if self.__level == "n/a":
@@ -79,7 +83,7 @@ class Module(core.module.Module):
     def update(self):
         try:
             self.__level = util.cli.execute(
-                "amixer get {}".format(self.__device)
+                "amixer -c {} get {}".format(self.__card, self.__device)
             )
         except Exception as e:
             self.__level = "n/a"

From b866ab25b673665d44719e053ca0e6b298604282 Mon Sep 17 00:00:00 2001
From: Lasnik <lasnikprogram@gmail.com>
Date: Mon, 10 Jul 2023 15:42:11 +0200
Subject: [PATCH 457/506] create module

---
 bumblebee_status/modules/contrib/usage.py | 53 +++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/usage.py

diff --git a/bumblebee_status/modules/contrib/usage.py b/bumblebee_status/modules/contrib/usage.py
new file mode 100644
index 0000000..5f21198
--- /dev/null
+++ b/bumblebee_status/modules/contrib/usage.py
@@ -0,0 +1,53 @@
+# pylint: disable=C0111,R0903
+
+"""
+Module for ActivityWatch (https://activitywatch.net/)
+Displays the amount of time the system was used actively
+"""
+import sqlite3
+import os
+
+import core.module
+import core.widget
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.output))
+        self.__uptime = ""
+
+    def output(self, _):
+        return "{}".format(self.__uptime)
+
+    def update(self):
+        database_loc = self.parameter('database', '~/.local/share/activitywatch/aw-server/peewee-sqlite.v2.db')
+        home = os.path.expanduser('~')
+
+        database = sqlite3.connect(database_loc.replace('~', home))
+        cursor = database.cursor()
+        
+        cursor.execute('SELECT key, id FROM bucketmodel')
+
+        bucket_id = 1
+
+        for tuple in cursor.fetchall():
+            if 'aw-watcher-afk' in tuple[1]:
+                bucket_id = tuple[0]
+
+        cursor.execute(f'SELECT duration, datastr FROM eventmodel WHERE bucket_id = {bucket_id} ' +
+                       'AND strftime(\'%Y,%m,%d\', timestamp) = strftime(\'%Y,%m,%d\', \'now\')')
+        
+        duration = 0
+
+        for tuple in cursor.fetchall():
+            if '{"status": "not-afk"}' in tuple[1]:
+                duration += tuple[0]
+
+        hours = '%.0f' % (duration // 3600)
+        minutes = '%.0f' % ((duration % 3600) // 60)
+        seconds = '%.0f' % (duration % 60)
+        
+        formatting = self.parameter('format', 'HHh, MMmin')
+        self.__uptime = formatting.replace('HH', hours).replace('MM', minutes).replace('SS', seconds)
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 305f9cf491583cf4d9359880d71e3383ba10d4ac Mon Sep 17 00:00:00 2001
From: Lasnik <lasnikprogram@gmail.com>
Date: Mon, 10 Jul 2023 15:51:00 +0200
Subject: [PATCH 458/506] formatting guidelines

---
 bumblebee_status/modules/contrib/usage.py | 44 ++++++++++++++---------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/bumblebee_status/modules/contrib/usage.py b/bumblebee_status/modules/contrib/usage.py
index 5f21198..b05ace2 100644
--- a/bumblebee_status/modules/contrib/usage.py
+++ b/bumblebee_status/modules/contrib/usage.py
@@ -4,6 +4,7 @@
 Module for ActivityWatch (https://activitywatch.net/)
 Displays the amount of time the system was used actively
 """
+
 import sqlite3
 import os
 
@@ -14,40 +15,49 @@ import core.widget
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.output))
-        self.__uptime = ""
+        self.__usage = ""
 
     def output(self, _):
-        return "{}".format(self.__uptime)
+        return "{}".format(self.__usage)
 
     def update(self):
-        database_loc = self.parameter('database', '~/.local/share/activitywatch/aw-server/peewee-sqlite.v2.db')
-        home = os.path.expanduser('~')
+        database_loc = self.parameter(
+            "database", "~/.local/share/activitywatch/aw-server/peewee-sqlite.v2.db"
+        )
+        home = os.path.expanduser("~")
 
-        database = sqlite3.connect(database_loc.replace('~', home))
+        database = sqlite3.connect(database_loc.replace("~", home))
         cursor = database.cursor()
-        
-        cursor.execute('SELECT key, id FROM bucketmodel')
+
+        cursor.execute("SELECT key, id FROM bucketmodel")
 
         bucket_id = 1
 
         for tuple in cursor.fetchall():
-            if 'aw-watcher-afk' in tuple[1]:
+            if "aw-watcher-afk" in tuple[1]:
                 bucket_id = tuple[0]
 
-        cursor.execute(f'SELECT duration, datastr FROM eventmodel WHERE bucket_id = {bucket_id} ' +
-                       'AND strftime(\'%Y,%m,%d\', timestamp) = strftime(\'%Y,%m,%d\', \'now\')')
-        
+        cursor.execute(
+            f"SELECT duration, datastr FROM eventmodel WHERE bucket_id = {bucket_id} "
+            + 'AND strftime("%Y,%m,%d", timestamp) = strftime("%Y,%m,%d", "now")'
+        )
+
         duration = 0
 
         for tuple in cursor.fetchall():
             if '{"status": "not-afk"}' in tuple[1]:
                 duration += tuple[0]
 
-        hours = '%.0f' % (duration // 3600)
-        minutes = '%.0f' % ((duration % 3600) // 60)
-        seconds = '%.0f' % (duration % 60)
-        
-        formatting = self.parameter('format', 'HHh, MMmin')
-        self.__uptime = formatting.replace('HH', hours).replace('MM', minutes).replace('SS', seconds)
+        hours = "%.0f" % (duration // 3600)
+        minutes = "%.0f" % ((duration % 3600) // 60)
+        seconds = "%.0f" % (duration % 60)
+
+        formatting = self.parameter("format", "HHh, MMmin")
+        self.__usage = (
+            formatting.replace("HH", hours)
+            .replace("MM", minutes)
+            .replace("SS", seconds)
+        )
+
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 8178919e2c53ccf2652dae3d546e9c5a010cb77f Mon Sep 17 00:00:00 2001
From: Lasnik <lasnikprogram@gmail.com>
Date: Mon, 10 Jul 2023 16:52:22 +0200
Subject: [PATCH 459/506] add description

---
 bumblebee_status/modules/contrib/usage.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/usage.py b/bumblebee_status/modules/contrib/usage.py
index b05ace2..d64e3e1 100644
--- a/bumblebee_status/modules/contrib/usage.py
+++ b/bumblebee_status/modules/contrib/usage.py
@@ -2,7 +2,22 @@
 
 """
 Module for ActivityWatch (https://activitywatch.net/)
-Displays the amount of time the system was used actively
+Displays the amount of time the system was used actively.
+
+Requirements:
+    * sqlite3 module for python
+    * ActivityWatch
+
+Errors:
+    * when you get 'error: unable to open database file', modify the parameter 'database' to your ActivityWatch database file
+    -> often found by running 'locate aw-server/peewee-sqlite.v2.db'
+
+Parameters:
+    * usage.database: path to your database file
+    * usage.format: Specify what gets printed to the bar
+    -> use 'HH', 'MM' or 'SS', they will get replaced by the number of hours, minutes and seconds, respectively
+
+contributed by lasnikr (https://github.com/lasnikr)
 """
 
 import sqlite3

From ee796f658963add7b0b35f33225ea2dbb807b0f8 Mon Sep 17 00:00:00 2001
From: James Baumgarten <jebaum@ucla.edu>
Date: Sun, 16 Jul 2023 15:06:31 -0600
Subject: [PATCH 460/506] allow setting sink ID in pipewire module

---
 bumblebee_status/modules/contrib/pipewire.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/bumblebee_status/modules/contrib/pipewire.py b/bumblebee_status/modules/contrib/pipewire.py
index 4c0f23a..f07cd55 100644
--- a/bumblebee_status/modules/contrib/pipewire.py
+++ b/bumblebee_status/modules/contrib/pipewire.py
@@ -29,6 +29,8 @@ class Module(core.module.Module):
             / 100.0
         )  # divide by 100 because wpctl represents 100% volume as 1.00, 50% as 0.50, etc
 
+        self.__id = self.parameter("sink_id") or "@DEFAULT_AUDIO_SINK@"
+
         events = [
             {
                 "type": "mute",
@@ -51,20 +53,16 @@ class Module(core.module.Module):
             core.input.register(self, button=event["button"], cmd=event["action"])
 
     def toggle(self, event):
-        util.cli.execute("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")
+        util.cli.execute("wpctl set-mute {} toggle".format(self.__id))
 
     def increase_volume(self, event):
         util.cli.execute(
-            "wpctl set-volume --limit 1.0 @DEFAULT_AUDIO_SINK@ {}+".format(
-                self.__change
-            )
+            "wpctl set-volume --limit 1.0 {} {}+".format(self.__change, self.__id)
         )
 
     def decrease_volume(self, event):
         util.cli.execute(
-            "wpctl set-volume --limit 1.0 @DEFAULT_AUDIO_SINK@ {}-".format(
-                self.__change
-            )
+            "wpctl set-volume --limit 1.0 {} {}-".format(self.__change, self.__id)
         )
 
     def volume(self, widget):
@@ -75,7 +73,7 @@ class Module(core.module.Module):
     def update(self):
         try:
             # `wpctl get-volume` will return a string like "Volume: n.nn" or "Volume: n.nn [MUTED]"
-            volume = util.cli.execute("wpctl get-volume @DEFAULT_AUDIO_SINK@")
+            volume = util.cli.execute("wpctl get-volume {}".format(self.__id))
             v = re.search("\d\.\d+", volume)
             m = re.search("MUTED", volume)
             self.__level = v.group()

From 4df527216420716a8568d431f563bbb7270eb852 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 17 Jul 2023 12:36:32 +0200
Subject: [PATCH 461/506] [workflows] update python versions

---
 .github/workflows/autotest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 7b6deba..4877a70 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v3

From d27986a316702984f9de3238c3b71319e1e856d1 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 17 Jul 2023 12:43:06 +0200
Subject: [PATCH 462/506] [requirements] remove json requirement - which is a
 builtin

---
 requirements/modules/cpu3.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements/modules/cpu3.txt b/requirements/modules/cpu3.txt
index a28f112..a4d92cc 100644
--- a/requirements/modules/cpu3.txt
+++ b/requirements/modules/cpu3.txt
@@ -1,2 +1 @@
-json
 psutil

From 2546dbae2e5eede979f9a525a36868813dbc26c0 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 17 Jul 2023 12:55:06 +0200
Subject: [PATCH 463/506] [tests/amixer] fix tests

---
 tests/modules/contrib/test_amixer.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/modules/contrib/test_amixer.py b/tests/modules/contrib/test_amixer.py
index 4ff37a3..146d586 100644
--- a/tests/modules/contrib/test_amixer.py
+++ b/tests/modules/contrib/test_amixer.py
@@ -117,29 +117,29 @@ def test_toggle(module_mock, mocker):
     command = mocker.patch('util.cli.execute')
     module = module_mock()
     module.toggle(False)
-    command.assert_called_once_with('amixer -q set Master,0 toggle')
+    command.assert_called_once_with('amixer -c 0 -q set Master,0 toggle')
 
 def test_default_volume(module_mock, mocker):
     module = module_mock()
 
     command = mocker.patch('util.cli.execute')
     module.increase_volume(False)
-    command.assert_called_once_with('amixer -q set Master,0 4%+')
+    command.assert_called_once_with('amixer -c 0 -q set Master,0 4%+')
 
     command = mocker.patch('util.cli.execute')
     module.decrease_volume(False)
-    command.assert_called_once_with('amixer -q set Master,0 4%-')
+    command.assert_called_once_with('amixer -c 0 -q set Master,0 4%-')
 
 def test_custom_volume(module_mock, mocker):
     module = module_mock(['-p', 'amixer.percent_change=25'])
 
     command = mocker.patch('util.cli.execute')
     module.increase_volume(False)
-    command.assert_called_once_with('amixer -q set Master,0 25%+')
+    command.assert_called_once_with('amixer -c 0 -q set Master,0 25%+')
 
     command = mocker.patch('util.cli.execute')
     module.decrease_volume(False)
-    command.assert_called_once_with('amixer -q set Master,0 25%-')
+    command.assert_called_once_with('amixer -c 0 -q set Master,0 25%-')
 
 def test_custom_device(module_mock, mocker):
     mocker.patch('util.cli.execute')
@@ -147,13 +147,13 @@ def test_custom_device(module_mock, mocker):
 
     command = mocker.patch('util.cli.execute')
     module.toggle(False)
-    command.assert_called_once_with('amixer -q set CustomMaster toggle')
+    command.assert_called_once_with('amixer -c 0 -q set CustomMaster toggle')
 
     command = mocker.patch('util.cli.execute')
     module.increase_volume(False)
-    command.assert_called_once_with('amixer -q set CustomMaster 4%+')
+    command.assert_called_once_with('amixer -c 0 -q set CustomMaster 4%+')
 
     command = mocker.patch('util.cli.execute')
     module.decrease_volume(False)
-    command.assert_called_once_with('amixer -q set CustomMaster 4%-')
+    command.assert_called_once_with('amixer -c 0 -q set CustomMaster 4%-')
 

From f855d5c2354c894d132d8e58857407de0903d26c Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 17 Jul 2023 12:58:48 +0200
Subject: [PATCH 464/506] [modules/aur-update] hide if no packages

fixes #978
---
 bumblebee_status/modules/contrib/aur-update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/aur-update.py b/bumblebee_status/modules/contrib/aur-update.py
index f1b85ea..9afdc89 100644
--- a/bumblebee_status/modules/contrib/aur-update.py
+++ b/bumblebee_status/modules/contrib/aur-update.py
@@ -31,7 +31,7 @@ class Module(core.module.Module):
         return self.__format.format(self.__packages)
 
     def hidden(self):
-        return self.__packages == 0 and not self.__error
+        return self.__packages == 0
 
     def update(self):
         self.__error = False

From e1f50f4782b50e680c1d1500376f531007a0a631 Mon Sep 17 00:00:00 2001
From: Shahan Arshad <shahan@gmail.com>
Date: Wed, 19 Jul 2023 22:10:05 +0500
Subject: [PATCH 465/506] Add: missing mention of pipewire module on website

I was reading the docs on the website(https://bumblebee-status.readthedocs.io/en/latest/modules.html#contrib) and there was no mention of the pipewire module which exists among the contrib modules. This edit will inform users about the pipewire module
---
 docs/modules.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/modules.rst b/docs/modules.rst
index d9b853f..c7a78de 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1243,6 +1243,19 @@ Parameters:
 
 contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 
+pipewire
+~~~~~~~
+
+get volume level or control it
+
+Requires the following executable:
+    * wpctl
+
+Parameters:
+    * wpctl.percent_change: How much to change volume by when scrolling on the module (default is 4%)
+
+heavily based on amixer module
+
 playerctl
 ~~~~~~~~~
 

From 04a222f3c8bc7eaa41bdcd2f1ea1c0cfe28a8964 Mon Sep 17 00:00:00 2001
From: Shahan Arshad <shahan@gmail.com>
Date: Thu, 20 Jul 2023 02:16:24 +0500
Subject: [PATCH 466/506] Fix: pipewire.py module

mousewheel up and down events were initially not working on my bumblebee status bar. After verifying on the command line, it seems that wpctl set-volume command requires sink ID first and percentage change as the second arg.

steps to verify, assuming wireplumber is installed and sink ID is 32

```sh
wpctl set-volume 32 50%
```
will set the volume to 50%

```sh
wpctl set-volume 50% 32
```
will result in `Object '52' not found
---
 bumblebee_status/modules/contrib/pipewire.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/contrib/pipewire.py b/bumblebee_status/modules/contrib/pipewire.py
index f07cd55..86c9b9d 100644
--- a/bumblebee_status/modules/contrib/pipewire.py
+++ b/bumblebee_status/modules/contrib/pipewire.py
@@ -57,12 +57,12 @@ class Module(core.module.Module):
 
     def increase_volume(self, event):
         util.cli.execute(
-            "wpctl set-volume --limit 1.0 {} {}+".format(self.__change, self.__id)
+            "wpctl set-volume --limit 1.0 {} {}+".format(self.__id, self.__change)
         )
 
     def decrease_volume(self, event):
         util.cli.execute(
-            "wpctl set-volume --limit 1.0 {} {}-".format(self.__change, self.__id)
+            "wpctl set-volume --limit 1.0 {} {}-".format(self.__id, self.__change)
         )
 
     def volume(self, widget):

From d03e6307f5e8c0b1c0451636ac9b1e84f3529a73 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:18:17 +0200
Subject: [PATCH 467/506] [contrib/stock] change API to alphavantage.co

Changed the stock module to work again (with an API key), and make it
easier to change the data provider by the user.

fixes #971
---
 bumblebee_status/modules/contrib/stock.py | 58 +++++++++++++----------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/bumblebee_status/modules/contrib/stock.py b/bumblebee_status/modules/contrib/stock.py
index 224a5fb..6b35bf7 100644
--- a/bumblebee_status/modules/contrib/stock.py
+++ b/bumblebee_status/modules/contrib/stock.py
@@ -5,7 +5,9 @@
 
 Parameters:
     * stock.symbols : Comma-separated list of symbols to fetch
-    * stock.change : Should we fetch change in stock value (defaults to True)
+    * stock.apikey : API key created on https://alphavantage.co
+    * stock.url : URL to use, defaults to "https://www.alphavantage.co/query?function=GLOBAL_QUOTE&symbol={symbol}&apikey={apikey}"
+    * stock.fields : Fields from the response to show, defaults to "01. symbol,05. price,10. change percent"
 
 
 contributed by `msoulier <https://github.com/msoulier>`_ - many thanks!
@@ -22,6 +24,12 @@ import core.decorators
 
 import util.format
 
+def flatten(d, result):
+    for k, v in d.items():
+        if type(v) is dict:
+            flatten(v, result)
+        else:
+            result[k] = v
 
 class Module(core.module.Module):
     @core.decorators.every(hours=1)
@@ -29,41 +37,41 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.value))
 
         self.__symbols = self.parameter("symbols", "")
+        self.__apikey = self.parameter("apikey", None)
+        self.__fields = self.parameter("fields", "01. symbol,05. price,10. change percent").split(",")
+        self.__url = self.parameter("url", "https://www.alphavantage.co/query?function=GLOBAL_QUOTE&symbol={symbol}&apikey={apikey}")
         self.__change = util.format.asbool(self.parameter("change", True))
-        self.__value = None
+        self.__values = []
+
 
     def value(self, widget):
-        results = []
-        if not self.__value:
-            return "n/a"
-        data = json.loads(self.__value)
+        result = ""
 
-        for symbol in data["quoteResponse"]["result"]:
-            valkey = "regularMarketChange" if self.__change else "regularMarketPrice"
-            sym = symbol.get("symbol", "n/a")
-            currency = symbol.get("currency", "USD")
-            val = "n/a" if not valkey in symbol else "{:.2f}".format(symbol[valkey])
-            results.append("{} {} {}".format(sym, val, currency))
-        return " ".join(results)
+        for value in self.__values:
+            res = {}
+            flatten(value, res)
+            for field in self.__fields:
+                result += res.get(field, "n/a") + " "
+        result = result[:-1]
+        return result
 
     def fetch(self):
+        results = []
         if self.__symbols:
-            url = "https://query1.finance.yahoo.com/v7/finance/quote?symbols="
-            url += (
-                self.__symbols
-                + "&fields=regularMarketPrice,currency,regularMarketChange"
-            )
-            try:
-                return urllib.request.urlopen(url).read().strip()
-            except urllib.request.URLError:
-                logging.error("unable to open stock exchange url")
-                return None
+            for symbol in self.__symbols.split(","):
+                url = self.__url.format(symbol=symbol, apikey=self.__apikey)
+                try:
+                    results.append(json.loads(urllib.request.urlopen(url).read().strip()))
+                except urllib.request.URLError:
+                    logging.error("unable to open stock exchange url")
+                    return []
         else:
             logging.error("unable to retrieve stock exchange rate")
-            return None
+            return []
+        return results
 
     def update(self):
-        self.__value = self.fetch()
+        self.__values = self.fetch()
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 37b5646d65d201a6380395cc8e0502c69939b03d Mon Sep 17 00:00:00 2001
From: Pavle Portic <git@theedgeofrage.com>
Date: Thu, 15 Jun 2023 19:41:34 +0200
Subject: [PATCH 468/506] Allow adjusting the font size of tk popups

---
 bumblebee_status/core/config.py               |  9 +++++++++
 bumblebee_status/modules/contrib/bluetooth.py | 12 ++++--------
 bumblebee_status/modules/contrib/system.py    |  8 ++++----
 bumblebee_status/modules/contrib/vpn.py       |  2 +-
 bumblebee_status/modules/core/pulseaudio.py   |  2 +-
 bumblebee_status/modules/core/pulsectl.py     |  2 +-
 bumblebee_status/modules/core/vault.py        |  4 ++--
 bumblebee_status/util/popup.py                |  9 ++++++---
 8 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index f191673..1d4ebaa 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -276,6 +276,15 @@ class Config(util.store.Store):
     def interval(self, default=1):
         return util.format.seconds(self.get("interval", default))
 
+    """Returns the global popup menu font size
+
+    :return: popup menu font size
+    :rtype: int
+    """
+
+    def popup_font_size(self, default=12):
+        return util.format.asint(self.get("popup_font_size", default))
+
     """Returns whether debug mode is enabled
 
     :return: True if debug is enabled, False otherwise
diff --git a/bumblebee_status/modules/contrib/bluetooth.py b/bumblebee_status/modules/contrib/bluetooth.py
index 481ae88..56f5b8b 100644
--- a/bumblebee_status/modules/contrib/bluetooth.py
+++ b/bumblebee_status/modules/contrib/bluetooth.py
@@ -75,19 +75,15 @@ class Module(core.module.Module):
 
     def popup(self, widget):
         """Show a popup menu."""
-        menu = util.popup.PopupMenu()
+        menu = util.popup.menu(self.__config)
         if self._status == "On":
-            menu.add_menuitem("Disable Bluetooth")
+            menu.add_menuitem("Disable Bluetooth", callback=self._toggle)
         elif self._status == "Off":
-            menu.add_menuitem("Enable Bluetooth")
+            menu.add_menuitem("Enable Bluetooth", callback=self._toggle)
         else:
             return
 
-        # show menu and get return code
-        ret = menu.show(widget)
-        if ret == 0:
-            # first (and only) item selected.
-            self._toggle()
+        menu.show(widget)
 
     def _toggle(self, widget=None):
         """Toggle bluetooth state."""
diff --git a/bumblebee_status/modules/contrib/system.py b/bumblebee_status/modules/contrib/system.py
index 79e8846..8b136a1 100644
--- a/bumblebee_status/modules/contrib/system.py
+++ b/bumblebee_status/modules/contrib/system.py
@@ -8,11 +8,11 @@ adds the possibility to
 	* reboot
 
 the system.
-	
+
 Per default a confirmation dialog is shown before the actual action is performed.
-	
+
 Parameters:
-	* system.confirm: show confirmation dialog before performing any action (default: true) 
+	* system.confirm: show confirmation dialog before performing any action (default: true)
         * system.reboot: specify a reboot command (defaults to 'reboot')
         * system.shutdown: specify a shutdown command (defaults to 'shutdown -h now')
         * system.logout: specify a logout command (defaults to 'i3exit logout')
@@ -77,7 +77,7 @@ class Module(core.module.Module):
             util.cli.execute(popupcmd)
             return
 
-        menu = util.popup.menu()
+        menu = util.popup.menu(self.__config)
         reboot_cmd = self.parameter("reboot", "reboot")
         shutdown_cmd = self.parameter("shutdown", "shutdown -h now")
         logout_cmd = self.parameter("logout", "i3exit logout")
diff --git a/bumblebee_status/modules/contrib/vpn.py b/bumblebee_status/modules/contrib/vpn.py
index d9c8793..ae8e748 100644
--- a/bumblebee_status/modules/contrib/vpn.py
+++ b/bumblebee_status/modules/contrib/vpn.py
@@ -93,7 +93,7 @@ class Module(core.module.Module):
             self.__connected_vpn_profile = None
 
     def popup(self, widget):
-        menu = util.popup.menu()
+        menu = util.popup.menu(self.__config)
 
         if self.__connected_vpn_profile is not None:
             menu.add_menuitem("Disconnect", callback=self.__on_vpndisconnect)
diff --git a/bumblebee_status/modules/core/pulseaudio.py b/bumblebee_status/modules/core/pulseaudio.py
index 431de10..5f74248 100644
--- a/bumblebee_status/modules/core/pulseaudio.py
+++ b/bumblebee_status/modules/core/pulseaudio.py
@@ -236,7 +236,7 @@ class Module(core.module.Module):
         channel = "sinks" if self._channel == "sink" else "sources"
         result = util.cli.execute("pactl list {} short".format(channel))
 
-        menu = util.popup.menu()
+        menu = util.popup.menu(self.__config)
         lines = result.splitlines()
         for line in lines:
             info = line.split("\t")
diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 901202a..4342913 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -171,7 +171,7 @@ class Module(core.module.Module):
     def select_default_device_popup(self, widget):
         with pulsectl.Pulse(self.id) as pulse:
             devs = pulse.sink_list() if self.__type == "sink" else pulse.source_list()
-        menu = util.popup.menu()
+        menu = util.popup.menu(self.__config)
         for dev in devs:
             menu.add_menuitem(
                 dev.description,
diff --git a/bumblebee_status/modules/core/vault.py b/bumblebee_status/modules/core/vault.py
index 7f3fb75..ba316bc 100644
--- a/bumblebee_status/modules/core/vault.py
+++ b/bumblebee_status/modules/core/vault.py
@@ -52,7 +52,7 @@ def build_menu(parent, current_directory, callback):
                 )
 
             else:
-                submenu = util.popup.menu(parent, leave=False)
+                submenu = util.popup.menu(self.__config, parent, leave=False)
                 build_menu(
                     submenu, os.path.join(current_directory, entry.name), callback
                 )
@@ -73,7 +73,7 @@ class Module(core.module.Module):
         core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.popup)
 
     def popup(self, widget):
-        menu = util.popup.menu(leave=False)
+        menu = util.popup.menu(self.__config, leave=False)
 
         build_menu(menu, self.__path, self.__callback)
         menu.show(widget, offset_x=self.__offx, offset_y=self.__offy)
diff --git a/bumblebee_status/util/popup.py b/bumblebee_status/util/popup.py
index 784a037..cd083f7 100644
--- a/bumblebee_status/util/popup.py
+++ b/bumblebee_status/util/popup.py
@@ -3,6 +3,7 @@
 import logging
 
 import tkinter as tk
+import tkinter.font as tkFont
 
 import functools
 
@@ -10,11 +11,12 @@ import functools
 class menu(object):
     """Draws a hierarchical popup menu
 
+    :param config: Global config singleton, passed on from modules
     :param parent: If given, this menu is a leave of the "parent" menu
     :param leave: If set to True, close this menu when mouse leaves the area (defaults to True)
     """
 
-    def __init__(self, parent=None, leave=True):
+    def __init__(self, config, parent=None, leave=True):
         self.running = True
 
         self.parent = parent
@@ -23,6 +25,7 @@ class menu(object):
         self._root.withdraw()
         self._menu = tk.Menu(self._root, tearoff=0)
         self._menu.bind("<FocusOut>", self.__on_focus_out)
+        self._font_size = tkFont.Font(size=config.popup_font_size())
 
         if leave:
             self._menu.bind("<Leave>", self.__on_focus_out)
@@ -68,7 +71,7 @@ class menu(object):
     """
 
     def add_cascade(self, menuitem, submenu):
-        self._menu.add_cascade(label=menuitem, menu=submenu.menu())
+        self._menu.add_cascade(label=menuitem, menu=submenu.menu(), font=self._font_size)
 
     """Adds an item to the current menu
 
@@ -78,7 +81,7 @@ class menu(object):
 
     def add_menuitem(self, menuitem, callback):
         self._menu.add_command(
-            label=menuitem, command=functools.partial(self.__on_click, callback)
+            label=menuitem, command=functools.partial(self.__on_click, callback), font=self._font_size,
         )
 
     """Adds a separator to the menu in the current location"""

From 9e6e656fa87eb9e5ae45a790bbd427b88de5b186 Mon Sep 17 00:00:00 2001
From: Pavle Portic <git@theedgeofrage.com>
Date: Wed, 14 Jun 2023 21:30:16 +0200
Subject: [PATCH 469/506] Add device filter support to pulsectl popup menu

---
 bumblebee_status/modules/core/pulsectl.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 4342913..701f6ef 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -13,6 +13,8 @@ Parameters:
     * pulsectl.autostart: If set to 'true' (default is 'false'), automatically starts the pulsectl daemon if it is not running
     * pulsectl.percent_change: How much to change volume by when scrolling on the module (default is 2%)
     * pulsectl.limit: Upper limit for setting the volume (default is 0%, which means 'no limit')
+    * pulsectl.popup-filter: Comma-separated list of device strings (if the device name contains it) to exclude
+      from the default device popup menu (e.g. Monitor for sources)
     * pulsectl.showbars: 'true' for showing volume bars, requires --markup=pango;
       'false' for not showing volume bars (default)
     * pulsectl.showdevicename: If set to 'true' (default is 'false'), the currently selected default device is shown.
@@ -70,6 +72,11 @@ class Module(core.module.Module):
             self.parameter("percent_change", "2%").strip("%"), 0, 100
         )
         self.__limit = util.format.asint(self.parameter("limit", "0%").strip("%"), 0)
+        popup_filter_param = self.parameter("popup-filter", [])
+        if popup_filter_param == '':
+            self.__popup_filter = []
+        else:
+            self.__popup_filter = util.format.aslist(popup_filter_param)
 
         events = [
             {
@@ -103,8 +110,8 @@ class Module(core.module.Module):
             res = f"{res} {util.graph.hbar(self.__volume*100)}"
 
         if self.__show_device_name:
-            friendly_name = self.parameter(self.__devicename, self.__devicename)
-            icon = self.parameter("icon." + self.__devicename, "")
+            friendly_name = self.parameter(self.__devicename.lower(), self.__devicename)
+            icon = self.parameter("icon." + self.__devicename.lower(), "")
             res = (
                 icon + " " + friendly_name + " | " + res
                 if icon != ""
@@ -170,7 +177,12 @@ class Module(core.module.Module):
 
     def select_default_device_popup(self, widget):
         with pulsectl.Pulse(self.id) as pulse:
-            devs = pulse.sink_list() if self.__type == "sink" else pulse.source_list()
+            if self.__type == "sink":
+                devs = pulse.sink_list()
+            else:
+                devs = pulse.source_list()
+
+        devs = filter(lambda dev: not any(filter in dev.description for filter in self.__popup_filter), devs)
         menu = util.popup.menu(self.__config)
         for dev in devs:
             menu.add_menuitem(

From fded39fa810ee95565e6e90dcd5da3512f3cebb9 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Mon, 11 Sep 2023 09:36:47 +0200
Subject: [PATCH 470/506] [modules/pulsectl] make device names case sensitive

A previous change accidentially changed the "pretty" device name mapping
to be required to be in lowercase (rather than the exact name of the
devices. Restore previous functionality.

fixes #989
---
 bumblebee_status/modules/core/pulsectl.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index 701f6ef..fd77c26 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -110,8 +110,8 @@ class Module(core.module.Module):
             res = f"{res} {util.graph.hbar(self.__volume*100)}"
 
         if self.__show_device_name:
-            friendly_name = self.parameter(self.__devicename.lower(), self.__devicename)
-            icon = self.parameter("icon." + self.__devicename.lower(), "")
+            friendly_name = self.parameter(self.__devicename, self.__devicename)
+            icon = self.parameter("icon." + self.__devicename, "")
             res = (
                 icon + " " + friendly_name + " | " + res
                 if icon != ""

From b76213203792107bde548f497a9b13407cd0e532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20L=C3=BCftinger?= <lukas.lueftinger@outlook.com>
Date: Wed, 13 Sep 2023 18:02:26 +0200
Subject: [PATCH 471/506] poll window title also on workspace change (not only
 window events)

---
 bumblebee_status/modules/contrib/title.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/title.py b/bumblebee_status/modules/contrib/title.py
index 055369e..1c98b42 100644
--- a/bumblebee_status/modules/contrib/title.py
+++ b/bumblebee_status/modules/contrib/title.py
@@ -50,8 +50,9 @@ class Module(core.module.Module):
 
         # create a connection with i3ipc
         self.__i3 = i3ipc.Connection()
-        # event is called both on focus change and title change
+        # event is called both on focus change and title change, and on workspace change
         self.__i3.on("window", lambda __p_i3, __p_e: self.__pollTitle())
+        self.__i3.on("workspace", lambda __p_i3, __p_e: self.__pollTitle())
         # begin listening for events
         threading.Thread(target=self.__i3.main).start()
 

From b42323013d5fdb6dc47b487d2d863e0556fd85a8 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:06:57 +0200
Subject: [PATCH 472/506] fix(config): make config file keys case sensitive

Since the configparser library by default parses keys case insensitive
(all lowercase), certain mappings, especially in the pulseaudio modules,
could fail ("internal" pulseaudio device names are matched against
entries in the configuration).

fixes #992
---
 bumblebee_status/core/config.py | 11 ++++++++---
 tests/core/test_config.py       |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py
index 1d4ebaa..0b564b3 100644
--- a/bumblebee_status/core/config.py
+++ b/bumblebee_status/core/config.py
@@ -240,11 +240,16 @@ class Config(util.store.Store):
     :param filename: path to the file to load
     """
 
-    def load_config(self, filename):
-        if os.path.exists(filename):
+    def load_config(self, filename, content=None):
+        if os.path.exists(filename) or content != None:
             log.info("loading {}".format(filename))
             tmp = RawConfigParser()
-            tmp.read(u"{}".format(filename))
+            tmp.optionxform = str
+
+            if content:
+                tmp.read_string(content)
+            else:
+                tmp.read(u"{}".format(filename))
 
             if tmp.has_section("module-parameters"):
                 for key, value in tmp.items("module-parameters"):
diff --git a/tests/core/test_config.py b/tests/core/test_config.py
index 762c674..02695cd 100644
--- a/tests/core/test_config.py
+++ b/tests/core/test_config.py
@@ -113,6 +113,12 @@ def test_missing_parameter():
     assert cfg.get("test.key") == None
     assert cfg.get("test.key", "no-value-set") == "no-value-set"
 
+def test_file_case_sensitivity():
+    cfg = core.config.Config([])
+    cfg.load_config("", content="[module-parameters]\ntest.key = VaLuE\ntest.KeY2 = value")
+
+    assert cfg.get("test.key") == "VaLuE"
+    assert cfg.get("test.KeY2") == "value"
 
 #
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From d303b794f3147b01662d889a4b2e718256e799af Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:11:23 +0200
Subject: [PATCH 473/506] feat(docs): clarify line continuation

fixes #987
---
 docs/introduction.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/introduction.rst b/docs/introduction.rst
index 3831d4b..891b14c 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -44,6 +44,14 @@ like this:
            -t <theme>
    }
 
+Line continuations (breaking a single line into multiple lines) is allowed in
+the i3 configuration, but please ensure that all lines except the final one need to have a trailing
+"\".
+This is explained in detail here:
+[i3 user guide: line continuation](https://i3wm.org/docs/userguide.html#line_continuation)
+
+
+
 You can retrieve a list of modules (and their parameters) and themes by
 entering:
 

From 2e7e75a27c6a9dac00f401540fa337417820df49 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:15:31 +0200
Subject: [PATCH 474/506] feat(shell): add timeout warning and faster update

see #990
---
 bumblebee_status/modules/contrib/shell.py |  2 ++
 bumblebee_status/util/cli.py              | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index 566de42..7043778 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -61,6 +61,7 @@ class Module(core.module.Module):
         # if requested then run not async version and just execute command in this thread
         if not self.__async:
             self.__output = util.cli.execute(self.__command, shell=True, ignore_errors=True).strip()
+            core.event.trigger("update", [self.id], redraw_only=True)
             return
 
         # if previous thread didn't end yet then don't do anything
@@ -71,6 +72,7 @@ class Module(core.module.Module):
         self.__current_thread = threading.Thread(
             target=lambda obj, cmd: obj.set_output(
                 util.cli.execute(cmd, ignore_errors=True)
+                core.event.trigger("update", [self.id], redraw_only=True)
             ),
             args=(self, self.__command),
         )
diff --git a/bumblebee_status/util/cli.py b/bumblebee_status/util/cli.py
index d14dc6a..4ef25d9 100644
--- a/bumblebee_status/util/cli.py
+++ b/bumblebee_status/util/cli.py
@@ -52,7 +52,19 @@ def execute(
         raise RuntimeError("{} not found".format(cmd))
 
     if wait:
-        out, _ = proc.communicate()
+        timeout = 60
+        try:
+            out, _ = proc.communicate(timeout=timeout)
+        except subprocess.TimeoutExpired as e:
+            logging.warning(
+                f"""
+                Communication with process pid={proc.pid} hangs for more
+                than {timeout} seconds.
+                If this is not expected, the process is stale, or
+                you might have run in stdout / stderr deadlock.
+                """
+            )
+            out, _ = proc.communicate()
         if proc.returncode != 0:
             err = "{} exited with code {}".format(cmd, proc.returncode)
             logging.warning(err)

From 9170785ed52fe43cd7849f0560934b5e54858778 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:21:38 +0200
Subject: [PATCH 475/506] fix(module-shell): fix syntax error

---
 bumblebee_status/modules/contrib/shell.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index 7043778..e8461b9 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -72,7 +72,6 @@ class Module(core.module.Module):
         self.__current_thread = threading.Thread(
             target=lambda obj, cmd: obj.set_output(
                 util.cli.execute(cmd, ignore_errors=True)
-                core.event.trigger("update", [self.id], redraw_only=True)
             ),
             args=(self, self.__command),
         )

From 9251217bb3aff34a0603b94d2755ef99b87d5d4b Mon Sep 17 00:00:00 2001
From: Elin Angelov <me@zetxx.eu>
Date: Wed, 20 Sep 2023 14:59:24 +0300
Subject: [PATCH 476/506] feat: add `disabled` parameter

it pauses dunst notification on startup
---
 bumblebee_status/modules/contrib/dunstctl.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumblebee_status/modules/contrib/dunstctl.py b/bumblebee_status/modules/contrib/dunstctl.py
index f082f1b..1b5d3fb 100644
--- a/bumblebee_status/modules/contrib/dunstctl.py
+++ b/bumblebee_status/modules/contrib/dunstctl.py
@@ -28,6 +28,8 @@ class Module(core.module.Module):
         self.__states = {"unknown": ["unknown", "critical"],
                          "true": ["muted", "warning"],
                          "false": ["unmuted"]}
+       if util.format.asbool(self.parameter("disabled", False)):
+            util.cli.execute("dunstctl set-paused true", ignore_errors=True)
 
     def toggle_state(self, event):
         util.cli.execute("dunstctl set-paused toggle", ignore_errors=True)

From 0c2123cfe45a2e19c6edd167bfc2c9fd006a7109 Mon Sep 17 00:00:00 2001
From: Elin Angelov <me@zetxx.eu>
Date: Wed, 20 Sep 2023 15:11:24 +0300
Subject: [PATCH 477/506] fix: identation

---
 bumblebee_status/modules/contrib/dunstctl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/dunstctl.py b/bumblebee_status/modules/contrib/dunstctl.py
index 1b5d3fb..1ad43df 100644
--- a/bumblebee_status/modules/contrib/dunstctl.py
+++ b/bumblebee_status/modules/contrib/dunstctl.py
@@ -28,7 +28,7 @@ class Module(core.module.Module):
         self.__states = {"unknown": ["unknown", "critical"],
                          "true": ["muted", "warning"],
                          "false": ["unmuted"]}
-       if util.format.asbool(self.parameter("disabled", False)):
+        if util.format.asbool(self.parameter("disabled", False)):
             util.cli.execute("dunstctl set-paused true", ignore_errors=True)
 
     def toggle_state(self, event):

From b217ac9c9ef623e46a2e7d2d76674423d629f350 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sun, 1 Oct 2023 10:07:03 +0200
Subject: [PATCH 478/506] docs: update module documentation

---
 docs/modules.rst | 181 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 168 insertions(+), 13 deletions(-)

diff --git a/docs/modules.rst b/docs/modules.rst
index c7a78de..1fb752c 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -264,6 +264,8 @@ Parameters:
     * pulsectl.autostart: If set to 'true' (default is 'false'), automatically starts the pulsectl daemon if it is not running
     * pulsectl.percent_change: How much to change volume by when scrolling on the module (default is 2%)
     * pulsectl.limit: Upper limit for setting the volume (default is 0%, which means 'no limit')
+    * pulsectl.popup-filter: Comma-separated list of device strings (if the device name contains it) to exclude
+      from the default device popup menu (e.g. Monitor for sources)
     * pulsectl.showbars: 'true' for showing volume bars, requires --markup=pango;
       'false' for not showing volume bars (default)
     * pulsectl.showdevicename: If set to 'true' (default is 'false'), the currently selected default device is shown.
@@ -424,6 +426,7 @@ Requires the following executable:
     * amixer
 
 Parameters:
+    * amixer.card: Sound Card to use (default is 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%)
 
@@ -431,6 +434,8 @@ contributed by `zetxx <https://github.com/zetxx>`_ - many thanks!
 
 input handling contributed by `ardadem <https://github.com/ardadem>`_ - many thanks!
 
+multiple audio cards contributed by `hugoeustaquio <https://github.com/hugoeustaquio>`_ - many thanks!
+
 .. image:: ../screenshots/amixer.png
 
 apt
@@ -685,6 +690,49 @@ lacking the aforementioned pattern settings or they have wrong values.
 
 contributed by `somospocos <https://github.com/somospocos>`_ - many thanks!
 
+cpu3
+~~~~
+
+Multiwidget CPU module
+
+Can display any combination of:
+
+    * max CPU frequency
+    * total CPU load in percents (integer value)
+    * per-core CPU load as graph - either mono or colored
+    * CPU temperature (in Celsius degrees)
+    * CPU fan speed
+
+Requirements:
+
+    * the psutil Python module for the first three items from the list above
+    * sensors executable for the rest
+
+Parameters:
+    * cpu3.layout: Space-separated list of widgets to add.
+      Possible widgets are:
+
+         * cpu3.maxfreq
+         * cpu3.cpuload
+         * cpu3.coresload
+         * cpu3.temp
+         * cpu3.fanspeed
+    * cpu3.colored: 1 for colored per core load graph, 0 for mono (default)
+    * cpu3.temp_json: json path to look for in the output of 'sensors -j';
+      required if cpu3.temp widget is used
+    * cpu3.fan_json: json path to look for in the output of 'sensors -j';
+      required if cpu3.fanspeed widget is used
+
+Note: if you are getting 'n/a' for CPU temperature / fan speed, then you're
+lacking the aforementioned json path settings or they have wrong values.
+
+Example json paths:
+  * `cpu3.temp_json="coretemp-isa-0000.Package id 0.temp1_input"`
+  * `cpu3.fan_json="thinkpad-isa-0000.fan1.fan1_input"`
+
+contributed by `SuperQ <https://github.com/SuperQ>`
+based on cpu2 by `<somospocos <https://github.com/somospocos>`
+
 currency
 ~~~~~~~~
 
@@ -866,7 +914,9 @@ Displays first upcoming event in google calendar.
 Events that are set as 'all-day' will not be shown.
 
 Requires credentials.json from a google api application where the google calendar api is installed.
-On first time run the browser will open and google will ask for permission for this app to access the google calendar and then save a .gcalendar_token.json file to the credentials_path directory which stores this permission.
+On first time run the browser will open and google will ask for permission for this app to access
+the google calendar and then save a .gcalendar_token.json file to the credentials_path directory
+which stores this permission.
 
 A refresh is done every 15 minutes.
 
@@ -878,7 +928,7 @@ Parameters:
 
 Requires these pip packages:
    * google-api-python-client >= 1.8.0
-   * google-auth-httplib2 
+   * google-auth-httplib2
    * google-auth-oauthlib
 
 getcrypto
@@ -923,6 +973,29 @@ contributed by:
 
 .. image:: ../screenshots/github.png
 
+gitlab
+~~~~~~
+
+Displays the GitLab todo count:
+
+    * https://docs.gitlab.com/ee/user/todos.html
+    * https://docs.gitlab.com/ee/api/todos.html
+
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
+Requires the following library:
+    * requests
+
+Errors:
+    if the GitLab todo query failed, the shown value is `n/a`
+
+Parameters:
+    * gitlab.token: GitLab personal access token, the token needs to have the "read_api" scope.
+    * gitlab.host: Host of the GitLab instance, default is "gitlab.com".
+    * gitlab.actions: Comma separated actions to be parsed (e.g.: gitlab.actions=assigned,approval_required)
+
+.. image:: ../screenshots/gitlab.png
+
 gpmdp
 ~~~~~
 
@@ -1107,6 +1180,7 @@ Parameters:
            if {file} = '/foo/bar.baz', then {file2} = 'bar'
 
     * mpd.host: MPD host to connect to. (mpc behaviour by default)
+    * mpd.port: MPD port to connect to. (mpc behaviour by default)
     * mpd.layout: Space-separated list of widgets to add. Possible widgets are the buttons/toggles mpd.prev, mpd.next, mpd.shuffle and mpd.repeat, and the main display with play/pause function mpd.main.
 
 contributed by `alrayyes <https://github.com/alrayyes>`_ - many thanks!
@@ -1126,9 +1200,7 @@ network_traffic
 ~~~~~~~~~~~~~~~
 
 Displays network traffic
-
-Requires the following library:
-    * netifaces
+   * No extra configuration needed
 
 contributed by `izn <https://github.com/izn>`_ - many thanks!
 
@@ -1155,7 +1227,7 @@ nvidiagpu
 Displays GPU name, temperature and memory usage.
 
 Parameters:
-   * nvidiagpu.format: Format string (defaults to '{name}: {temp}°C %{mem_used}/{mem_total} MiB')
+   * nvidiagpu.format: Format string (defaults to '{name}: {temp}°C %{usedmem}/{totalmem} MiB')
      Available values are: {name} {temp} {mem_used} {mem_total} {fanspeed} {clock_gpu} {clock_mem} {gpu_usage_pct} {mem_usage_pct} {mem_io_pct}
 
 Requires nvidia-smi
@@ -1239,12 +1311,19 @@ Displays the pi-hole status (up/down) together with the number of ads that were
 
 Parameters:
     * pihole.address     : pi-hole address (e.q: http://192.168.1.3)
-    * pihole.pwhash      : pi-hole webinterface password hash (can be obtained from the /etc/pihole/SetupVars.conf file)
+
+
+    * pihole.apitoken    : pi-hole API token (can be obtained in the pi-hole webinterface (Settings -> API)
+
+    OR (deprecated!)
+
+    *  pihole.pwhash     : pi-hole webinterface password hash (can be obtained from the /etc/pihole/SetupVars.conf file)
+
 
 contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 
 pipewire
-~~~~~~~
+~~~~~~~~
 
 get volume level or control it
 
@@ -1575,7 +1654,9 @@ Display a stock quote from finance.yahoo.com
 
 Parameters:
     * stock.symbols : Comma-separated list of symbols to fetch
-    * stock.change : Should we fetch change in stock value (defaults to True)
+    * stock.apikey : API key created on https://alphavantage.co
+    * stock.url : URL to use, defaults to "https://www.alphavantage.co/query?function=GLOBAL_QUOTE&symbol={symbol}&apikey={apikey}"
+    * stock.fields : Fields from the response to show, defaults to "01. symbol,05. price,10. change percent"
 
 
 contributed by `msoulier <https://github.com/msoulier>`_ - many thanks!
@@ -1610,11 +1691,11 @@ adds the possibility to
         * reboot
 
 the system.
-        
+
 Per default a confirmation dialog is shown before the actual action is performed.
-        
+
 Parameters:
-        * system.confirm: show confirmation dialog before performing any action (default: true) 
+        * system.confirm: show confirmation dialog before performing any action (default: true)
         * system.reboot: specify a reboot command (defaults to 'reboot')
         * system.shutdown: specify a shutdown command (defaults to 'shutdown -h now')
         * system.logout: specify a logout command (defaults to 'i3exit logout')
@@ -1713,6 +1794,27 @@ Parameters:
     * todo_org.remaining: False by default. When true, will output the number of remaining todos instead of the number completed (i.e. 1/4 means 1 of 4 todos remaining, rather than 1 of 4 todos completed)
 Based on the todo module by `codingo <https://github.com/codingo>`
 
+todoist
+~~~~~~~
+
+Displays the nº of Todoist tasks that are due:
+
+    * https://developer.todoist.com/rest/v2/#get-active-tasks
+
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
+Requires the following library:
+    * requests
+
+Errors:
+    if the Todoist get active tasks query failed, the shown value is `n/a`
+
+Parameters:
+    * todoist.token: Todoist api token, you can get it in https://todoist.com/app/settings/integrations/developer.
+    * todoist.filter: a filter statement defined by Todoist (https://todoist.com/help/articles/introduction-to-filters), eg: "!assigned to: others & (Overdue | due: today)"
+
+.. image:: ../screenshots/todoist.png
+
 traffic
 ~~~~~~~
 
@@ -1751,6 +1853,27 @@ contributed by `ccoors <https://github.com/ccoors>`_ - many thanks!
 
 .. image:: ../screenshots/uptime.png
 
+usage
+~~~~~
+
+Module for ActivityWatch (https://activitywatch.net/)
+Displays the amount of time the system was used actively.
+
+Requirements:
+    * sqlite3 module for python
+    * ActivityWatch
+
+Errors:
+    * when you get 'error: unable to open database file', modify the parameter 'database' to your ActivityWatch database file
+    -> often found by running 'locate aw-server/peewee-sqlite.v2.db'
+
+Parameters:
+    * usage.database: path to your database file
+    * usage.format: Specify what gets printed to the bar
+    -> use 'HH', 'MM' or 'SS', they will get replaced by the number of hours, minutes and seconds, respectively
+
+contributed by lasnikr (https://github.com/lasnikr)
+
 vpn
 ~~~
 
@@ -1770,6 +1893,34 @@ Displays the VPN profile that is currently in use.
 
 contributed by `bbernhard <https://github.com/bbernhard>`_ - many thanks!
 
+wakatime
+~~~~~~~~
+
+Displays the WakaTime daily/weekly/monthly times:
+
+    * https://wakatime.com/developers#stats
+
+Uses `xdg-open` or `x-www-browser` to open web-pages.
+
+Requires the following library:
+    * requests
+
+Errors:
+    if the Wakatime status query failed, the shown value is `n/a`
+
+Parameters:
+    * wakatime.token: Wakatime secret api key, you can get it in https://wakatime.com/settings/account.
+    * wakatime.range: Range of the output, default is "Today". Can be one of “Today”, “Yesterday”, “Last 7 Days”, “Last 7 Days from Yesterday”, “Last 14 Days”, “Last 30 Days”, “This Week”, “Last Week”, “This Month”, or “Last Month”.
+    * wakatime.format: Format of the output, default is "digital"
+        Valid inputs are:
+          * "decimal" -> 1.37
+          * "digital" -> 1:22
+          * "seconds" -> 4931.29
+          * "text" -> 1 hr 22 mins
+          * "%H:%M:%S" -> 01:22:31 (or any other valid format)
+
+.. image:: ../screenshots/wakatime.png
+
 watson
 ~~~~~~
 
@@ -1778,6 +1929,10 @@ Displays the status of watson (time-tracking tool)
 Requires the following executable:
     * watson
 
+Parameters:
+    * watson.format: Output format, defaults to "{project} [{tags}]"
+      Supported fields are: {project}, {tags}, {relative_start}, {absolute_start}
+
 contributed by `bendardenne <https://github.com/bendardenne>`_ - many thanks!
 
 weather
@@ -1795,7 +1950,7 @@ Parameters:
     * weather.unit: metric (default), kelvin, imperial
     * weather.showcity: If set to true, show location information, otherwise hide it (defaults to true)
     * weather.showminmax: If set to true, show the minimum and maximum temperature, otherwise hide it (defaults to false)
-    * weather.apikey: API key from http://api.openweathermap.org
+    * weather.apikey: API key from https://api.openweathermap.org
 
 
 contributed by `TheEdgeOfRage <https://github.com/TheEdgeOfRage>`_ - many thanks!

From d30e5c694ea73c3bfcc2f0ce8c0e34226471ac4d Mon Sep 17 00:00:00 2001
From: Elin Angelov <me@zetxx.eu>
Date: Mon, 2 Oct 2023 12:31:15 +0300
Subject: [PATCH 479/506] Update modules.rst

---
 docs/modules.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/modules.rst b/docs/modules.rst
index 1fb752c..0b3ff9d 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -884,6 +884,9 @@ be running. Scripts will be executed when dunst gets unpaused.
 Requires:
     * dunst v1.5.0+
 
+Parameters:
+    * dunstctl.disabled(Boolean): dunst state on start
+
 contributed by `cristianmiranda <https://github.com/cristianmiranda>`_ - many thanks!
 contributed by `joachimmathes <https://github.com/joachimmathes>`_ - many thanks!
 

From 85760926d7d1f7ddaed9e5096bd0e9ebb70c3267 Mon Sep 17 00:00:00 2001
From: siggi <simeon-holzapfel@gmx.de>
Date: Tue, 3 Oct 2023 22:28:28 +0200
Subject: [PATCH 480/506] Add Power-Profile module

---
 .../modules/contrib/power-profile.py          | 99 +++++++++++++++++++
 requirements/modules/power-profile.txt        |  2 +
 tests/modules/contrib/test_power-profile.py   | 32 ++++++
 themes/icons/ascii.json                       |  3 +
 themes/icons/awesome-fonts.json               |  3 +
 5 files changed, 139 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/power-profile.py
 create mode 100644 requirements/modules/power-profile.txt
 create mode 100644 tests/modules/contrib/test_power-profile.py

diff --git a/bumblebee_status/modules/contrib/power-profile.py b/bumblebee_status/modules/contrib/power-profile.py
new file mode 100644
index 0000000..2959391
--- /dev/null
+++ b/bumblebee_status/modules/contrib/power-profile.py
@@ -0,0 +1,99 @@
+# pylint: disable=C0111,R0903
+"""
+Displays the current Power-Profile active
+
+
+Left-Click or Right-Click as well as Scrolling up / down changes the active Power-Profile
+
+Prerequisites:
+    * dbus-python
+    * power-profiles-daemon
+"""
+
+import dbus
+import core.module
+import core.widget
+import core.input
+
+
+class PowerProfileManager:
+    def __init__(self):
+        self.POWER_PROFILES_NAME = "net.hadess.PowerProfiles"
+        self.POWER_PROFILES_PATH = "/net/hadess/PowerProfiles"
+        self.PP_PROPERTIES_CURRENT_POWER_PROFILE = "ActiveProfile"
+        self.PP_PROPERTIES_ALL_POWER_PROFILES = "Profiles"
+
+        self.DBUS_PROPERTIES = "org.freedesktop.DBus.Properties"
+        bus = dbus.SystemBus()
+        pp_proxy = bus.get_object(self.POWER_PROFILES_NAME, self.POWER_PROFILES_PATH)
+        self.pp_interface = dbus.Interface(pp_proxy, self.DBUS_PROPERTIES)
+
+    def get_current_power_profile(self):
+        return self.pp_interface.Get(
+            self.POWER_PROFILES_NAME, self.PP_PROPERTIES_CURRENT_POWER_PROFILE
+        )
+
+    def __get_all_power_profile_names(self):
+        power_profiles = self.pp_interface.Get(
+            self.POWER_PROFILES_NAME, self.PP_PROPERTIES_ALL_POWER_PROFILES
+        )
+        power_profiles_names = []
+        for pp in power_profiles:
+            power_profiles_names.append(pp["Profile"])
+
+        return power_profiles_names
+
+    def next_power_profile(self, event):
+        all_pp_names = self.__get_all_power_profile_names()
+        current_pp_index = self.__get_current_pp_index()
+        next_index = 0
+        if current_pp_index != (len(all_pp_names) - 1):
+            next_index = current_pp_index + 1
+
+        self.pp_interface.Set(
+            self.POWER_PROFILES_NAME,
+            self.PP_PROPERTIES_CURRENT_POWER_PROFILE,
+            all_pp_names[next_index],
+        )
+
+    def prev_power_profile(self, event):
+        all_pp_names = self.__get_all_power_profile_names()
+        current_pp_index = self.__get_current_pp_index()
+        last_index = len(all_pp_names) - 1
+        if current_pp_index is not 0:
+            last_index = current_pp_index - 1
+
+        self.pp_interface.Set(
+            self.POWER_PROFILES_NAME,
+            self.PP_PROPERTIES_CURRENT_POWER_PROFILE,
+            all_pp_names[last_index],
+        )
+
+    def __get_current_pp_index(self):
+        all_pp_names = self.__get_all_power_profile_names()
+        current_pp = self.get_current_power_profile()
+        return all_pp_names.index(current_pp)
+
+
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, core.widget.Widget(self.full_text))
+        self.pp_manager = PowerProfileManager()
+        core.input.register(
+            self, button=core.input.WHEEL_UP, cmd=self.pp_manager.next_power_profile
+        )
+        core.input.register(
+            self, button=core.input.WHEEL_DOWN, cmd=self.pp_manager.prev_power_profile
+        )
+        core.input.register(
+            self, button=core.input.LEFT_MOUSE, cmd=self.pp_manager.next_power_profile
+        )
+        core.input.register(
+            self, button=core.input.RIGHT_MOUSE, cmd=self.pp_manager.prev_power_profile
+        )
+
+    def full_text(self, widgets):
+        return self.pp_manager.get_current_power_profile()
+
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/requirements/modules/power-profile.txt b/requirements/modules/power-profile.txt
new file mode 100644
index 0000000..8f7d255
--- /dev/null
+++ b/requirements/modules/power-profile.txt
@@ -0,0 +1,2 @@
+dbus-python
+power-profiles-daemon
\ No newline at end of file
diff --git a/tests/modules/contrib/test_power-profile.py b/tests/modules/contrib/test_power-profile.py
new file mode 100644
index 0000000..43cb14f
--- /dev/null
+++ b/tests/modules/contrib/test_power-profile.py
@@ -0,0 +1,32 @@
+from unittest.mock import patch, MagicMock
+import unittest
+import pytest
+
+import core.config
+import modules.contrib.power_profile
+
+pytest.importorskip("dbus")
+
+
+def build_powerprofile_module():
+    config = core.config.Config([])
+    return modules.contrib.power_profile.Module(config=config, theme=None)
+
+
+class TestPowerProfileUnit(unittest.TestCase):
+    def __get_mock_dbus_get_method(self, mock_system_bus):
+        return (
+            mock_system_bus.return_value.get_object.return_value.get_dbus_method.return_value
+        )
+
+    def test_load_module(self):
+        __import__("modules.contrib.power-profile")
+
+    @patch("dbus.SystemBus")
+    def test_full_text(self, mock_system_bus):
+        mock_get = self.__get_mock_dbus_get_method(mock_system_bus)
+        mock_get.return_value = "balanced"
+
+        module = build_powerprofile_module()
+        module.update()
+        assert module.widgets()[0].full_text() == "balanced"
diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index d353386..4f48e4d 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -410,5 +410,8 @@
   "speedtest": {
     "running": { "prefix": [".", "..", "...", ".."] },
 	"not-running": { "prefix": "[start]" }
+  },
+  "power-profile": {
+    "prefix": "profile"
   }
 }
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 60f8f51..7b86cb8 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -739,5 +739,8 @@
   },
   "thunderbird": {
     "prefix": ""
+  },
+  "power-profile": {
+    "prefix": "\uF2C1"
   }
 }

From 05622f985ae15d2814e336c75e9a1749a9ee00e3 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 26 Oct 2023 08:54:13 +0200
Subject: [PATCH 481/506] fix(module/shell): expand user directory in command
 spec

Make sure that ~/ is expanded to the user's home directory in the
command specified for the shell module.

fixes #1002
---
 bumblebee_status/modules/contrib/shell.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index e8461b9..46352b2 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -41,6 +41,7 @@ class Module(core.module.Module):
         super().__init__(config, theme, core.widget.Widget(self.get_output))
 
         self.__command = self.parameter("command", 'echo "no command configured"')
+        self.__command = os.path.expanduser(self.__command)
         self.__async = util.format.asbool(self.parameter("async"))
 
         if self.__async:

From 025d3fcb515be6f1ed3e462a10654aa0ad7ed13f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:00:09 +0200
Subject: [PATCH 482/506] fix(module/shell): synchonous invocation was broken

For some (unknown) reason, redrawing while in the update loop breaks the
update (this probably warrants a closer look).

As a quickfix to restore functionality, remove the unnecessary redraw
call and move it into the async codepath, where it is actually needed.

fixes #1001
---
 bumblebee_status/modules/contrib/shell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/shell.py b/bumblebee_status/modules/contrib/shell.py
index 46352b2..4aabb5a 100644
--- a/bumblebee_status/modules/contrib/shell.py
+++ b/bumblebee_status/modules/contrib/shell.py
@@ -53,6 +53,7 @@ class Module(core.module.Module):
 
     def set_output(self, value):
         self.__output = value
+        core.event.trigger("update", [self.id], redraw_only=True)
 
     @core.decorators.scrollable
     def get_output(self, _):
@@ -62,7 +63,6 @@ class Module(core.module.Module):
         # if requested then run not async version and just execute command in this thread
         if not self.__async:
             self.__output = util.cli.execute(self.__command, shell=True, ignore_errors=True).strip()
-            core.event.trigger("update", [self.id], redraw_only=True)
             return
 
         # if previous thread didn't end yet then don't do anything

From 9f6c9cc7d2481d24b07ea9b84a16057d90fe99e2 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:08:43 +0200
Subject: [PATCH 483/506] doc: update readthedocs.yaml

---
 .readthedocs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 63fb402..15f1c60 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -6,4 +6,4 @@ python:
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3"

From c14ed1166dd2b9a99c896375e989555fcf0c8815 Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:11:39 +0200
Subject: [PATCH 484/506] fix: autotest - try to pin down pip versions

---
 .github/workflows/autotest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index 4877a70..ac236f9 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -28,7 +28,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -U coverage pytest pytest-mock freezegun
-          pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
+          pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' 'power<1.4' || true
           pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
       - name: Install Code Climate dependency
         run: |

From bfafd936433acc9f2dea47065c4e423d7edb033f Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:19:46 +0200
Subject: [PATCH 485/506] fix: remove power from tests installation as a
 quickfix

---
 .github/workflows/autotest.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
index ac236f9..ec02237 100644
--- a/.github/workflows/autotest.yml
+++ b/.github/workflows/autotest.yml
@@ -28,8 +28,8 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -U coverage pytest pytest-mock freezegun
-          pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' 'power<1.4' || true
-          pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
+          pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
+          pip install $(cat requirements/modules/*.txt | grep -v power | cut -d ' ' -f 1 | sort -u)
       - name: Install Code Climate dependency
         run: |
           curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

From b45ff330c9d2044dda0a43503fab5d45973bd983 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 8 Nov 2023 00:28:29 +0100
Subject: [PATCH 486/506] wlrotation: init

---
 .../modules/contrib/wlrotation.py             | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 bumblebee_status/modules/contrib/wlrotation.py

diff --git a/bumblebee_status/modules/contrib/wlrotation.py b/bumblebee_status/modules/contrib/wlrotation.py
new file mode 100644
index 0000000..54b43a9
--- /dev/null
+++ b/bumblebee_status/modules/contrib/wlrotation.py
@@ -0,0 +1,69 @@
+# pylint: disable=C0111,R0903
+# -*- coding: utf-8 -*-
+
+"""Shows a widget for each connected screen and allows the user to loop through different orientations.
+
+Requires the following executable:
+    * swaymsg
+"""
+
+import bumblebee.util
+import bumblebee.input
+import bumblebee.output
+import bumblebee.engine
+import json
+from os import environ, path
+
+possible_orientations = ["normal", "90", "180", "270"]
+
+class Module(bumblebee.engine.Module):
+    def __init__(self, engine, config):
+        self.service = "sway-auto-rotate@%s" % path.basename(environ['SWAYSOCK']).replace('-', '\\\\x2d')
+        widgets = []
+        self._engine = engine
+        super(Module, self).__init__(engine, config, widgets)
+        self.update_widgets(widgets)
+
+    def update_widgets(self, widgets):
+        for display in json.loads(bumblebee.util.execute("/usr/bin/swaymsg -t get_outputs -r")):
+            name = display['name']
+            widget = self.widget(name)
+            if not widget:
+                widget = bumblebee.output.Widget(name=name, full_text="若 "+name)
+                widget.set("auto", bumblebee.util.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
+                self._engine.input.register_callback(widget, button=bumblebee.input.LEFT_MOUSE, cmd=self._toggle)
+                self._engine.input.register_callback(widget, button=bumblebee.input.RIGHT_MOUSE, cmd=self._toggle_auto)
+            widget.set("orientation", display['transform'])
+            widgets.append(widget)
+
+    def update(self, widgets):
+        if len(widgets) <= 0:
+            self.update_widgets(widgets)
+
+    def state(self, widget):
+        curr = widget.get("auto", "inactive")
+        if curr == "inactive":
+            return ["warning"]
+        return [curr]
+
+    def _toggle_auto(self, event):
+        widget = self.widget_by_id(event["instance"])
+        if widget.get("auto") == "inactive":
+            bumblebee.util.execute("systemctl --user start %s" % self.service)
+        else:
+            bumblebee.util.execute("systemctl --user stop %s" % self.service)
+        widget.set("auto", bumblebee.util.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
+
+    def _toggle(self, event):
+        widget = self.widget_by_id(event["instance"])
+
+        # compute new orientation based on current orientation
+        idx = possible_orientations.index(widget.get("orientation"))
+        idx = (idx + 1) % len(possible_orientations)
+        new_orientation = possible_orientations[idx]
+
+        widget.set("orientation", new_orientation)
+
+        bumblebee.util.execute("swaymsg 'output {} transform {}'".format(widget.name, new_orientation))
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 559517f345e95a19e0ff010cae4de3324cd9892d Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 8 Nov 2023 00:31:14 +0100
Subject: [PATCH 487/506] update golor theme and icons

---
 themes/gruvbox-powerline.json   |  14 +--
 themes/icons/awesome-fonts.json | 206 +++++++-------------------------
 2 files changed, 50 insertions(+), 170 deletions(-)

diff --git a/themes/gruvbox-powerline.json b/themes/gruvbox-powerline.json
index d199243..e008e3f 100644
--- a/themes/gruvbox-powerline.json
+++ b/themes/gruvbox-powerline.json
@@ -9,6 +9,10 @@
 			"fg": "#fbf1c7",
 			"bg": "#cc241d"
 		},
+		"good": {
+			"fg": "#1d2021",
+			"bg": "#b8bb26"
+		},
 		"default-separators": false,
 		"separator-block-width": 0
 	},
@@ -34,16 +38,6 @@
 			"bg": "#859900"
 		}
 	},
-	"battery": {
-		"charged": {
-			"fg": "#1d2021",
-			"bg": "#b8bb26"
-		},
-		"AC": {
-			"fg": "#1d2021",
-			"bg": "#b8bb26"
-		}
-	},
 	"bluetooth": {
 		"ON": {
 			"fg": "#1d2021",
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 7b86cb8..69cc583 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -241,46 +241,22 @@
     "prefix": "\uf17c"
   },
   "nic": {
-    "wireless-up": {
-      "prefix": ""
-    },
-    "wireless-down": {
-      "prefix": ""
-    },
-    "wired-up": {
-      "prefix": ""
-    },
-    "wired-down": {
-      "prefix": ""
-    },
-    "tunnel-up": {
-      "prefix": ""
-    },
-    "tunnel-down": {
-      "prefix": ""
-    }
+    "wireless-up": { "prefix": "" },
+    "wireless-down": { "prefix": "睊" },
+    "wired-up": { "prefix": "" },
+    "wired-down": { "prefix": "" },
+    "tunnel-up": { "prefix": "嬨" },
+    "tunnel-down": { "prefix": "嬨" }
   },
   "bluetooth": {
-    "ON": {
-      "prefix": ""
-    },
-    "OFF": {
-      "prefix": ""
-    },
-    "?": {
-      "prefix": ""
-    }
+    "ON": { "prefix": "" },
+    "OFF": { "prefix": "" },
+    "?": { "prefix": "" }
   },
   "bluetooth2": {
-    "ON": {
-      "prefix": ""
-    },
-    "warning": {
-      "prefix": ""
-    },
-    "critical": {
-      "prefix": ""
-    }
+    "ON": { "prefix": "" },
+    "warning": { "prefix": "" },
+    "critical": { "prefix": "" }
   },
   "battery-upower": {
     "charged": {
@@ -349,136 +325,46 @@
     }
   },
   "battery": {
-    "charged": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "AC": {
-      "suffix": ""
-    },
+    "charged": { "prefix": "" },
+    "AC": { "suffix": "ﮣ" },
+    "PEN": { "suffix": "" },
     "charging": {
-      "prefix": [
-        "",
-        "",
-        "",
-        "",
-        ""
-      ],
-      "suffix": ""
+      "prefix": [ "", "", "", "", "", "", "" ],
+      "suffix": ""
     },
-    "discharging-10": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-25": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-50": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-80": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-100": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unlimited": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "estimate": {
-      "prefix": ""
-    },
-    "unknown-10": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-25": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-50": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-80": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-100": {
-      "prefix": "",
-      "suffix": ""
-    }
+    "discharging-05": { "prefix": "", "suffix": "" },
+    "discharging-10": { "prefix": "", "suffix": "" },
+    "discharging-20": { "prefix": "", "suffix": "" },
+    "discharging-30": { "prefix": "", "suffix": "" },
+    "discharging-40": { "prefix": "", "suffix": "" },
+    "discharging-50": { "prefix": "", "suffix": "" },
+    "discharging-60": { "prefix": "", "suffix": "" },
+    "discharging-70": { "prefix": "", "suffix": "" },
+    "discharging-80": { "prefix": "", "suffix": "" },
+    "discharging-90": { "prefix": "", "suffix": "" },
+    "discharging-100": { "prefix": "" },
+    "unlimited": { "prefix": "", "suffix": "" },
+    "estimate": { "prefix": ""  }
   },
   "battery_all": {
-    "charged": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "AC": {
-      "suffix": ""
-    },
+    "charged": { "prefix": "", "suffix": "" },
+    "AC": { "suffix": "" },
     "charging": {
-      "prefix": [
-        "",
-        "",
-        "",
-        "",
-        ""
-      ],
+      "prefix": [ "", "", "", "", "" ],
       "suffix": ""
     },
-    "discharging-10": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-25": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-50": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-80": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "discharging-100": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unlimited": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "estimate": {
-      "prefix": ""
-    },
-    "unknown-10": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-25": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-50": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-80": {
-      "prefix": "",
-      "suffix": ""
-    },
-    "unknown-100": {
-      "prefix": "",
-      "suffix": ""
-    }
+    "discharging-10": { "prefix": "", "suffix": "" },
+    "discharging-25": { "prefix": "", "suffix": "" },
+    "discharging-50": { "prefix": "", "suffix": "" },
+    "discharging-80": { "prefix": "", "suffix": "" },
+    "discharging-100": { "prefix": "", "suffix": "" },
+    "unlimited": { "prefix": "", "suffix": "" },
+    "estimate": {	"prefix": ""  },
+    "unknown-10": { "prefix": "", "suffix": "" },
+    "unknown-25": { "prefix": "", "suffix": "" },
+    "unknown-50": { "prefix": "", "suffix": "" },
+    "unknown-80": { "prefix": "", "suffix": "" },
+    "unknown-100": { "prefix": "", "suffix": "" }
   },
   "caffeine": {
     "activated": {
@@ -691,7 +577,7 @@
     }
   },
   "vpn": {
-    "prefix": ""
+    "prefix": "嬨"
   },
   "system": {
     "prefix": "    "

From 61123eb7a06add02d86a437903987799edac4c9e Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 8 Nov 2023 21:52:08 +0100
Subject: [PATCH 488/506] fix wlrotation: migrated to new api

---
 .../modules/contrib/wlrotation.py             | 54 +++++++++----------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/bumblebee_status/modules/contrib/wlrotation.py b/bumblebee_status/modules/contrib/wlrotation.py
index 54b43a9..d94c280 100644
--- a/bumblebee_status/modules/contrib/wlrotation.py
+++ b/bumblebee_status/modules/contrib/wlrotation.py
@@ -7,38 +7,33 @@ Requires the following executable:
     * swaymsg
 """
 
-import bumblebee.util
-import bumblebee.input
-import bumblebee.output
-import bumblebee.engine
+import core.module
+import core.input
+import util.cli
+
 import json
 from os import environ, path
 
 possible_orientations = ["normal", "90", "180", "270"]
 
-class Module(bumblebee.engine.Module):
-    def __init__(self, engine, config):
-        self.service = "sway-auto-rotate@%s" % path.basename(environ['SWAYSOCK']).replace('-', '\\\\x2d')
-        widgets = []
-        self._engine = engine
-        super(Module, self).__init__(engine, config, widgets)
-        self.update_widgets(widgets)
+class Module(core.module.Module):
+    def __init__(self, config, theme):
+        super().__init__(config, theme, [])
 
-    def update_widgets(self, widgets):
-        for display in json.loads(bumblebee.util.execute("/usr/bin/swaymsg -t get_outputs -r")):
+        self.service = "sway-auto-rotate@%s" % path.basename(environ['SWAYSOCK']).replace('-', '\\\\x2d')
+#        self._widgets = []
+        self.update_widgets()
+
+    def update_widgets(self):
+        for display in json.loads(util.cli.execute("/usr/bin/swaymsg -t get_outputs -r")):
             name = display['name']
             widget = self.widget(name)
             if not widget:
-                widget = bumblebee.output.Widget(name=name, full_text="若 "+name)
-                widget.set("auto", bumblebee.util.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
-                self._engine.input.register_callback(widget, button=bumblebee.input.LEFT_MOUSE, cmd=self._toggle)
-                self._engine.input.register_callback(widget, button=bumblebee.input.RIGHT_MOUSE, cmd=self._toggle_auto)
+                widget = self.add_widget(name=name, full_text="若 "+name)
+                widget.set("auto", util.cli.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
+                core.input.register(widget, button=core.input.LEFT_MOUSE, cmd=self._toggle)
+                core.input.register(widget, button=core.input.RIGHT_MOUSE, cmd=self._toggle_auto)
             widget.set("orientation", display['transform'])
-            widgets.append(widget)
-
-    def update(self, widgets):
-        if len(widgets) <= 0:
-            self.update_widgets(widgets)
 
     def state(self, widget):
         curr = widget.get("auto", "inactive")
@@ -47,23 +42,22 @@ class Module(bumblebee.engine.Module):
         return [curr]
 
     def _toggle_auto(self, event):
-        widget = self.widget_by_id(event["instance"])
+        widget = self.widget(widget_id=event["instance"])
         if widget.get("auto") == "inactive":
-            bumblebee.util.execute("systemctl --user start %s" % self.service)
+            util.cli.execute("systemctl --user start %s" % self.service)
         else:
-            bumblebee.util.execute("systemctl --user stop %s" % self.service)
-        widget.set("auto", bumblebee.util.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
+            util.cli.execute("systemctl --user stop %s" % self.service)
+        widget.set("auto", util.cli.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
 
     def _toggle(self, event):
-        widget = self.widget_by_id(event["instance"])
+        widget = self.widget(widget_id=event["instance"])
 
         # compute new orientation based on current orientation
-        idx = possible_orientations.index(widget.get("orientation"))
-        idx = (idx + 1) % len(possible_orientations)
+        idx = (possible_orientations.index(widget.get("orientation"))+ 1) % len(possible_orientations)
         new_orientation = possible_orientations[idx]
 
         widget.set("orientation", new_orientation)
 
-        bumblebee.util.execute("swaymsg 'output {} transform {}'".format(widget.name, new_orientation))
+        util.cli.execute("swaymsg 'output {} transform {}'".format(widget.name, new_orientation))
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From 2e18d712844e60adf690ea575b3a73601cb07537 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 8 Nov 2023 22:46:58 +0100
Subject: [PATCH 489/506] battery: better support for pen battery and some
 formatting

---
 bumblebee_status/modules/contrib/battery.py | 38 ++++++++++++++-------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/bumblebee_status/modules/contrib/battery.py b/bumblebee_status/modules/contrib/battery.py
index 7c65642..21951c1 100644
--- a/bumblebee_status/modules/contrib/battery.py
+++ b/bumblebee_status/modules/contrib/battery.py
@@ -130,8 +130,14 @@ class Module(core.module.Module):
                     log.debug("adding new widget for {}".format(battery))
                     widget = self.add_widget(full_text=self.capacity, name=battery)
 
-        for w in self.widgets():
-            if util.format.asbool(self.parameter("decorate", True)) == False:
+                    try:
+                        with open("/sys/class/power_supply/{}/model_name".format(battery)) as f:
+                            widget.set("pen", ("Pen" in f.read().strip()))
+                    except Exception:
+                        pass
+
+        if util.format.asbool(self.parameter("decorate", True)) == False:
+            for widget in self.widgets():
                 widget.set("theme.exclude", "suffix")
 
     def hidden(self):
@@ -147,15 +153,16 @@ class Module(core.module.Module):
             capacity = self.__manager.capacity(widget.name)
         widget.set("capacity", capacity)
         widget.set("ac", self.__manager.isac_any(self._batteries))
-        widget.set("theme.minwidth", "100%")
 
         # Read power conumption
         if util.format.asbool(self.parameter("showpowerconsumption", False)):
             output = "{}% ({})".format(
                 capacity, self.__manager.consumption(widget.name)
             )
-        else:
+        elif capacity < 100:
             output = "{}%".format(capacity)
+        else:
+            output = ""
 
         if (
             util.format.asbool(self.parameter("showremaining", True))
@@ -167,6 +174,16 @@ class Module(core.module.Module):
                     output, util.format.duration(remaining, compact=True, unit=True)
                 )
 
+#        if bumblebee.util.asbool(self.parameter("rate", True)):
+#            try:
+#                with open("{}/power_now".format(widget.name)) as f:
+#                    rate = (float(f.read())/1000000)
+#                    if rate > 0:
+#                        output = "{} {:.2f}w".format(output, rate)
+#            except Exception:
+#                pass
+
+
         if util.format.asbool(self.parameter("showdevice", False)):
             output = "{} ({})".format(output, widget.name)
 
@@ -176,6 +193,9 @@ class Module(core.module.Module):
         state = []
         capacity = widget.get("capacity")
 
+        if widget.get("pen"):
+            state.append("PEN")
+
         if capacity < 0:
             log.debug("battery state: {}".format(state))
             return ["critical", "unknown"]
@@ -187,16 +207,10 @@ class Module(core.module.Module):
                 charge = self.__manager.charge_any(self._batteries)
             else:
                 charge = self.__manager.charge(widget.name)
-            if charge == "Discharging":
+            if charge in ["Discharging", "Unknown"]:
                 state.append(
                     "discharging-{}".format(
-                        min([10, 25, 50, 80, 100], key=lambda i: abs(i - capacity))
-                    )
-                )
-            elif charge == "Unknown":
-                state.append(
-                    "unknown-{}".format(
-                        min([10, 25, 50, 80, 100], key=lambda i: abs(i - capacity))
+                        min([5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100], key=lambda i: abs(i - capacity))
                     )
                 )
             else:

From 900a0710c55983173e3a2556c3b86f83ad8e9ee5 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 8 Nov 2023 22:56:23 +0100
Subject: [PATCH 490/506] nic: add click handler

---
 bumblebee_status/modules/core/nic.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 09fe487..64ee226 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -25,6 +25,7 @@ import subprocess
 
 import core.module
 import core.decorators
+import core.input
 import util.cli
 import util.format
 
@@ -58,6 +59,8 @@ class Module(core.module.Module):
 
         self.iw = shutil.which("iw")
         self._update_widgets(widgets)
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd='/usr/local/bin/wifi-menu')
+        core.input.register(self, button=core.input.RIGHT_MOUSE, cmd='nm-connection-editor')
 
     def update(self):
         self._update_widgets(self.widgets())
@@ -88,7 +91,7 @@ class Module(core.module.Module):
 
     def _iswlan(self, intf):
         # wifi, wlan, wlp, seems to work for me
-        if intf.startswith("w"):
+        if intf.startswith("w") and not intf.startswith("wwan"):
             return True
         return False
 

From 3ed26c62a5b63ac6ffb951f88af1474665302109 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 8 Nov 2023 22:59:56 +0100
Subject: [PATCH 491/506] vpn: shorter default label

---
 bumblebee_status/modules/contrib/vpn.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/vpn.py b/bumblebee_status/modules/contrib/vpn.py
index ae8e748..3381e4f 100644
--- a/bumblebee_status/modules/contrib/vpn.py
+++ b/bumblebee_status/modules/contrib/vpn.py
@@ -1,4 +1,5 @@
 # pylint: disable=C0111,R0903
+# -*- coding: utf-8 -*-
 
 """ Displays the VPN profile that is currently in use.
 
@@ -68,7 +69,7 @@ class Module(core.module.Module):
 
     def vpn_status(self, widget):
         if self.__connected_vpn_profile is None:
-            return "off"
+            return ""
         return self.__connected_vpn_profile
 
     def __on_vpndisconnect(self):

From 8cc7c9de9b5a185db35bfe645cd1663f4e07be06 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 16:46:38 +0100
Subject: [PATCH 492/506] icons: fix nerd font battery/ac

---
 themes/icons/awesome-fonts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 69cc583..f5c02c1 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -326,7 +326,7 @@
   },
   "battery": {
     "charged": { "prefix": "" },
-    "AC": { "suffix": "ﮣ" },
+    "AC": { "suffix": "󱐥" },
     "PEN": { "suffix": "" },
     "charging": {
       "prefix": [ "", "", "", "", "", "", "" ],

From c3d4fce74c5f482919e75da955f274390b9437cc Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 16:48:05 +0100
Subject: [PATCH 493/506] nic: fix syntax

---
 bumblebee_status/modules/core/nic.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 64ee226..3f77c89 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -91,9 +91,7 @@ class Module(core.module.Module):
 
     def _iswlan(self, intf):
         # wifi, wlan, wlp, seems to work for me
-        if intf.startswith("w") and not intf.startswith("wwan"):
-            return True
-        return False
+        return intf.startswith("w") and not intf.startswith("wwan")
 
     def _istunnel(self, intf):
         return intf.startswith("tun") or intf.startswith("wg")

From 53de1b524a9e1182fd23593cdc44eb337f0ea5b3 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 16:50:16 +0100
Subject: [PATCH 494/506] bluetooth2: using dbus api, shortening output, some
 refactoring

---
 .../modules/contrib/bluetooth2.py             | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/bumblebee_status/modules/contrib/bluetooth2.py b/bumblebee_status/modules/contrib/bluetooth2.py
index 22eae88..76f1da5 100644
--- a/bumblebee_status/modules/contrib/bluetooth2.py
+++ b/bumblebee_status/modules/contrib/bluetooth2.py
@@ -8,7 +8,6 @@ Parameters:
 contributed by `martindoublem <https://github.com/martindoublem>`_ - many thanks!
 """
 
-
 import os
 import re
 import subprocess
@@ -22,7 +21,6 @@ import core.input
 
 import util.cli
 
-
 class Module(core.module.Module):
     def __init__(self, config, theme):
         super().__init__(config, theme, core.widget.Widget(self.status))
@@ -46,7 +44,7 @@ class Module(core.module.Module):
         )
         if state > 0:
             connected_devices = self.get_connected_devices()
-            self._status = "On - {}".format(connected_devices)
+            self._status = "{}".format(connected_devices)
         else:
             self._status = "Off"
             adapters_cmd = "rfkill list | grep Bluetooth"
@@ -58,31 +56,22 @@ class Module(core.module.Module):
 
     def _toggle(self, widget=None):
         """Toggle bluetooth state."""
-        if "On" in self._status:
-            state = "false"
-        else:
-            state = "true"
-
-        cmd = (
-            "dbus-send --system --print-reply --dest=org.blueman.Mechanism /org/blueman/mechanism org.blueman.Mechanism.SetRfkillState boolean:%s"
-            % state
-        )
-
         logging.debug("bt: toggling bluetooth")
-        util.cli.execute(cmd, ignore_errors=True)
+
+        SetRfkillState = self._bus.get_object("org.blueman.Mechanism", "/org/blueman/mechanism").get_dbus_method("SetRfkillState", dbus_interface="org.blueman.Mechanism")
+        SetRfkillState(self._status == "Off")
 
     def state(self, widget):
         """Get current state."""
         state = []
 
-        if self._status == "No Adapter Found":
+        if self._status in [ "No Adapter Found", "Off" ]:
             state.append("critical")
-        elif self._status == "On - 0":
+        elif self._status == "0":
             state.append("warning")
-        elif "On" in self._status and not (self._status == "On - 0"):
-            state.append("ON")
         else:
-            state.append("critical")
+            state.append("ON")
+
         return state
 
     def get_connected_devices(self):
@@ -92,12 +81,8 @@ class Module(core.module.Module):
         ).GetManagedObjects()
         for path, interfaces in objects.items():
             if "org.bluez.Device1" in interfaces:
-                if dbus.Interface(
-                    self._bus.get_object("org.bluez", path),
-                    "org.freedesktop.DBus.Properties",
-                ).Get("org.bluez.Device1", "Connected"):
+                if dbus.Interface(self._bus.get_object("org.bluez", path), "org.freedesktop.DBus.Properties", ).Get("org.bluez.Device1", "Connected"):
                     devices += 1
         return devices
 
-
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From bbc26c263cb8777a88b8b5e7859c0f5930319cca Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 16:51:07 +0100
Subject: [PATCH 495/506] wlrotation: fix nerd font icon

---
 bumblebee_status/modules/contrib/wlrotation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/wlrotation.py b/bumblebee_status/modules/contrib/wlrotation.py
index d94c280..ae9dbe8 100644
--- a/bumblebee_status/modules/contrib/wlrotation.py
+++ b/bumblebee_status/modules/contrib/wlrotation.py
@@ -29,7 +29,7 @@ class Module(core.module.Module):
             name = display['name']
             widget = self.widget(name)
             if not widget:
-                widget = self.add_widget(name=name, full_text="若 "+name)
+                widget = self.add_widget(name=name, full_text="󰑵 "+name)
                 widget.set("auto", util.cli.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
                 core.input.register(widget, button=core.input.LEFT_MOUSE, cmd=self._toggle)
                 core.input.register(widget, button=core.input.RIGHT_MOUSE, cmd=self._toggle_auto)

From cbd0c58b4a67df4caefd03b93b00fe9416baec18 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 19:44:33 +0100
Subject: [PATCH 496/506] wlrotation: refactored the entire module and
 integrated external services

---
 .../modules/contrib/wlrotation.py             | 135 +++++++++++++-----
 1 file changed, 99 insertions(+), 36 deletions(-)

diff --git a/bumblebee_status/modules/contrib/wlrotation.py b/bumblebee_status/modules/contrib/wlrotation.py
index ae9dbe8..242c50b 100644
--- a/bumblebee_status/modules/contrib/wlrotation.py
+++ b/bumblebee_status/modules/contrib/wlrotation.py
@@ -3,6 +3,10 @@
 
 """Shows a widget for each connected screen and allows the user to loop through different orientations.
 
+Parameters:
+    * wlrotation.display        : Name of the output display that will be rotated
+    + wlrotation.auto           : Boolean value if the display should be rotatet automatic by default
+
 Requires the following executable:
     * swaymsg
 """
@@ -11,53 +15,112 @@ import core.module
 import core.input
 import util.cli
 
+import iio
 import json
+from math import degrees, atan2, sqrt
 from os import environ, path
 
 possible_orientations = ["normal", "90", "180", "270"]
 
+class iioValue:
+    def __init__(self, channel):
+        self.channel = channel
+        self.scale = self.read('scale')
+        self.offset = self.read('offset')
+
+    def read(self, attr):
+        return float(self.channel.attrs[attr].value)
+
+    def value(self):
+        return (self.read('raw') + self.offset) * self.scale
+
+class iioAccelDevice:
+    def __init__(self):
+        self.ctx = iio.Context() # store ctx pointer
+        d = self.ctx.find_device('accel_3d')
+        self.x = iioValue(d.find_channel('accel_x'))
+        self.y = iioValue(d.find_channel('accel_y'))
+        self.z = iioValue(d.find_channel('accel_z'))
+
+    def orientation(self):
+        """
+        returns tuple of `[success, value]` where `success` indicates, if an accurate value could be meassured and `value` the sway output api compatible value or `normal` if success is `False`
+        """
+        x_deg, y_deg, z_deg = self._deg()
+        if abs(z_deg) < 70: # checks if device is angled too shallow
+            if x_deg >= 70: return True, "270"
+            if x_deg <= -70: return True, "90"
+            if abs(x_deg) <= 20:
+                if y_deg < 0: return True, "normal"
+                if y_deg > 0: return True, "180"
+        return False, "normal"
+
+    def _deg(self):
+        gravity = 9.81
+        x, y, z = self.x.value() / gravity, self.y.value() / gravity, self.z.value() / gravity
+        return degrees(atan2(x, sqrt(pow(y, 2) + pow(z, 2)))), degrees(atan2(y, sqrt(pow(z, 2) + pow(x, 2)))), degrees(atan2(z, sqrt(pow(x, 2) + pow(y, 2))))
+
+class Display():
+    def __init__(self, name, widget, display_data, auto=False):
+        self.name = name
+        self.widget = widget
+        self.accelDevice = iioAccelDevice()
+        self._lock_auto_rotation(not auto)
+
+        self.widget.set("orientation", display_data['transform'])
+
+        core.input.register(widget, button=core.input.LEFT_MOUSE, cmd=self.rotate_90deg)
+        core.input.register(widget, button=core.input.RIGHT_MOUSE, cmd=self.toggle)
+
+    def rotate_90deg(self, event):
+        # compute new orientation based on current orientation
+        current = self.widget.get("orientation")
+        self._set_rotation(possible_orientations[(possible_orientations.index(current) + 1) % len(possible_orientations)])
+        # disable auto rotation
+        self._lock_auto_rotation(True)
+
+    def toggle(self, event):
+        self._lock_auto_rotation(not self.locked)
+
+    def auto_rotate(self):
+        # automagically rotate the display based on sensor values
+        # this is only called if rotation lock is disabled
+        success, value = self.accelDevice.orientation()
+        if success:
+            self._set_rotation(value)
+
+    def _set_rotation(self, new_orientation):
+        self.widget.set("orientation", new_orientation)
+        util.cli.execute("swaymsg 'output {} transform {}'".format(self.name, new_orientation))
+
+    def _lock_auto_rotation(self, locked):
+        self.locked = locked
+        self.widget.set("locked", self.locked)
+
 class Module(core.module.Module):
+    @core.decorators.every(seconds=1)
     def __init__(self, config, theme):
         super().__init__(config, theme, [])
 
-        self.service = "sway-auto-rotate@%s" % path.basename(environ['SWAYSOCK']).replace('-', '\\\\x2d')
-#        self._widgets = []
-        self.update_widgets()
-
-    def update_widgets(self):
-        for display in json.loads(util.cli.execute("/usr/bin/swaymsg -t get_outputs -r")):
+        self.display = None
+        display_filter = self.parameter("display", None)
+        for display in json.loads(util.cli.execute("swaymsg -t get_outputs -r")):
             name = display['name']
-            widget = self.widget(name)
-            if not widget:
-                widget = self.add_widget(name=name, full_text="󰑵 "+name)
-                widget.set("auto", util.cli.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
-                core.input.register(widget, button=core.input.LEFT_MOUSE, cmd=self._toggle)
-                core.input.register(widget, button=core.input.RIGHT_MOUSE, cmd=self._toggle_auto)
-            widget.set("orientation", display['transform'])
+            if display_filter == None or display_filter == name:
+                self.display = Display(name, self.add_widget(name=name), display, auto=util.format.asbool(self.parameter("auto", False)))
+                break # I assume that it makes only sense to rotate a single screen
+
+    def update(self):
+        if self.display == None:
+            return
+        if self.display.locked:
+            return
+
+        self.display.auto_rotate()
 
     def state(self, widget):
-        curr = widget.get("auto", "inactive")
-        if curr == "inactive":
-            return ["warning"]
-        return [curr]
-
-    def _toggle_auto(self, event):
-        widget = self.widget(widget_id=event["instance"])
-        if widget.get("auto") == "inactive":
-            util.cli.execute("systemctl --user start %s" % self.service)
-        else:
-            util.cli.execute("systemctl --user stop %s" % self.service)
-        widget.set("auto", util.cli.execute("systemctl --user show %s -p ActiveState" % self.service).split("\n")[0].split("=")[1])
-
-    def _toggle(self, event):
-        widget = self.widget(widget_id=event["instance"])
-
-        # compute new orientation based on current orientation
-        idx = (possible_orientations.index(widget.get("orientation"))+ 1) % len(possible_orientations)
-        new_orientation = possible_orientations[idx]
-
-        widget.set("orientation", new_orientation)
-
-        util.cli.execute("swaymsg 'output {} transform {}'".format(widget.name, new_orientation))
+        state = []
+        state.append("locked" if widget.get("locked", True) else "auto")
+        return state
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From d7d4603855f004d3ec6b907afd19f97d1300e41f Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 20:03:44 +0100
Subject: [PATCH 497/506] wlrotation: adding awesome-fonts icons

---
 themes/icons/awesome-fonts.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index f5c02c1..d01f66f 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -628,5 +628,9 @@
   },
   "power-profile": {
     "prefix": "\uF2C1"
+  },
+  "wlrotation": {
+    "auto": {"prefix": "󰑵"},
+    "locked": {"prefix": "󰑸"}
   }
 }

From 60bfb19378cf6885f5b16a14a6af3a535404ea40 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 20:44:16 +0100
Subject: [PATCH 498/506] pulseout: adding nerd font icons for low, mid, heigh,
 muted

---
 bumblebee_status/modules/core/pulsectl.py | 6 +++++-
 themes/icons/awesome-fonts.json           | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bumblebee_status/modules/core/pulsectl.py b/bumblebee_status/modules/core/pulsectl.py
index fd77c26..63f9e36 100644
--- a/bumblebee_status/modules/core/pulsectl.py
+++ b/bumblebee_status/modules/core/pulsectl.py
@@ -198,6 +198,10 @@ class Module(core.module.Module):
     def state(self, _):
         if self.__muted:
             return ["warning", "muted"]
-        return ["unmuted"]
+        if self.__volume >= .5:
+            return ["unmuted", "unmuted-high"]
+        if self.__volume >= .1:
+            return ["unmuted", "unmuted-mid"]
+        return ["unmuted", "unmuted-low"]
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index d01f66f..dae3d92 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -199,11 +199,14 @@
   },
   "pulseout": {
     "muted": {
-      "prefix": ""
+      "prefix": "󰝟"
     },
     "unmuted": {
       "prefix": ""
-    }
+    },
+    "unmuted-low": { "prefix": "󰕿" },
+    "unmuted-mid": { "prefix": "󰖀" },
+    "unmuted-high": { "prefix": "󰕾" }
   },
   "amixer": {
     "muted": {

From 2e81eed830fa3e280ca1f7a6c0740e9b44b60062 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 20:47:35 +0100
Subject: [PATCH 499/506] pulsein: replacing muted nerd font icon with slash in
 the other direction, just to align it with bluetooth2

---
 themes/icons/awesome-fonts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index dae3d92..77bc4ef 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -226,7 +226,7 @@
   },
   "pulsein": {
     "muted": {
-      "prefix": ""
+      "prefix": "󰍭"
     },
     "unmuted": {
       "prefix": ""

From 255794cd1c258ab63ae0c52a391546fb58445a93 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 20:51:31 +0100
Subject: [PATCH 500/506] vpn: updating nerd font icon

---
 themes/icons/awesome-fonts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 77bc4ef..ef08f85 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -580,7 +580,7 @@
     }
   },
   "vpn": {
-    "prefix": "嬨"
+    "prefix": "󰖂"
   },
   "system": {
     "prefix": "    "

From 2bbac991dbff1b5ae74a59c483de1fd2f4fa9e27 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Fri, 10 Nov 2023 21:03:43 +0100
Subject: [PATCH 501/506] battery: updating nerd font icons

---
 themes/icons/awesome-fonts.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index ef08f85..8d77244 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -330,22 +330,22 @@
   "battery": {
     "charged": { "prefix": "" },
     "AC": { "suffix": "󱐥" },
-    "PEN": { "suffix": "" },
+    "PEN": { "suffix": "󰏪" },
     "charging": {
-      "prefix": [ "", "", "", "", "", "", "" ],
+      "prefix": [ "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅" ],
       "suffix": ""
     },
-    "discharging-05": { "prefix": "", "suffix": "" },
-    "discharging-10": { "prefix": "", "suffix": "" },
-    "discharging-20": { "prefix": "", "suffix": "" },
-    "discharging-30": { "prefix": "", "suffix": "" },
-    "discharging-40": { "prefix": "", "suffix": "" },
-    "discharging-50": { "prefix": "", "suffix": "" },
-    "discharging-60": { "prefix": "", "suffix": "" },
-    "discharging-70": { "prefix": "", "suffix": "" },
-    "discharging-80": { "prefix": "", "suffix": "" },
-    "discharging-90": { "prefix": "", "suffix": "" },
-    "discharging-100": { "prefix": "" },
+    "discharging-05": { "prefix": "󰂎", "suffix": "" },
+    "discharging-10": { "prefix": "󰁺", "suffix": "" },
+    "discharging-20": { "prefix": "󰁻", "suffix": "" },
+    "discharging-30": { "prefix": "󰁼", "suffix": "" },
+    "discharging-40": { "prefix": "󰁽", "suffix": "" },
+    "discharging-50": { "prefix": "󰁾", "suffix": "" },
+    "discharging-60": { "prefix": "󰁿", "suffix": "" },
+    "discharging-70": { "prefix": "󰂀", "suffix": "" },
+    "discharging-80": { "prefix": "󰂁", "suffix": "" },
+    "discharging-90": { "prefix": "󰂂", "suffix": "" },
+    "discharging-100": { "prefix": "󰁹" },
     "unlimited": { "prefix": "", "suffix": "" },
     "estimate": { "prefix": ""  }
   },

From fd4b940d5895298d0f0ecd664cfd47d88940e98a Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 6 Dec 2023 22:01:20 +0100
Subject: [PATCH 502/506] nic.py: adapting wifi-menu path

---
 bumblebee_status/modules/core/nic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/core/nic.py b/bumblebee_status/modules/core/nic.py
index 3f77c89..f153a94 100644
--- a/bumblebee_status/modules/core/nic.py
+++ b/bumblebee_status/modules/core/nic.py
@@ -59,7 +59,7 @@ class Module(core.module.Module):
 
         self.iw = shutil.which("iw")
         self._update_widgets(widgets)
-        core.input.register(self, button=core.input.LEFT_MOUSE, cmd='/usr/local/bin/wifi-menu')
+        core.input.register(self, button=core.input.LEFT_MOUSE, cmd='wifi-menu')
         core.input.register(self, button=core.input.RIGHT_MOUSE, cmd='nm-connection-editor')
 
     def update(self):

From a56b86100a6340bc1dfe7b57667c74ac61f6773f Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 6 Dec 2023 22:17:49 +0100
Subject: [PATCH 503/506] fix updated nerdfonts

---
 themes/icons/awesome-fonts.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 8d77244..1e8d9df 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -252,13 +252,13 @@
     "tunnel-down": { "prefix": "嬨" }
   },
   "bluetooth": {
-    "ON": { "prefix": "" },
-    "OFF": { "prefix": "" },
+    "ON": { "prefix": "󰂯" },
+    "OFF": { "prefix": "󰂲" },
     "?": { "prefix": "" }
   },
   "bluetooth2": {
-    "ON": { "prefix": "" },
-    "warning": { "prefix": "" },
+    "ON": { "prefix": "󰂯" },
+    "warning": { "prefix": "󰂲" },
     "critical": { "prefix": "" }
   },
   "battery-upower": {
@@ -328,7 +328,7 @@
     }
   },
   "battery": {
-    "charged": { "prefix": "" },
+    "charged": { "prefix": "󰂄" },
     "AC": { "suffix": "󱐥" },
     "PEN": { "suffix": "󰏪" },
     "charging": {

From 21060a10a01cd6f1d0721090f8b0a53c60265bbc Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 17 Apr 2024 22:46:18 +0200
Subject: [PATCH 504/506] bluetooth2: only show connection count in cases of
 excessive numbers of connections

---
 bumblebee_status/modules/contrib/bluetooth2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumblebee_status/modules/contrib/bluetooth2.py b/bumblebee_status/modules/contrib/bluetooth2.py
index 76f1da5..deb2e0c 100644
--- a/bumblebee_status/modules/contrib/bluetooth2.py
+++ b/bumblebee_status/modules/contrib/bluetooth2.py
@@ -35,7 +35,7 @@ class Module(core.module.Module):
 
     def status(self, widget):
         """Get status."""
-        return self._status
+        return self._status if self._status.isdigit() and int(self._status) > 1 else ""
 
     def update(self):
         """Update current state."""

From 5053bb0f1b300e96ade9bbbc47fb5f662490dcd9 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 17 Apr 2024 22:47:45 +0200
Subject: [PATCH 505/506] themes/awesome-fonts: fix bluetooth icons

---
 themes/icons/awesome-fonts.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 8d77244..d81b8c8 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -252,14 +252,14 @@
     "tunnel-down": { "prefix": "嬨" }
   },
   "bluetooth": {
-    "ON": { "prefix": "" },
-    "OFF": { "prefix": "" },
-    "?": { "prefix": "" }
+    "ON": { "prefix": "󰂯" },
+    "OFF": { "prefix": "󰂲" },
+    "?": { "prefix": "󰂱" }
   },
   "bluetooth2": {
-    "ON": { "prefix": "" },
-    "warning": { "prefix": "" },
-    "critical": { "prefix": "" }
+    "ON": { "prefix": "󰂱" },
+    "warning": { "prefix": "󰂯" },
+    "critical": { "prefix": "󰂲" }
   },
   "battery-upower": {
     "charged": {

From 676bbebf4ca826c0adab0cc2d2f9ab9a42a572a2 Mon Sep 17 00:00:00 2001
From: Ludwig Behm <ludwig@behm.me>
Date: Wed, 17 Apr 2024 23:05:16 +0200
Subject: [PATCH 506/506] bluetooth2: states and styling

---
 bumblebee_status/modules/contrib/bluetooth2.py | 5 +++--
 themes/icons/awesome-fonts.json                | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bumblebee_status/modules/contrib/bluetooth2.py b/bumblebee_status/modules/contrib/bluetooth2.py
index deb2e0c..a9742ba 100644
--- a/bumblebee_status/modules/contrib/bluetooth2.py
+++ b/bumblebee_status/modules/contrib/bluetooth2.py
@@ -68,9 +68,10 @@ class Module(core.module.Module):
         if self._status in [ "No Adapter Found", "Off" ]:
             state.append("critical")
         elif self._status == "0":
-            state.append("warning")
+            state.append("enabled")
         else:
-            state.append("ON")
+            state.append("connected")
+            state.append("good")
 
         return state
 
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 9992cee..1b6bb2c 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -257,8 +257,8 @@
     "?": { "prefix": "󰂱" }
   },
   "bluetooth2": {
-    "ON": { "prefix": "󰂱" },
-    "warning": { "prefix": "󰂯" },
+    "connected": { "prefix": "󰂱" },
+    "enabled": { "prefix": "󰂯" },
     "critical": { "prefix": "󰂲" }
   },
   "battery-upower": {