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 1/3] 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 2/3] 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 3/3] 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