pywebexec 1.1.18__tar.gz → 1.2.0__tar.gz

{pywebexec-1.1.18/pywebexec.egg-info → pywebexec-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.1.18
+Version: 1.2.0
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-1.1.18 → pywebexec-1.2.0}/pywebexec/pywebexec.py

@@ -15,6 +15,7 @@ from gunicorn.app.base import Application
 import ipaddress
 from socket import gethostname, gethostbyname_ex
 import ssl
+import re
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
     from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
 
@@ -136,10 +137,28 @@ class StandaloneApplication(Application):
         return self.application
 
 
+def strip_ansi_control_chars(text):
+    """Remove ANSI and control characters from the text."""
+    # To clean
+    # ansi_escape = re.compile(r'''
+    #     (?:\x1B[@-_]|    # ANSI ESCape sequences
+    #     \x1B\[.*?[ -/]*[@-~]|  # ANSI CSI sequences
+    #     \x1B\].*?\x07|   # ANSI OSC sequences
+    #     \x1B=P|          # ANSI DCS sequences
+    #     \x1B\\|          # ANSI ST sequences
+    #     \x1B\^|          # ANSI PM sequences
+    #     \x1B_.*?\x1B\\|  # ANSI APC sequences
+    #     [\x00-\x1F\x7F]) # Control characters
+    # ''', re.VERBOSE)
+    # ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~]|[(]B)|>')
+    ansi_escape = re.compile(br'(?:\x1B[@-Z\\-_]|[\x80-\x9A\x9C-\x9F]|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~]|\x1B([(]B|>))')
+    return ansi_escape.sub(b'', text)
+
+
 def decode_line(line: bytes) -> str:
     """try decode line exception on binary"""
     try:
-        return line.decode()
+        return strip_ansi_control_chars(line).decode().strip(" ")
     except UnicodeDecodeError:
         return ""
 
@@ -149,8 +168,11 @@ def last_line(fd, maxline=1000):
     line = "\n"
     fd.seek(0, os.SEEK_END)
     size = 0
-    while line in ["\n", "\r"] and size < maxline:
+    last_pos = 0
+    while line in ["", "\n", "\r"] and size < maxline:
         try:  # catch if file empty / only empty lines
+            if last_pos:
+                fd.seek(last_pos-2, os.SEEK_SET)
             while fd.read(1) not in [b"\n", b"\r"]:
                 fd.seek(-2, os.SEEK_CUR)
                 size += 1
@@ -158,8 +180,8 @@ def last_line(fd, maxline=1000):
             fd.seek(0)
             line = decode_line(fd.readline())
             break
+        last_pos = fd.tell()
         line = decode_line(fd.readline())
-        fd.seek(-4, os.SEEK_CUR)
     return line.strip()
 
 
@@ -317,6 +339,7 @@ def update_command_status(command_id, status, command=None, params=None, start_t
     if status != 'running':
         output_file_path = get_output_file_path(command_id)
         if os.path.exists(output_file_path):
+            print(output_file_path)
             status_data['last_output_line'] = get_last_non_empty_line_of_file(output_file_path)
     with open(status_file_path, 'w') as f:
         json.dump(status_data, f)
@@ -474,7 +497,7 @@ def stop_command(command_id):
     end_time = datetime.now().isoformat()
     try:
         os.kill(pid, 15)  # Send SIGTERM
-        update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
+        #update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
         return jsonify({'message': 'Command aborted'})
     except Exception as e:
         status_data = read_command_status(command_id) or {}
@@ -518,6 +541,11 @@ def list_commands():
                 except AttributeError:
                     params = " ".join([shlex.quote(p) if " " in p else p for p in status['params']])
                 command = status.get('command', '-') + ' ' + params
+                last_line = status.get('last_output_line')
+                if last_line is None:
+                    output_file_path = get_output_file_path(command_id)
+                    if os.path.exists(output_file_path):
+                        last_line = get_last_non_empty_line_of_file(output_file_path)
                 commands.append({
                     'command_id': command_id,
                     'status': status['status'],
@@ -525,7 +553,7 @@ def list_commands():
                     'end_time': status.get('end_time', 'N/A'),
                     'command': command,
                     'exit_code': status.get('exit_code', 'N/A'),
-                    'last_output_line': status.get('last_output_line', get_last_non_empty_line_of_file(get_output_file_path(command_id))),
+                    'last_output_line': last_line,
                 })
     # Sort commands by start_time in descending order
     commands.sort(key=lambda x: x['start_time'], reverse=True)

{pywebexec-1.1.18 → pywebexec-1.2.0}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.18'
-__version_tuple__ = version_tuple = (1, 1, 18)
+__version__ = version = '1.2.0'
+__version_tuple__ = version_tuple = (1, 2, 0)

{pywebexec-1.1.18 → pywebexec-1.2.0/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.1.18
+Version: 1.2.0
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau