python-libei 0.6.1__py3-none-any.whl → 0.7.0__py3-none-any.whl

libei/__init__.py

@@ -31,6 +31,6 @@ the full breakdown, including which features need which libei version.
 Beta: the API is not frozen.
 """
 
-__version__ = "0.6.1"
+__version__ = "0.7.0"
 
 __all__ = ["__version__"]

libei/portal.py

@@ -185,6 +185,28 @@ class PortalDeniedError(PortalError):
         self.message = message
 
 
+class PortalSessionClosedError(PortalError):
+    """The portal session ended while something was still waiting on it.
+
+    The ``org.freedesktop.portal.Session`` interface emits ``Closed`` when
+    the compositor or the portal ends a session from its side -- a
+    compositor restart, the portal process dying, a session revoked from a
+    settings panel. Distinct from :class:`PortalTimeoutError` (the session
+    is fine, the signal just has not come) and from
+    :class:`PortalDeniedError` (a request was answered, negatively): here
+    there is no session left to answer anything, so the wait that raised
+    this can never be satisfied by waiting longer.
+    """
+
+    def __init__(self, step: str) -> None:
+        """Name what was being waited for when the session went away."""
+        super().__init__(
+            f"the portal session was closed while waiting for {step}; "
+            "the compositor or portal ended it from its side"
+        )
+        self.step = step
+
+
 def _gio() -> tuple[Any, Any] | None:
     """Import Gio and GLib, or return None.
 
