misc fixes

pyprland/command.py

@@ -45,7 +45,7 @@ async def _wrapper(self: Self, full_name: str, *args, **kwargs) -> bool:
                 if key == _dedup_last_call.get(full_name):
                     return True
                 _dedup_last_call[full_name] = key
-            return await fn(self, full_name, *args, **kwargs)
+            return cast(bool, await fn(self, full_name, *args, **kwargs))
 
         return _wrapper
 

pyprland/plugins/scratchpads/__init__.py

@@ -793,6 +793,7 @@ async def _handle_focus_tracking(self, scratch: Scratch, active_window: str, act
         if tracker and not tracker.prev_focused_window_wrkspc.startswith("special:"):
             same_workspace = tracker.prev_focused_window_wrkspc == active_workspace
             client = next(filter(lambda d: d.get("address") == tracker.prev_focused_window, clients), None)
+            assert client
             if (
                 scratch.have_address(active_window)
                 and same_workspace

pyprland/plugins/scratchpads/objects.py

@@ -48,7 +48,7 @@ class Scratch(CastBoolMixin):  # {{{
     uid = ""
     monitor = ""
     pid = -1
-    excluded_scratches = []
+    excluded_scratches: list[str] = []
 
     def __init__(self, uid: str, opts: dict[str, Any]) -> None:
         self.uid = uid
@@ -62,7 +62,7 @@ def forced_monitor(self) -> str | None:
         """Returns forced monitor if available, else None."""
         forced_monitor = self.conf.get("force_monitor")
         if forced_monitor in state.monitors:
-            return forced_monitor
+            return cast(str, forced_monitor)
         return None
 
     def set_config(self, opts: dict[str, Any]) -> None:
@@ -99,7 +99,9 @@ async def initialize(self, ex: "_scratchpads_extension_m.Extension") -> None:
         if self.have_command:
             await self.update_client_info()
         else:
-            self.client_info = await self.fetch_matching_client()
+            m_client = await self.fetch_matching_client()
+            if m_client:
+                self.client_info = m_client
             assert self.client_info, "couldn't find a matching client"
         await ex.hyprctl(f"movetoworkspacesilent special:scratch_{self.uid},address:{self.full_address}")
         if "class_match" in self.conf:  # NOTE: legacy, to be removed

pyprland/version.py

@@ -1,3 +1,3 @@
 """Package version."""
 
-VERSION = "2.4.0-45"
+VERSION = "2.4.0-46"