pyx3270 0.1.5__tar.gz → 0.1.7__tar.gz

{pyx3270-0.1.5 → pyx3270-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyx3270
-Version: 0.1.5
+Version: 0.1.7
 Summary: Uma interface comum utilizada para automações de terminais 3270 da IBM.
 Author-email: MatheusLPolidoro <mattpolidoro4@gmail.com>
 Project-URL: Documentation, https://matheuslpolidoro.github.io/pyx3270/

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyx3270"
-version = "0.1.5"
+version = "0.1.7"
 description = "Uma interface comum utilizada para automações de terminais 3270 da IBM."
 authors = [{name = "MatheusLPolidoro", email = "mattpolidoro4@gmail.com"}]
 readme = "README.md"

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270/__init__.py

@@ -16,5 +16,5 @@ from pyx3270.emulator import X3270
 from pyx3270.offline import PyX3270Manager
 
 __author__ = 'MatheusLPolidoro'
-__version__ = '0.1.5'
+__version__ = '0.1.7'
 __all__ = ['X3270', 'replay', 'record', 'PyX3270Manager']

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270/cli.py

@@ -1,5 +1,6 @@
 import os
 import socket
+import sys
 import threading
 from time import sleep
 from typing import Callable
@@ -110,7 +111,9 @@ def replay(
     except KeyboardInterrupt:
         rich.print('\n[x] Interrompido pelo usuário.')
         state.command_process.terminate()
-        os._exit(0)
+        if emulator:
+            emu.terminate()
+        sys.exit(0)
 
 
 @app.command()
@@ -125,12 +128,12 @@ def record(
     port = int(*port) if port else 3270
 
     rich.print(f'[+] RECORD na porta {port}')
-
+    reconnect = False
     try:
         while True:
-            if emulator:
+            if emulator and not reconnect:
                 emu = X3270(visible=True, model=model, save_log_file=True)
-            else:
+            elif not reconnect:
                 emu = None
 
             server_thread = start_server_thread(
@@ -142,13 +145,19 @@ def record(
 
             if emulator:
                 rich.print('[+] Conectando ao emulador...')
-                emu.connect_host('localhost', port, tls, mode_3270=False)
+                if reconnect:
+                    emu.reconnect_host()
+                else:
+                    emu.connect_host('localhost', port, tls, mode_3270=False)
 
             rich.print(f'[+] Escutando localhost, origem {host=} {port=}')
             control_replay(server_thread)
+            reconnect = True
     except KeyboardInterrupt:
         rich.print('\n[x] Interrompido pelo usuário.')
-        os._exit(0)
+        if emulator:
+            emu.terminate()
+        sys.exit(0)
 
 
 if __name__ == '__main__':

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270/emulator.py

@@ -370,7 +370,7 @@ class Wc3270App(ExecutableApp):
 
 class Ws3270App(ExecutableApp):
     args = [
-        get_binary_path("windows", "ws3270"),
+        get_binary_path('windows', 'ws3270'),
         '-xrm',
         'ws3270.unlockDelay:False',
     ]
@@ -740,6 +740,7 @@ class X3270(AbstractEmulator, X3270Cmd):
         self.port = None
         self.tls = None
         self.mode_3270 = None
+        self.last_command_time = None
         logger.debug('X3270 inicializado')
 
     def _create_app(self) -> None:
@@ -774,6 +775,7 @@ class X3270(AbstractEmulator, X3270Cmd):
                 cmd = Command(self.app, cmdstr)
                 cmd.execute()
                 self.status = Status(cmd.status_line)
+                self.last_command_time = time()
                 logger.debug(f'Comando executado, status: {self.status}')
                 return cmd
             except NotConnectedException:
@@ -816,6 +818,17 @@ class X3270(AbstractEmulator, X3270Cmd):
     def is_connected(self) -> bool:
         logger.debug('Verificando estado de conexão')
         try:
+            # Verifica tempo desde o último comando
+            elapsed_max = 600
+            if self.last_command_time:
+                elapsed = time() - self.last_command_time
+                if elapsed > elapsed_max:
+                    logger.warning(
+                        f'Tempo de inatividade excedido: '
+                        f'{elapsed:.2f} segundos'
+                    )
+                    return False
+
             self.query('ConnectionState')
             is_connected = self.status.connection_state.startswith(b'C(')
             logger.info(f'Estado de conexão: {is_connected}')

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270/hook/hook-pyx3270.py

@@ -1,4 +1,5 @@
 import os
+
 from PyInstaller.utils.hooks import get_package_paths
 
 # Caminho do pacote instalado
@@ -16,7 +17,9 @@ if os.path.isdir(bin_dir):
             # Caminho relativo a partir da pasta bin (ex: windows/wc3270.exe)
             rel_path = os.path.relpath(full_path, bin_dir)
             # Corrige o destino para ser uma pasta, não um arquivo
-            target_dir = os.path.join('pyx3270', 'bin', os.path.dirname(rel_path))
+            target_dir = os.path.join(
+                'pyx3270', 'bin', os.path.dirname(rel_path)
+            )
             datas.append((full_path, target_dir))
 
 __all__ = ['datas']

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270/offline.py

@@ -1,5 +1,4 @@
 import subprocess
-import sys
 from logging import getLogger
 from time import sleep
 
@@ -11,8 +10,6 @@ logger = getLogger(__name__)
 class PyX3270Manager:
     def __init__(self, emu: AbstractEmulator, directory='./screens'):
         self.command = [
-            sys.executable,
-            '-m',
             'pyx3270',
             'replay',
             '--directory',
@@ -48,6 +45,7 @@ class PyX3270Manager:
             return
         self.emu.pf(1)
         sleep(0.1)
+        self.emu.pf(1)
 
     def next(self):
         """Define a tela específica e aguarda processamento corretamente."""
@@ -75,6 +73,7 @@ class PyX3270Manager:
     def change_directory(self, directory: str):
         """Troca o diretório de carregamento das telas."""
         self._exec(f'change directory {directory}')
+        sleep(1)
         self.emu.pf(1)
 
     def terminate(self):

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270/server.py

@@ -107,7 +107,7 @@ def find_directory(base_dir: str, search_name: str) -> str | None:
             ):  # Compara de forma insensível a maiúsculas/minúsculas
                 return os.path.join(base_dir, dir_name)
 
-    return None  # Retorna None se não encontrar um diretório correspondente
+    return None
 
 
 def convert_s(hex_string: str) -> str:

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyx3270
-Version: 0.1.5
+Version: 0.1.7
 Summary: Uma interface comum utilizada para automações de terminais 3270 da IBM.
 Author-email: MatheusLPolidoro <mattpolidoro4@gmail.com>
 Project-URL: Documentation, https://matheuslpolidoro.github.io/pyx3270/

{pyx3270-0.1.5 → pyx3270-0.1.7}/pyx3270.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ pyx3270.egg-info/entry_points.txt
 pyx3270.egg-info/requires.txt
 pyx3270.egg-info/top_level.txt
 pyx3270/bin/start.bin
-pyx3270/bin/start.bin.bak
 pyx3270/bin/linux/s3270
 pyx3270/bin/linux/x3270
 pyx3270/bin/windows/wc3270.exe

{pyx3270-0.1.5 → pyx3270-0.1.7}/tests/test_offline.py

@@ -2,7 +2,7 @@ import gc
 import subprocess
 import sys
 import weakref
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, patch, call
 
 from pyx3270.offline import PyX3270Manager
 
@@ -17,8 +17,6 @@ def test_pyx3270_manager_init_and_terminate(mock_popen, x3270_cmd_instance):
 
     mock_popen.assert_called_once_with(
         [
-            sys.executable,
-            '-m',
             'pyx3270',
             'replay',
             '--directory',
@@ -58,7 +56,8 @@ def test_pyx3270_manager_exec(mock_logger, mock_popen, x3270_cmd_instance):
     )
     mock_process.stdin.write.assert_called_once_with(f'{command}\n')
     mock_process.stdin.flush.assert_called_once()
-    manager.emu.pf.assert_called_once_with(1)
+    assert manager.emu.pf.call_count == 2
+    manager.emu.pf.assert_has_calls([call(1), call(1)])
 
 
 @patch('subprocess.Popen')