pywebexec 1.4.1__tar.gz → 1.4.3__tar.gz

{pywebexec-1.4.1/pywebexec.egg-info → pywebexec-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.4.1
+Version: 1.4.3
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -36,7 +36,6 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
-Classifier: Operating System :: Microsoft :: Windows 
 Classifier: Operating System :: MacOS
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pywebexec-1.4.1 → pywebexec-1.4.3}/pyproject.toml

@@ -28,7 +28,6 @@ classifiers = [
   "License :: OSI Approved :: MIT License",
   "Operating System :: POSIX",
   "Operating System :: Unix",
-  "Operating System :: Microsoft :: Windows ",
   "Operating System :: MacOS",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",

{pywebexec-1.4.1 → pywebexec-1.4.3}/pywebexec/pywebexec.py

@@ -454,27 +454,25 @@ def run_command(command, params, command_id, user):
     update_command_status(command_id, 'running', command=command, params=params, start_time=start_time, user=user)
     output_file_path = get_output_file_path(command_id)
     try:
-        def spawn_tty():
-            with open(output_file_path, 'wb') as fd:
-                p = pexpect.spawn(command, params, ignore_sighup=True, timeout=None)
-                update_command_status(command_id, 'running', pid=p.pid, user=user)
-                p.setwinsize(24, 120)
-                p.logfile = fd
-                p.expect(pexpect.EOF)
-                fd.flush()
-                status = p.wait()
-                end_time = datetime.now().isoformat()
-                # Update the status based on the result
-                if status is None:
-                    exit_code = -15
-                    update_command_status(command_id, 'aborted', end_time=end_time, exit_code=exit_code, user=user)
+        with open(output_file_path, 'wb') as fd:
+            p = pexpect.spawn(command, params, ignore_sighup=True, timeout=None)
+            update_command_status(command_id, 'running', pid=p.pid, user=user)
+            p.setwinsize(24, 125)
+            p.logfile = fd
+            p.expect(pexpect.EOF)
+            fd.flush()
+            status = p.wait()
+            end_time = datetime.now().isoformat()
+            # Update the status based on the result
+            if status is None:
+                exit_code = -15
+                update_command_status(command_id, 'aborted', end_time=end_time, exit_code=exit_code, user=user)
+            else:
+                exit_code = status
+                if exit_code == 0:
+                    update_command_status(command_id, 'success', end_time=end_time, exit_code=exit_code, user=user)
                 else:
-                    exit_code = status
-                    if exit_code == 0:
-                        update_command_status(command_id, 'success', end_time=end_time, exit_code=exit_code, user=user)
-                    else:
-                        update_command_status(command_id, 'failed', end_time=end_time, exit_code=exit_code, user=user)
-        spawn_tty()
+                    update_command_status(command_id, 'failed', end_time=end_time, exit_code=exit_code, user=user)
     except Exception as e:
         end_time = datetime.now().isoformat()
         update_command_status(command_id, 'failed', end_time=end_time, exit_code=1, user=user)

{pywebexec-1.4.1 → pywebexec-1.4.3}/pywebexec/static/css/style.css

@@ -253,11 +253,6 @@ body.dimmed * {
     left: 50%;
     transform: translate(-50%, -50%);
 }
-.xterm-cursor {
-    display: none;
-    visibility: hidden;
-    height: 0px;
-}
 /* allow wide chars in terminal */
 span {
     letter-spacing: -0.03px !important;

{pywebexec-1.4.1 → pywebexec-1.4.3}/pywebexec/static/js/commands.js

@@ -25,7 +25,7 @@ function filterCommands() {
             options[i].style.display = 'none';
         }
     }
-    if (nbVisibleItems>1) {
+    if (nbVisibleItems > 1) {
         commandListSelect.size = Math.min(20, nbVisibleItems);
         commandListSelect.style.display = 'block';
     } else {
@@ -211,6 +211,8 @@ async function fetchExecutables() {
         alert("Failed to fetch executables");
     }
     commandListSelect.size = Math.min(20, commandListSelect.options.length);
+    if (commandListSelect.options.length == 1)
+        commandInput.value = commandListSelect.options[0].text;
     if (commandListSelect.options.length == 0)
         document.getElementById('launchForm').style.display = 'none';
 

{pywebexec-1.4.1 → pywebexec-1.4.3}/pywebexec/static/js/script.js

@@ -2,13 +2,13 @@ let currentCommandId = null;
 let outputInterval = null;
 let nextOutputLink = null;
 let fullOutput = '';
-
+let outputLength = 0;
 
 function initTerminal()
 {
     return new Terminal({
         cursorBlink: false,
-        cursorHidden: true,
+        cursorInactiveStyle: 'none',
         disableStdin: true,
         convertEol: true,
         fontFamily: 'Consolas NF, monospace, courier-new, courier',
@@ -25,6 +25,7 @@ function initTerminal()
             brightBlack: "#243C4F",
             brightBlue: "#5584b1",
         },
+        customGlyphs: false,
         rescaleOverlappingGlyphs: true,
     });
 }
@@ -130,16 +131,14 @@ async function fetchOutput(url) {
         } else {
             slider = document.getElementById('outputSlider')
             percentage = slider.value;
+            fullOutput += data.output;
             if (percentage == 100)
-                terminal.write(data.output);
+                terminal.write(data.output); //.replace(/ \r/g, "\r\n")); tty size mismatch
             else {
-                length = Math.floor((fullOutput.length * percentage) / 100);
-                newlength = fullOutput.length + data.output.length;
-                percentage = Math.floor(length/newlength * 100);
+                percentage = Math.round((outputLength * 100)/fullOutput.length);
                 slider.value = percentage;
                 document.getElementById('outputPercentage').innerText = `${percentage}%`;
             }
-            fullOutput += data.output;
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
                 clearInterval(outputInterval);
@@ -165,6 +164,10 @@ async function viewOutput(command_id) {
             return;
         }
         const data = await response.json();
+        if (data.command == 'term')
+            terminal.options.cursorInactiveStyle = 'outline';
+        else
+            terminal.options.cursorInactiveStyle = 'none';
         if (data.status === 'running') {
             fetchOutput(nextOutputLink);
             outputInterval = setInterval(() => fetchOutput(nextOutputLink), 1000);
@@ -298,7 +301,7 @@ function sliderUpdateOutput()
 {
     const slider = document.getElementById('outputSlider');
     const percentage = slider.value;
-    const outputLength = Math.floor((fullOutput.length * percentage) / 100);
+    outputLength = Math.floor((fullOutput.length * percentage) / 100);
     const limitedOutput = fullOutput.slice(0, outputLength);
     terminal.clear();
     terminal.reset();

{pywebexec-1.4.1 → pywebexec-1.4.3}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.1'
-__version_tuple__ = version_tuple = (1, 4, 1)
+__version__ = version = '1.4.3'
+__version_tuple__ = version_tuple = (1, 4, 3)

{pywebexec-1.4.1 → pywebexec-1.4.3/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.4.1
+Version: 1.4.3
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -36,7 +36,6 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
-Classifier: Operating System :: Microsoft :: Windows 
 Classifier: Operating System :: MacOS
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3