pywebexec 1.5.16__tar.gz → 1.5.18__tar.gz

{pywebexec-1.5.16/pywebexec.egg-info → pywebexec-1.5.18}/PKG-INFO

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

{pywebexec-1.5.16 → pywebexec-1.5.18}/pywebexec/pywebexec.py

@@ -552,14 +552,11 @@ def stop_command(command_id):
         os.killpg(os.getpgid(pid), 15)  # Send SIGTERM to the process group
         return jsonify({'message': 'Command aborted'})
     except Exception as e:
-        status_data = read_command_status(command_id) or {}
-        status_data['status'] = 'failed'
-        status_data['end_time'] = end_time
-        status_data['exit_code'] = 1
-        with open(get_status_file_path(command_id), 'w') as f:
-            json.dump(status_data, f)
-        with open(get_output_file_path(command_id), 'a') as output_file:
-            output_file.write(str(e))
+        update_command_status(command_id, {
+            'status': 'aborted',
+            'end_time': end_time,
+            'exit_code': -15,
+        })
         return jsonify({'error': 'Failed to terminate command'}), 500
 
 parseargs()

{pywebexec-1.5.16 → pywebexec-1.5.18}/pywebexec/static/css/style.css

@@ -56,7 +56,13 @@ select { /* Safari bug */
     overflow-y: hidden;
 }
 .copy-icon { cursor: pointer; }
-.monospace { font-family: Consolas NF, monospace; }
+.monospace {
+    font-family: Consolas NF,monospace;
+    font-size: 13px;
+ }
+.system-font {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+}
 .copied { color: green; margin-left: 5px; }
 button {
     -webkit-appearance: none;
@@ -352,7 +358,8 @@ span {
 .command-info {
     display: inline-block;
     padding: 5px 10px 5px 10px;
-    background-color: #ddd;
+    background-color: #111;
+    color: #eee;
     max-width: 300px;
     white-space: nowrap;
     border-radius: 5px;

{pywebexec-1.5.16 → pywebexec-1.5.18}/pywebexec/static/js/popup.js

@@ -215,6 +215,7 @@ window.addEventListener('resize', adjustOutputHeight);
 window.addEventListener('load', () => {
     slider = document.getElementById('outputSlider');
     slider.addEventListener('input', sliderUpdateOutput);
+    adjustOutputHeight();
     const commandId = window.location.pathname.split('/').slice(-1)[0];
     viewOutput(commandId);
 });

{pywebexec-1.5.16 → pywebexec-1.5.18}/pywebexec/static/js/script.js

@@ -140,7 +140,7 @@ async function fetchCommands() {
                 </td>
                 <td>${formatTime(command.start_time)}</td>
                 <td>${command.status === 'running' ? formatDuration(command.start_time, new Date().toISOString()) : formatDuration(command.start_time, command.end_time)}</td>
-                <td>${command.command.replace(/^\.\//, '')}</td>
+                <td class="system-font">${command.command.replace(/^\.\//, '')}</td>
                 <td><span class="status-icon status-${command.status}"></span>${command.status}${command.status === 'failed' ? ` (${command.exit_code})` : ''}</td>
                 <td>
                     ${command.command.startsWith('term') ? '' : command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}', event)">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}', event)">Run</button>`}
@@ -312,7 +312,7 @@ async function stopCommand(command_id, event) {
         }
     } catch (error) {
         console.log('Error stopping command:', error);
-        alert('Failed to stop command. Please try again.');
+        alert('Failed to stop command. Process not found.');
     }
 }
 

{pywebexec-1.5.16 → pywebexec-1.5.18}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.16'
-__version_tuple__ = version_tuple = (1, 5, 16)
+__version__ = version = '1.5.18'
+__version_tuple__ = version_tuple = (1, 5, 18)

{pywebexec-1.5.16 → pywebexec-1.5.18/pywebexec.egg-info}/PKG-INFO

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

{pywebexec-1.5.16 → pywebexec-1.5.18}/pywebexec/templates/index.html

@@ -46,12 +46,12 @@
     <div id="output" class="output"></div>
     <div id="pausedMessage" class="paused-message">Paused</div>
     <div class="slider-container">
+        <span id="commandInfo" class="command-info"></span>
         <input type="range" id="outputSlider" min="0" max="100" value="100">
         <label for="outputSlider"><span id="outputPercentage">100%</span></label>
         <button id="toggleFetch" class="pause-resume-button pause"></button>
         <button id="decreaseFontSize" class="font-size-button font-decrease"></button>
         <button id="increaseFontSize" class="font-size-button font-increase"></button>
-        <span id="commandInfo" class="command-info"></span>
     </div>
     <script src="/static/js/xterm/xterm.js"></script>
     <script src="/static/js/xterm/addon-canvas.js"></script>

{pywebexec-1.5.16 → pywebexec-1.5.18}/pywebexec/templates/popup.html

@@ -14,12 +14,12 @@
     <div id="output" class="output"></div>
     <div id="pausedMessage" class="paused-message">Paused</div>
     <div class="slider-container">
+        <span id="commandInfo" class="command-info"></span>
         <input type="range" id="outputSlider" min="0" max="100" value="100">
         <label for="outputSlider"><span id="outputPercentage">100%</span></label>
         <button id="toggleFetch" class="pause-resume-button pause"></button>
         <button id="decreaseFontSize" class="font-size-button font-decrease"></button>
         <button id="increaseFontSize" class="font-size-button font-increase"></button>
-        <span id="commandInfo" class="command-info"></span>
     </div>
     <script src="/static/js/xterm/xterm.js"></script>
     <script src="/static/js/xterm/addon-canvas.js"></script>