Fix process interaction. Repeated signals kill the process.

Fixes #9

Signed-off-by: Pedro Algarvio <[email protected]>

Author: s0undt3ch

changelog/9.bugfix.rst

@@ -0,0 +1 @@
+Fixed process interaction

changelog/9.improvement.rst

@@ -0,0 +1 @@
+Repeated caught signals now kill the process

src/ptscripts/parser.py

@@ -138,6 +138,7 @@ def run(
         check=True,
         no_output_timeout_secs: int | None = None,
         capture: bool = False,
+        interactive: bool = False,
     ) -> CompletedProcess[str]:
         """
         Run a subprocess.
@@ -147,6 +148,7 @@ def run(
             check=check,
             no_output_timeout_secs=no_output_timeout_secs,
             capture=capture,
+            interactive=interactive,
         )
 
     @contextmanager

src/ptscripts/process.py

@@ -10,6 +10,7 @@
 import sys
 from datetime import datetime
 from datetime import timedelta
+from functools import partial
 from typing import cast
 from typing import TYPE_CHECKING
 
@@ -131,21 +132,35 @@ def protocol_factory():
     return Process(transport, protocol, loop, no_output_timeout_secs=no_output_timeout_secs)
 
 
+def _handle_signal(proc, sig):
+    if sig in proc._handled_signals:
+        log.info(f"\nCaught {sig.name} again, killing the process ...")
+        proc.kill()
+        return
+    log.info(
+        f"\nCaught {sig.name}, terminating process ....\nSend {sig.name} again to kill the process."
+    )
+    proc._handled_signals.append(sig)
+    proc.terminate()
+
+
 async def _subprocess_run(
-    f,
+    future,
     cmdline,
     check=True,
     no_output_timeout_secs: int | None = None,
     capture: bool = False,
+    interactive: bool = False,
 ):
     stdout = subprocess.PIPE
     stderr = subprocess.PIPE
     kwargs = {}
-    # Run in a separate program group
-    if sys.platform.startswith("win"):
-        kwargs["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
-    else:
-        kwargs["preexec_fn"] = os.setpgrp
+    if interactive is False:
+        # Run in a separate program group
+        if sys.platform.startswith("win"):
+            kwargs["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
+        else:
+            kwargs["preexec_fn"] = os.setpgrp
     proc = await _create_subprocess_exec(
         *cmdline,
         stdout=stdout,
@@ -156,25 +171,27 @@ async def _subprocess_run(
         capture=capture,
         **kwargs,
     )
+    proc._handled_signals = []
     loop = asyncio.get_running_loop()
     for signame in ("SIGINT", "SIGTERM"):
         sig = getattr(signal, signame)
-        loop.add_signal_handler(sig, proc.terminate)
+        loop.add_signal_handler(sig, partial(_handle_signal, proc, sig))
     stdout, stderr = await asyncio.shield(proc.communicate())
     result = subprocess.CompletedProcess(
         args=cmdline,
         stdout=stdout,
         stderr=stderr,
         returncode=proc.returncode,
     )
-    f.set_result(result)
+    future.set_result(result)
 
 
 def run(
     *cmdline,
     check=True,
     no_output_timeout_secs: int | None = None,
     capture: bool = False,
+    interactive: bool = False,
 ) -> subprocess.CompletedProcess[str]:
     """
     Run a command.
@@ -189,6 +206,7 @@ def run(
                 check,
                 no_output_timeout_secs=no_output_timeout_secs,
                 capture=capture,
+                interactive=interactive,
             )
         )
         result = future.result()