pyx3270 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

pyx3270/__init__.py

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

pyx3270/emulator.py

@@ -5,12 +5,14 @@ import os
 import re
 import socket
 import subprocess
+import sys
 from contextlib import closing
 from functools import cache
+from importlib.resources import files
 from logging import getLogger
 from time import sleep, time
 from typing import Literal
-from pyx3270.x3270_commands import x3270_command
+
 from pyx3270.exceptions import (
     CommandError,
     FieldTruncateError,
@@ -25,10 +27,25 @@ from pyx3270.iemulator import (
     AbstractExecutableApp,
 )
 from pyx3270.logging_config import LOGGING_CONFIG
+from pyx3270.x3270_commands import x3270_command
 
 logger = getLogger(__name__)
 
-BINARY_FOLDER = os.path.join(os.path.dirname(__file__), 'bin')
+
+def get_binary_path(*parts):
+    # Se estiver rodando como executável PyInstaller
+    if hasattr(sys, '_MEIPASS'):
+        return os.path.join(sys._MEIPASS, 'pyx3270', 'bin', *parts)
+
+    # Se estiver rodando como pacote instalado normalmente
+    try:
+        bin_dir = files('pyx3270').joinpath('bin')
+        return str(bin_dir.joinpath(*parts))
+    except Exception as e:
+        raise FileNotFoundError(f'Não foi possível localizar o binário: {e}')
+
+
+BINARY_FOLDER = get_binary_path()
 MODEL_TYPE = Literal['2', '3', '4', '5']
 MODEL_DIMENSIONS = {
     '2': {
@@ -196,7 +213,7 @@ class Command(AbstractCommand):
         error_msg = msg.decode('utf-8')
 
         if (
-            'keyboard locked' in error_msg.lower() 
+            'keyboard locked' in error_msg.lower()
             or 'canceled' in error_msg.lower()
         ):
             logger.error(f'Teclado travado detectado: {error_msg}')
@@ -303,7 +320,7 @@ class Wc3270App(ExecutableApp):
             'start',
             '/wait',
             '""',
-            f'"{os.path.join(BINARY_FOLDER, "windows/wc3270")}"',
+            f'"{get_binary_path("windows", "wc3270")}"',
         ] + self.args
         self.args.extend(['-scriptport', str(self.script_port), host])
         logger.debug(f'Argumentos completos: {self.args}')
@@ -353,7 +370,7 @@ class Wc3270App(ExecutableApp):
 
 class Ws3270App(ExecutableApp):
     args = [
-        os.path.join(BINARY_FOLDER, 'windows/ws3270'),
+        f'"{get_binary_path("windows", "ws3270")}"',
         '-xrm',
         'ws3270.unlockDelay:False',
     ]
@@ -365,8 +382,7 @@ class Ws3270App(ExecutableApp):
 
 class X3270App(ExecutableApp):
     args = [
-        os.path.join(BINARY_FOLDER, 'linux/x3270'),
-        # 'x3270',
+        get_binary_path('linux', 'x3270'),
         '-xrm',
         'x3270.unlockDelay:False',
         '-script',
@@ -379,7 +395,7 @@ class X3270App(ExecutableApp):
 
 class S3270App(ExecutableApp):
     args = [
-        os.path.join(BINARY_FOLDER, 'linux/s3270'),
+        get_binary_path('linux', 's3270'),
         '-xrm',
         's3270.unlockDelay:False',
     ]
@@ -397,6 +413,7 @@ class X3270Cmd(AbstractEmulatorCmd):
     def __getattr__(self, name):
         def x3270_builtin_func(*args, **kwargs):
             return x3270_command(self, name, *args, **kwargs)
+
         return x3270_builtin_func
 
     def clear_screen(self) -> None:
@@ -812,7 +829,7 @@ class X3270(AbstractEmulator, X3270Cmd):
         host: str,
         port: int | str,
         tls: bool = True,
-        mode_3270: bool = True
+        mode_3270: bool = True,
     ) -> None:
         logger.info(f'Conectando ao host: {host}:{port} (tls={tls})')
         self.host = host

pyx3270/hook/__init__.py

@@ -0,0 +1,5 @@
+import os
+
+
+def get_hook_dirs():
+    return [os.path.dirname(__file__)]

pyx3270/hook/hook-pyx3270.py

@@ -0,0 +1,26 @@
+import os
+from PyInstaller.utils.hooks import get_package_paths
+
+print(">> Hook pyx3270 executado")
+
+# Caminho do pacote instalado
+package_path, _ = get_package_paths('pyx3270')
+
+# Caminho da pasta bin dentro do pacote
+bin_dir = os.path.join(package_path, 'pyx3270', 'bin')
+
+datas = []
+
+if os.path.isdir(bin_dir):
+    for root, _, files in os.walk(bin_dir):
+        for file in files:
+            full_path = os.path.join(root, file)
+            # 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))
+            datas.append((full_path, target_dir))
+else:
+    print(f">> Pasta bin não encontrada em: {bin_dir}")
+
+__all__ = ['datas']

pyx3270/offline.py

@@ -28,7 +28,7 @@ class PyX3270Manager:
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             text=True,
-            bufsize=0
+            bufsize=0,
         )
 
     def _exec(self, command: str) -> None:
@@ -40,11 +40,11 @@ class PyX3270Manager:
 
         logger.info(f'[+] Enviando comando offline: {command}')
         try:
-            self.process.stdin.write(f"{command}\n")
+            self.process.stdin.write(f'{command}\n')
             self.process.stdin.flush()
             sleep(0.05)
         except Exception as e:
-            logger.error(f"Erro ao enviar comando: {e}")
+            logger.error(f'Erro ao enviar comando: {e}')
             return
         self.emu.pf(1)
         sleep(0.1)

pyx3270/server.py

@@ -216,7 +216,7 @@ def record_handler(
                 )
                 save = False
                 screens.append(buffer)
-                record_data(full_block, record_dir, counter)
+                counter += record_data(full_block, record_dir, counter)
 
     except (ConnectionResetError, OSError, NotConnectedException):
         logger.info('[!] Conexão encerrada pelo servidor ou erro de rede.')

pyx3270/x3270_commands.py

@@ -1,6 +1,7 @@
 import functools
-from typing import Any
 import warnings
+from typing import Any
+
 
 def x3270_builtins_class(cls):
     """Decorador de classe que aplica x3270_builtins a todos os métodos."""
@@ -17,6 +18,7 @@ def _wrap_method(method):
     @functools.wraps(method)
     def wrapper(self, *args, **kwargs):
         return x3270_command(self, method.__name__, *args, **kwargs)
+
     return wrapper
 
 
@@ -29,7 +31,7 @@ def x3270_command(em, func, *args, **kwargs):
         warnings.warn(
             f'`{func}` foi descontinuada, use `send_string`'
             f' com argumento `password=True`.',
-            DeprecationWarning
+            DeprecationWarning,
         )
         return em.send_string(*args, **kwargs, password=True)
 
@@ -37,7 +39,7 @@ def x3270_command(em, func, *args, **kwargs):
         if not all_args_str:
             warnings.warn(
                 f'`{func}` foi descontinuada, use `send_pf` com argumento.',
-                DeprecationWarning
+                DeprecationWarning,
             )
             all_args_str = func[-1]
 
@@ -47,7 +49,7 @@ def x3270_command(em, func, *args, **kwargs):
 
     if func == 'connect' and (len(args) + len(kwargs)) > 1:
         return em.connect_host(*args, **kwargs)
-        
+
     try:
         cmd = em._exec_command(f'{func}({all_args_str})'.encode('utf8'))
         try:
@@ -83,7 +85,9 @@ class X3270Commands:
     def compose(
         self,
     ) -> Any: ...  # Interpreta as próximas duas teclas conforme o mapa.
-    def connect(self, host: str, port: str | None = None) -> Any: ...  # Conecta ao host.
+    def connect(
+        self, host: str, port: str | None = None
+    ) -> Any: ...  # Conecta ao host.
     def cursorselect(
         self,
     ) -> Any: ...  # Seleciona local do cursor como caneta luminosa.

{pyx3270-0.1.2.dist-info → pyx3270-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyx3270
-Version: 0.1.2
+Version: 0.1.3
 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.2.dist-info → pyx3270-0.1.3.dist-info}/RECORD

@@ -1,33 +1,35 @@
 docs/gen_tree.py,sha256=DQbnAfFVeeMT2mZMzByKVdM1Qm_O0q3mRrzKqKfSQ5M,11374
-pyx3270/__init__.py,sha256=bsBQIbLWS178qZHTY-JjkhXXEH5lPGAXn3-sUVelSXE,1226
+pyx3270/__init__.py,sha256=lj-5NGfO6AmSKLTxftIw6eYjlYwg48h3vIKULZp77Os,1226
 pyx3270/__main__.py,sha256=YyGX6Wbn7bgOvXjHIeGf8Z2so8MEtXXMRcaJnqR8tU4,70
 pyx3270/cli.py,sha256=_Vrmg-p1i889q9zS-k7IBS6_OHDMWtTt2b6-Mx5Esdk,4571
-pyx3270/emulator.py,sha256=F_yzaBTljIlHHmXPkSUQajsKU9kSCVb_CsN4A3SrraY,31376
+pyx3270/emulator.py,sha256=zDKKYf8Ghz39zGVita1VI6aOAdB6rzYIUu86RJLJkUo,31827
 pyx3270/exceptions.py,sha256=TtM9LugE5m4E01vI9PnzCE-BRMqigiWvoeGTLTDDbfo,607
 pyx3270/iemulator.py,sha256=tVEFNlZMSww2LsfdXZgmg2XJtT716uGvOHyU7G_UXBU,3081
 pyx3270/logging_config.py,sha256=k5sYSlaAe-_hkMR2V37eXRiQ4aPNRm6R7az1iEZ4IH4,1667
-pyx3270/offline.py,sha256=Wh6matJqi3piGGjZgM2YTDlRAWQw772f6D_RKX3Icwc,2880
+pyx3270/offline.py,sha256=_ye3KC3FIkOEwSS0EykG4hdWSuu7zgJhl4dvI5-gCVw,2881
 pyx3270/py.typed,sha256=eSgqDZOdQoML2kw4FABXkFkJeM2184WI1ojN8ed6k4Q,50
-pyx3270/server.py,sha256=6BqqPy1hGuwBukF4PFb2MYW-p6Qsl7Atux2V4XPAr8o,14159
+pyx3270/server.py,sha256=57KufyvPAIEbKmIKdVvvoZ9eJgDqo1OPg02MMvY41IE,14170
 pyx3270/state.py,sha256=8MHyzT89IHWrXmVgbiSxvsfKSLQhsaZsXj4OOediPxA,72
 pyx3270/tn3270.py,sha256=-trKVI3uimpte6_IzYjwGv4UpGIEacKjI1knQFunNi0,6640
-pyx3270/x3270_commands.py,sha256=1Z84Hth3tUJiHZP1dVwhParsz92iJSMon2JyURkvMmU,9074
-pyx3270/bin/start.bin,sha256=PX1-T7RZoAcjYizAukHdy_YELB8iWijUGUBTM0B8k1s,831
-pyx3270/bin/start.bin.bak,sha256=yS2kIBpOXH_81QMLV2a6hL11wPkxwVLeKlBrU3K9YFI,831
+pyx3270/x3270_commands.py,sha256=A65TZmjYakx9U8iiw60InxgVHkFc6XN2mYiFYiJQV8Y,9088
+pyx3270/bin/start.bin,sha256=v1thzPr4nUjqNMlSPT9P9aY4RJuRa4mvE0b9es-cfvQ,831
+pyx3270/bin/start.bin.bak,sha256=PX1-T7RZoAcjYizAukHdy_YELB8iWijUGUBTM0B8k1s,831
 pyx3270/bin/linux/s3270,sha256=urcrOyQdksRHZwngLRnSLqrRyUDGhwvvL6xfy6uzbyk,1063944
 pyx3270/bin/linux/x3270,sha256=udKhVgQZDEu6_QQ37GeoH4zZwFQaw0x7OYw80Kh6-58,1719552
 pyx3270/bin/windows/wc3270.exe,sha256=gYE5ge5cgLlwkd1R5GG2WWAlQt_veXCydb8rARtP3lI,3570888
 pyx3270/bin/windows/ws3270.exe,sha256=eearMtLt-VtQrODep-PMxLZglVR5gb7-Le6OX3-tw_E,2904696
+pyx3270/hook/__init__.py,sha256=y0FL6nUHAtFJY2o_PWl1LxbvHPcwaA_Uj-tZJTlNeuc,77
+pyx3270/hook/hook-pyx3270.py,sha256=7H8yyquJ_WykUksTsA5dWTjW_xgWtvVgkG-o0a8yzqA,882
 site/gen_tree.py,sha256=DQbnAfFVeeMT2mZMzByKVdM1Qm_O0q3mRrzKqKfSQ5M,11374
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=eFhdOo-a-hlbx61S2c6JUcFOHVzlf3OpCTJW-4VM0Ls,8134
 tests/test_cli.py,sha256=JW0PBFxvux0J5ZFlzhSPiIie5NqQ2Q3dti_rZt_0HtA,3200
 tests/test_emulator.py,sha256=fpmKiGN1pyEN470XstCG8EsEpnaqFrBQ76tSp5_Sdas,69346
 tests/test_exceptions.py,sha256=pvpwEUFEEju2CgBR3QPpm6wspiwzP1jp5K7gX9Pagrw,1226
-tests/test_offline.py,sha256=OuKBp8EZby_BAi-fQoxga-eztSPH94M8iiAZTxuXH6E,5571
+tests/test_offline.py,sha256=bkwHMoevAl3UEj8UmclM4adSm0kujjNNX83Dlx1nBpM,5572
 tests/test_server.py,sha256=FlJ_gEhRtoESc1m9EKCfJRXeGJnMRyoUtKF1VkOYhBY,23608
-pyx3270-0.1.2.dist-info/METADATA,sha256=EyH85TZYjDiWjXn5eu5eMlEKZAwc5N-vWtjiM4PBRrE,3417
-pyx3270-0.1.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-pyx3270-0.1.2.dist-info/entry_points.txt,sha256=Bcoy79ZDcPN0ESfhD6TCa0R5eDbKYuMX7duLPzrVqMQ,49
-pyx3270-0.1.2.dist-info/top_level.txt,sha256=ptTDzZHpMHYKlnFM01XeuAnLhdlYO2NZQeER6hp3euA,24
-pyx3270-0.1.2.dist-info/RECORD,,
+pyx3270-0.1.3.dist-info/METADATA,sha256=fCyDAXvoiWc_qFOqZxO99ur9GmRq0w0-gwTyZ735iLg,3417
+pyx3270-0.1.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+pyx3270-0.1.3.dist-info/entry_points.txt,sha256=9kg9FaegDY2FXCVplltQGAmMiWia1LnnsPF7c1uQpa0,105
+pyx3270-0.1.3.dist-info/top_level.txt,sha256=ptTDzZHpMHYKlnFM01XeuAnLhdlYO2NZQeER6hp3euA,24
+pyx3270-0.1.3.dist-info/RECORD,,

pyx3270-0.1.3.dist-info/entry_points.txt

@@ -0,0 +1,5 @@
+[console_scripts]
+pyx3270 = pyx3270.__main__:app
+
+[pyinstaller40]
+hook-dirs = pyx3270.hook:get_hook_dirs

tests/test_offline.py

@@ -30,7 +30,7 @@ def test_pyx3270_manager_init_and_terminate(mock_popen, x3270_cmd_instance):
         stdout=subprocess.DEVNULL,
         stderr=subprocess.DEVNULL,
         text=True,
-        bufsize=0
+        bufsize=0,
     )
     assert manager.process == mock_process
 

pyx3270-0.1.2.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-pyx3270 = pyx3270.__main__:app