Minor changes for handling new GlobalAction class

Author: strohganoff

streamdeck/__main__.py

@@ -10,7 +10,7 @@
 
 import tomli as toml
 
-from streamdeck.actions import Action
+from streamdeck.actions import ActionBase
 from streamdeck.cli.errors import (
     DirectoryNotFoundError,
     NotAFileError,
@@ -146,7 +146,7 @@ def read_streamdeck_config_from_pyproject(plugin_dir: Path) -> StreamDeckConfigD
 
 class ActionLoader:
     @classmethod
-    def load_actions(cls: type[Self], plugin_dir: Path, files: list[str]) -> Generator[Action, None, None]:
+    def load_actions(cls: type[Self], plugin_dir: Path, files: list[str]) -> Generator[ActionBase, None, None]:
         # Ensure the parent directory of the plugin modules is in `sys.path`,
         # so that import statements in the plugin module will work as expected.
         if str(plugin_dir) not in sys.path:
@@ -191,12 +191,12 @@ def _load_module_from_file(filepath: Path) -> ModuleType:
         return module
 
     @staticmethod
-    def _get_actions_from_loaded_module(module: ModuleType) -> Generator[Action, None, None]:
+    def _get_actions_from_loaded_module(module: ModuleType) -> Generator[ActionBase, None, None]:
         # Iterate over all attributes in the module to find Action subclasses
         for attribute_name in dir(module):
             attribute = getattr(module, attribute_name)
-            # Check if the attribute is an instance of the Action class
-            if isinstance(attribute, Action):
+            # Check if the attribute is an instance of the Action class or GlobalAction class.
+            if issubclass(type(attribute), ActionBase):
                 yield attribute
 
 

streamdeck/actions.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from abc import ABC
 from collections import defaultdict
 from functools import cached_property
 from logging import getLogger
@@ -39,7 +40,7 @@
 }
 
 
-class ActionBase:
+class ActionBase(ABC):
     """Base class for all actions."""
 
     def __init__(self):
@@ -89,6 +90,9 @@ def get_event_handlers(self, event_name: EventNameStr, /) -> Generator[EventHand
             msg = f"Provided event name for pulling handlers from action does not exist: {event_name}"
             raise KeyError(msg)
 
+        if event_name not in self._events:
+            return
+
         yield from self._events[event_name]
 
 

streamdeck/manager.py

@@ -61,8 +61,8 @@ def register_action(self, action: Action) -> None:
         Args:
             action (Action): The action to register.
         """
-        # First, configure a logger for the action, giving it the last part of its uuid as name.
-        action_component_name = action.uuid.split(".")[-1]
+        # First, configure a logger for the action, giving it the last part of its uuid as name (if it has one).
+        action_component_name = action.uuid.split(".")[-1] if hasattr(action, "uuid") else "global"
         configure_streamdeck_logger(name=action_component_name, plugin_uuid=self.uuid)
 
         self._registry.register(action)