Tinkering

src/swaystatus/cli.py

@@ -126,10 +126,10 @@ def load_elements(order, include, settings):
     modules = Modules(include)
 
     for key in order:
-        ids = key.split(":", maxsplit=1)
-        ids.append(None)
-
-        name, instance = ids[:2]
+        try:
+            name, instance = key.split(":", maxsplit=1)
+        except ValueError:
+            name, instance = key, None
 
         module = modules.find(name)
 
@@ -147,15 +147,27 @@ def load_elements(order, include, settings):
 def main():
     args = parse_args()
 
-    configure_logging(level=args.log_level, file=args.log_file, syslog=args.syslog)
+    configure_logging(
+        level=args.log_level,
+        file=args.log_file,
+        syslog=args.syslog,
+    )
 
     config = parse_config(args)
     logger.debug(f"Using configuration: {config!r}")
 
-    elements = load_elements(config["order"], config["include"], config["settings"])
+    elements = load_elements(
+        config["order"],
+        config["include"],
+        config["settings"],
+    )
 
     try:
-        start(elements, config["interval"], config["click_events"])
+        start(
+            elements,
+            config["interval"],
+            config["click_events"],
+        )
     except Exception:
         logger.exception("Unhandled exception in main loop")
         sys.exit(1)

src/swaystatus/element.py

@@ -24,13 +24,13 @@ class BaseElement:
     `Element` and be contained in a file named according to how its
     corresponding block should be named.
 
-    For example, if there is a file named `clock.py` in the modules package, the
-    element class would have `self.name` set to "clock".
+    For example, if there is a file named `clock.py` in the modules package, an
+    instance of the element class would have `self.name` set to "clock".
 
     The module file could have the following code:
 
-        from time import strftime
         from swaystatus.element import BaseElement
+        from time import strftime
 
         class Element(BaseElement):
             def on_update(self, output):
@@ -156,8 +156,7 @@ def create_handler(send):
                     def handler(line):
                         message = str(line, "utf-8").strip()
                         send(
-                            f"Output from module {self} "
-                            f"button {button} handler: {message}"
+                            f"Output from module {self} button {button} handler: {message}"
                         )
 
                     return handler

src/swaystatus/loop.py

@@ -46,12 +46,13 @@ def write_to_stdout():
 
 
 def start_stdin_thread(updater, elements):
-    elements_by_key = {key: element for element in elements if (key := element.key())}
+    elements_by_key = {key: elem for elem in elements if (key := elem.key())}
 
     def read_from_stdin():
         logger.info("Listening for click events from stdin...")
         try:
             assert sys.stdin.readline().strip() == "["
+
             for line in sys.stdin:
                 click_event = json.loads(line.strip().lstrip(","))
                 logger.debug(f"Received click event: {click_event!r}")