pywebexec 1.5.17__py3-none-any.whl → 1.5.19__py3-none-any.whl

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/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/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>`}
@@ -200,7 +200,7 @@ async function fetchOutput(url) {
                 document.getElementById('commandStatus').classList.add(`status-${data.status}`);
                 const row = document.getElementsByClassName("currentcommand");
                 if (row.length > 0)
-                    row[0].cells[4].innerHTML = `<span class="status-icon status-${data.status}"></span>${data.status}${data.status === 'failed' ? ` (${data.exit_code})` : ''}`;
+                    row[0].cells[4].innerHTML = `<span class="status-icon status-${data.status}"></span>${data.status}`;
             } else {
                 toggleButton.style.display = 'block';
                 const title = extractTitle(data.output);
@@ -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/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/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>

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.17'
-__version_tuple__ = version_tuple = (1, 5, 17)
+__version__ = version = '1.5.19'
+__version_tuple__ = version_tuple = (1, 5, 19)

{pywebexec-1.5.17.dist-info → pywebexec-1.5.19.dist-info}/METADATA

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

{pywebexec-1.5.17.dist-info → pywebexec-1.5.19.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=hvI-vJUhokza4ozxPuuhWGFv3rMV0gqQNfNHW8eYXKk,29001
-pywebexec/version.py,sha256=pqPZqU0SMvSiE-_JolScA8UT2UZT9TmDka1pcSoM4sg,413
+pywebexec/pywebexec.py,sha256=S24FSD4XywesMvM6nqJMdS8E1lF9mklN4nUlnZUp9Zs,28760
+pywebexec/version.py,sha256=DFRbCVOtNypFr9EX2HuujkRvOAgwqVoG22_WiEle6F8,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=AryZifTwse0a711MRgHgWFWWWzAzO-FyA6mnVLewVnk,7704
+pywebexec/static/css/style.css,sha256=ALqne5pOJrAgujkl3YiFPwG85iZGKatYfZteEx1pZV8,7872
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
 pywebexec/static/images/aborted.svg,sha256=_mP43hU5QdRLFZIknBgjx-dIXrHgQG23-QV27ApXK2A,381
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -19,7 +19,7 @@ pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy
 pywebexec/static/images/success.svg,sha256=PJDcCSTevJh7rkfSFLtc7P0pbeh8PVQBS8DaOLQemmc,489
 pywebexec/static/js/commands.js,sha256=8JDb3Q55EJOYf2Q9Uy6qEuqAnn1oGjM0RndgQ4aOjqo,7725
 pywebexec/static/js/popup.js,sha256=TCzGoPVS_EvwzGc544SvRgLYG7XWXRF8tIQGfu3atrU,8533
-pywebexec/static/js/script.js,sha256=xs7VbmZNniLLryA84PxyV4ksTRyWccudChNeBU-XpWI,16435
+pywebexec/static/js/script.js,sha256=XOJaJwfI6pvQX5Q6B3tflOmHu1LwMWRjwpkMLCzJ_u4,16399
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/addon-canvas.js,sha256=ez6QTVvsmLVNJmdJlM-ZQ5bErwlxAQ_9DUmDIptl2TM,94607
 pywebexec/static/js/xterm/addon-canvas.js.map,sha256=ECBA4B-BqUpdFeRzlsEWLSQnudnhLP-yPQJ8_hKquMo,379537
@@ -30,11 +30,11 @@ pywebexec/static/js/xterm/addon-unicode11.js.map,sha256=paDj5KKtTIUGedQn2x7CaUTD
 pywebexec/static/js/xterm/xterm.js,sha256=H5kaw7Syg-v5bmCuI6AKUnZd06Lkb6b92p8aqwMvdJU,289441
 pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCfN0U_OI6Zw,1118392
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywebexec/templates/index.html,sha256=jY8YUABYuznk8LxWtGx5dn72GhHx1D-DrScx-KeMO6U,2755
-pywebexec/templates/popup.html,sha256=UgI42un_4N3JwyeQJfvVC1Vm9Pn23MEWKKVcs1gsInA,1362
-pywebexec-1.5.17.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.5.17.dist-info/METADATA,sha256=hAJJpBcXIT45uUr5WRQzx_BL0H45UamOcXRa5q77jb4,7802
-pywebexec-1.5.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.5.17.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.5.17.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.5.17.dist-info/RECORD,,
+pywebexec/templates/index.html,sha256=_3tt0tHElhH75aMNtfqpM_AoHTXTi7Gkuf7ku12NltI,2755
+pywebexec/templates/popup.html,sha256=6FfzMjxuAC_xwyMGPf3p5tm6iPVY0QCsqY80eotD0z8,1362
+pywebexec-1.5.19.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.5.19.dist-info/METADATA,sha256=qkCP3h_UEbQCkjUS7w8D7_KHVuJLnUBEO0HHCzc9i50,7802
+pywebexec-1.5.19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.5.19.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.5.19.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.5.19.dist-info/RECORD,,