rtems-proxy 0.2.2__tar.gz → 0.2.4__tar.gz

{rtems-proxy-0.2.2 → rtems-proxy-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rtems-proxy
-Version: 0.2.2
+Version: 0.2.4
 Summary: Support for a K8S proxy container in controlling and monitoring RTEMS EPICS IOCs
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License

{rtems-proxy-0.2.2 → rtems-proxy-0.2.4}/src/rtems_proxy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.2.4'
+__version_tuple__ = version_tuple = (0, 2, 4)

{rtems-proxy-0.2.2 → rtems-proxy-0.2.4}/src/rtems_proxy/copy.py

@@ -17,10 +17,9 @@ def copy_rtems():
     root = GLOBALS.RTEMS_ROOT
     # root of the path that the RTEMS IOC expects to find the IOC files
     rtems_root = Path("/iocs") / GLOBALS.IOC_GROUP / GLOBALS.IOC_NAME
-    # the binary blob to load into the RTEMS IOC via TFTP
-    ioc_bin = (GLOBALS.IOC / "bin") / GLOBALS.EPICS_TARGET_ARCH / "ioc.boot"
     # where to copy the Generic IOC folder to (at present only holds the dbd folder)
     dest_ioc = root / "ioc"
+    dest_runtime = root / "runtime"
 
     # because we are moving the ioc files we need to fix up startup script paths
     startup = GLOBALS.RUNTIME / "st.cmd"
@@ -28,9 +27,11 @@ def copy_rtems():
     cmd_txt = re.sub("/epics/", f"{str(rtems_root)}/", cmd_txt)
     startup.write_text(cmd_txt)
 
+    # clean up previous IOC binaries
+    shutil.rmtree(dest_ioc, ignore_errors=True)
+    shutil.rmtree(dest_runtime, ignore_errors=True)
     # move all the files needed for runtime into the PVC that is being shared
     # over nfs/tftp by the nfsv2-tftp service
     Path.mkdir(dest_ioc, exist_ok=True)
     shutil.copytree(GLOBALS.IOC / "dbd", dest_ioc, symlinks=True, dirs_exist_ok=True)
-    shutil.copytree(GLOBALS.RUNTIME, root / "runtime", dirs_exist_ok=True)
-    shutil.copy(ioc_bin, root)
+    shutil.copytree(GLOBALS.RUNTIME, dest_runtime, dirs_exist_ok=True)

{rtems-proxy-0.2.2 → rtems-proxy-0.2.4}/src/rtems_proxy/telnet.py

@@ -1,5 +1,8 @@
 import asyncio
 import signal
+import sys
+import termios
+import tty
 from time import sleep
 
 import telnetlib3
@@ -21,18 +24,29 @@ class TelnetRTEMS:
         self.terminated = True
 
     async def user_input(self, writer):
-        loop = asyncio.events._get_running_loop()
-
-        while self.running:
-            # run the wait for input in a separate thread
-            cmd = await loop.run_in_executor(None, input)
-            # look for control + ] to terminate the session
-            if b"\x1d" in cmd.encode():
-                self.running = False
-                break
-            writer.write(cmd)
-            writer.write("\r")
-        writer.close()
+        def get_char():
+            ch = sys.stdin.read(1)
+            return ch
+
+        stdin_fd = sys.stdin.fileno()
+        old_settings = termios.tcgetattr(stdin_fd)
+
+        try:
+            tty.setraw(sys.stdin.fileno())
+            loop = asyncio.events._get_running_loop()
+
+            while self.running:
+                # run the wait for input in a separate thread
+                next_ch = await loop.run_in_executor(None, get_char)
+                # look for control + ] to terminate the session
+                if b"\x1d" in next_ch.encode():
+                    self.running = False
+                    break
+                writer.write(next_ch)
+
+        finally:
+            termios.tcsetattr(stdin_fd, termios.TCSADRAIN, old_settings)
+            writer.close()
 
     async def server_output(self, reader):
         while self.running:

{rtems-proxy-0.2.2 → rtems-proxy-0.2.4}/src/rtems_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rtems-proxy
-Version: 0.2.2
+Version: 0.2.4
 Summary: Support for a K8S proxy container in controlling and monitoring RTEMS EPICS IOCs
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License