@@ -1038,6 +1060,27 @@ def _wait_for_signal(
     loop = GLib.MainLoop()
     result: dict[str, Any] = {}
     timed_out = False
+    session_closed = False
+
+    def on_closed(*_args: Any) -> None:
+        """End the wait: a closed session can never deliver the signal.
+
+        ``Closed`` is emitted on the **session object's own path** (unlike
+        ``Activated``/``Deactivated``, which fire on the portal object --
+        see above), so the subscription below uses ``session_handle`` as
+        the path and needs no payload filtering: any ``Closed`` there is
+        this session's. Without this subscription, a wait with
+        ``timeout=None`` on a session the compositor has ended -- a
+        compositor restart, the portal dying, capture revoked from a
+        settings panel -- blocked forever, indistinguishable from a signal
+        that merely had not fired yet.
+        """
+        nonlocal session_closed
+        if result:
+            return
+        logger.debug("session %s closed while waiting for %s", session_handle, signal)
+        session_closed = True
+        loop.quit()
 
     def on_signal(
         _conn: Any,
@@ -1086,6 +1129,16 @@ def _wait_for_signal(
         on_signal,
         None,
     )
+    closed_subscription = connection.signal_subscribe(
+        busname,
+        _SESSION_INTERFACE,
+        "Closed",
+        session_handle,
+        None,
+        Gio.DBusSignalFlags.NONE,
+        on_closed,
+        None,
+    )
     logger.debug(
         "waiting up to %s for %s.%s on %s for session %s",
         "forever" if timeout is None else f"{timeout:g}s",
@@ -1095,7 +1148,7 @@ def _wait_for_signal(
         session_handle,
     )
     try:
-        if not result:
+        if not result and not session_closed:
             timeout_source = None
             if timeout is not None:
                 timeout_source = GLib.timeout_add(int(timeout * 1000), on_timeout)
@@ -1115,6 +1168,9 @@ def _wait_for_signal(
                     GLib.source_remove(timeout_source)
     finally:
         connection.signal_unsubscribe(subscription)
+        connection.signal_unsubscribe(closed_subscription)
+    if session_closed:
+        raise PortalSessionClosedError(signal)
     if timed_out:
         # timed_out is only ever set inside on_timeout, itself only ever
         # registered when timeout is not None -- so this always holds, but

{python_libei-0.6.1.dist-info → python_libei-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-libei
-Version: 0.6.1
+Version: 0.7.0
 Summary: Inject, receive and capture input on Wayland from Python: ctypes bindings for libei, libeis and liboeffis, plus the RemoteDesktop and InputCapture portals
 Author: Dennis K. Paulsen
 License-Expression: MIT
@@ -40,6 +40,7 @@ Dynamic: license-file
 
 # python-libei
 
+[![Contributing](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](https://github.com/ctrondlp/python-libei/blob/main/CONTRIBUTING.md)
 [![CI](https://github.com/ctrondlp/python-libei/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/ctrondlp/python-libei/actions/workflows/ci.yml)
 [![PyPI](https://img.shields.io/pypi/v/python-libei)](https://pypi.org/project/python-libei/)
 [![License](https://img.shields.io/pypi/l/python-libei)](https://github.com/ctrondlp/python-libei/blob/main/LICENSE)
@@ -174,7 +175,7 @@ and why, is in
 
 ## Status
 
-Beta (`0.6.1`), published on [PyPI](https://pypi.org/project/python-libei/)
+Beta (`0.7.0`), published on [PyPI](https://pypi.org/project/python-libei/)
 since `0.1.0`, and **the API is not frozen** — expect renames before 1.0.
 
 The injection path is exercised end to end against the real libraries by the

{python_libei-0.6.1.dist-info → python_libei-0.7.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-libei/__init__.py,sha256=OP-aoBP8bXNhL8q3gXxVL4FtWLhVyaBlmoQEInBdhp4,1858
+libei/__init__.py,sha256=3Ru2esZsveT5oIlBPJ_6DH8RsRoofVvvf27WZafcOZg,1858
 libei/_cobject.py,sha256=XjbUNJpZ87jAyPWh6dmRslk6cMy831oMRFhWmfjLDFo,13344
 libei/ei.py,sha256=W4akKc_BNVfL0FroSXLGD1Z_L3OmYjZT5QDHNnEtMP8,49367
 libei/eis.py,sha256=X_umAaAAbAMC9d2RdnMReeJZI61WsnKz3cySY5YrGr0,45841
 libei/oeffis.py,sha256=gJHR90s9VhQrgkjWUMDx-lxZ8qKxkttnqbx_xo-7oxs,10035
-libei/portal.py,sha256=XC_FsKueIpcmAPZ4TDXJgFhucJNeMEO2byTJHG3GMmI,69756
+libei/portal.py,sha256=Q2GbZBUnKJZ90WJtDtpkcgQbvsCLY6xJwngmYRg5qQ0,72089
 libei/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 libei/_capi/__init__.py,sha256=raISSWSV9hAcE92DcLCz-vUb1IPcsmxRZaS-iAoQJBE,211
 libei/_capi/libei.py,sha256=qsccHa_komCxtvPYi6AobszhFbEG2qA8QYJJVr8SaGM,11356
 libei/_capi/libeis.py,sha256=C_Uh7DwNncFC8A4wuMhviAj5C_TUmKHtLJYq0Qhhz1E,13142
 libei/_capi/liboeffis.py,sha256=V8jdmJm3qOQUzzNiCAXt4Jr2JY11Y4-w6NIfIxbxGI4,1218
 libei/_capi/loader.py,sha256=xW67uk35ckgeFaheDGrHC05ZM5w_cxBGvX5lG_GUSu8,6625
-python_libei-0.6.1.dist-info/licenses/LICENSE,sha256=l6xbMU6Y-JZDzmBciBj-J5t6h6jNg_Bcyp4bHxDepqU,1074
-python_libei-0.6.1.dist-info/METADATA,sha256=nV9GTh7ArlrDPXyPTt4fGHJiPP22J9bmA2e8v-mDgp0,22728
-python_libei-0.6.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_libei-0.6.1.dist-info/top_level.txt,sha256=_DQXzGjDsUBENI_cNkiOxPB4xi8coCbQS1lq18FMudQ,6
-python_libei-0.6.1.dist-info/RECORD,,
+python_libei-0.7.0.dist-info/licenses/LICENSE,sha256=l6xbMU6Y-JZDzmBciBj-J5t6h6jNg_Bcyp4bHxDepqU,1074
+python_libei-0.7.0.dist-info/METADATA,sha256=kCY_c4mpI43wAk_72MFq1yyv3VZm8r9NBaexaQzgWCg,22882
+python_libei-0.7.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_libei-0.7.0.dist-info/top_level.txt,sha256=_DQXzGjDsUBENI_cNkiOxPB4xi8coCbQS1lq18FMudQ,6
+python_libei-0.7.0.dist-info/RECORD,,