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

pywebexec/static/css/style.css

@@ -55,7 +55,9 @@ select { /* Safari bug */
     border-radius: 10px;
     overflow-y: hidden;
 }
-.copy-icon { cursor: pointer; }
+.copy-icon {
+    cursor: pointer;
+}
 .monospace {
     font-family: Consolas NF,monospace;
     font-size: 13px;
@@ -63,7 +65,10 @@ select { /* Safari bug */
 .system-font {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
 }
-.copied { color: green; margin-left: 5px; }
+.copied {
+    color: green; 
+    margin-left: 5px;
+}
 button {
     -webkit-appearance: none;
     -webkit-border-radius: none;
@@ -101,17 +106,23 @@ form {
     background-image: url("/static/images/favicon.svg");
     vertical-align: bottom;
 }
+#thStatus {
+    cursor: pointer;
+}
+.status-norun {
+    background-image: url("/static/images/norun.svg");
+}
 .status-running { 
-    background-image: url("/static/images/running.svg")
+    background-image: url("/static/images/running.svg");
 }
 .status-success { 
-    background-image: url("/static/images/success.svg")
+    background-image: url("/static/images/success.svg");
 }
 .status-failed { 
-    background-image: url("/static/images/failed.svg")
+    background-image: url("/static/images/failed.svg");
 }
 .status-aborted { 
-    background-image: url("/static/images/aborted.svg")
+    background-image: url("/static/images/aborted.svg");
 }
 .copy_clip {
     padding-right: 20px;
@@ -370,3 +381,12 @@ span {
     font-size: 13px;
 }
 
+.nbrunning {
+    display: inline-block;
+    font-size: 13px;
+    font-weight: normal;
+    border: 1px solid #aaa;
+    border-radius: 18px;
+    min-width: 18px;
+    text-align: center;
+}

pywebexec/static/images/norun.svg

@@ -0,0 +1 @@
+<svg fill="#000000" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"><path d="m0 12c0-6.627 5.373-12 12-12s12 5.373 12 12-5.373 12-12 12c-6.624-.008-11.992-5.376-12-11.999zm2.4 0c0 5.302 4.298 9.6 9.6 9.6s9.6-4.298 9.6-9.6-4.298-9.6-9.6-9.6c-5.299.006-9.594 4.301-9.6 9.599v.001zm4 0c0-3.093 2.507-5.6 5.6-5.6s5.6 2.507 5.6 5.6-2.507 5.6-5.6 5.6c-3.093 0-5.6-2.507-5.6-5.6z"></path></g></svg>

pywebexec/static/js/script.js

@@ -9,6 +9,8 @@ const maxScrollback = 99999;
 const maxSize = 10485760; // 10MB
 let fontSize = 14;
 let isPaused = false;
+let showRunningOnly = false;
+let hiddenCommandIds = [];
 
 function initTerminal()
 {
@@ -115,7 +117,7 @@ document.getElementById('launchForm').addEventListener('submit', async (event) =
     }
 });
 
-async function fetchCommands() {
+async function fetchCommands(hide=false) {
     try {
         const response = await fetch(`/commands${urlToken}`);
         if (!response.ok) {
@@ -130,21 +132,28 @@ async function fetchCommands() {
             currentCommandId = commands[0].command_id;
             viewOutput(currentCommandId);
         }
+        runningCommands = [];
         commands.forEach(command => {
+            if (hide && showRunningOnly && command.status !== 'running') {
+                hiddenCommandIds.push(command.command_id);
+                return;
+            }
+            if (hiddenCommandIds.includes(command.command_id)) return;
             const commandRow = document.createElement('tr');
             commandRow.className = `clickable-row ${command.command_id === currentCommandId ? 'currentcommand' : ''}`;
             commandRow.onclick = () => viewOutput(command.command_id);
+            if (command.status === 'running') runningCommands.push(command.command.replace(/^\.\//, ''));
             commandRow.innerHTML = `
                 <td class="monospace">
                     ${navigator.clipboard == undefined ? `${command.command_id.slice(0, 8)}` : `<span class="copy_clip" onclick="copyToClipboard('${command.command_id}', this, event)">${command.command_id.slice(0, 8)}</span>`}
                 </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 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>`}
                 </td>
+                <td class="system-font">${command.command.replace(/^\.\//, '')}</td>
                 <td class="monospace outcol">
                     <button class="popup-button" onclick="openPopup('${command.command_id}', event)"></button>
                     ${command.last_output_line || ''}
@@ -152,6 +161,13 @@ async function fetchCommands() {
             `;
             commandsTbody.appendChild(commandRow);
         });
+        if (runningCommands.length) {
+            document.getElementById('thStatus').innerHTML=`<span class="status-icon status-running"></span>Running <span class="system-font nbrunning">${runningCommands.length}</span>`;
+            document.getElementById('thStatus').setAttribute('title', runningCommands.join("\n"));
+        } else {
+            document.getElementById('thStatus').innerHTML=`<span class="status-icon status-norun"></span>Status`;
+            document.getElementById('thStatus').setAttribute('title', "no command running");
+        }
         document.getElementById('dimmer').style.display = 'none';
     } catch (error) {
         console.log('Error fetching commands:', error);
@@ -198,9 +214,7 @@ async function fetchOutput(url) {
                 toggleButton.style.display = 'none';
                 document.getElementById('commandStatus').classList.remove('status-running');
                 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}`;
+                fetchCommands();
             } else {
                 toggleButton.style.display = 'block';
                 const title = extractTitle(data.output);
@@ -429,6 +443,12 @@ function toggleFetchOutput() {
 
 toggleButton.addEventListener('click', toggleFetchOutput);
 
+document.getElementById('thStatus').addEventListener('click', () => {
+    showRunningOnly = !showRunningOnly;
+    hiddenCommandIds = [];
+    fetchCommands(showRunningOnly);
+});
+
 window.addEventListener('resize', adjustOutputHeight);
 window.addEventListener('load', () => {
     initResizer();

pywebexec/templates/index.html

@@ -31,9 +31,9 @@
                     <th>ID</th>
                     <th>Start Time</th>
                     <th>Duration</th>
-                    <th>Command</th>
-                    <th>Status</th>
+                    <th id="thStatus"><span class="status-icon status-norun"></span>Status</th>
                     <th>Action</th>
+                    <th>Command</th>
                     <th>Output</th>
                 </tr>
             </thead>

pywebexec/version.py

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

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

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

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

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
 pywebexec/pywebexec.py,sha256=S24FSD4XywesMvM6nqJMdS8E1lF9mklN4nUlnZUp9Zs,28760
-pywebexec/version.py,sha256=DFRbCVOtNypFr9EX2HuujkRvOAgwqVoG22_WiEle6F8,413
+pywebexec/version.py,sha256=edFVVa8HpVPfLqL2y6CKtViSqJREfmXxInA-HCy-134,411
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=ALqne5pOJrAgujkl3YiFPwG85iZGKatYfZteEx1pZV8,7872
+pywebexec/static/css/style.css,sha256=_v1VCscdxUZjuFRkK4ty012oXTNysyKi2m0SiqoF0Oo,8182
 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
@@ -12,6 +12,7 @@ pywebexec/static/images/failed.svg,sha256=ADZ7IKrUyOXtqpivnz3VcH0-Wru-I5MOi3OJAk
 pywebexec/static/images/favicon.svg,sha256=9gSN5Oak1zTWhTCyutlupPBKUxcbdoVt7dvhk8xvEug,1224
 pywebexec/static/images/font-decrease.svg,sha256=89TJXQpfZ-XDJ2qC0c7cbLH-tWC-4AJQr_VOgsp06Gg,1782
 pywebexec/static/images/font-increase.svg,sha256=u-EBxUzmOhKx4UH96fb4gLZ0l6Jkew1HLhcSqz7Z1ak,1869
+pywebexec/static/images/norun.svg,sha256=_9PyQklBOfUwFak1gVrm-76tYM825urAFhj-zMBec20,555
 pywebexec/static/images/pause.svg,sha256=qKDx76yirEvSeeez50zUn0i9Twdem9XLgveekALVLy4,1387
 pywebexec/static/images/popup.svg,sha256=0Bl9A_v5cBsMPn6FnOlVWlAQKgd2zqiWQbhjcL9BDzI,559
 pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65EiuwtvK4A,607
@@ -19,7 +20,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=XOJaJwfI6pvQX5Q6B3tflOmHu1LwMWRjwpkMLCzJ_u4,16399
+pywebexec/static/js/script.js,sha256=mGY_-A1rZNjgpTU8FsVH0j6Tj7v4pHpSaREPbTttvEs,17376
 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 +31,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=_3tt0tHElhH75aMNtfqpM_AoHTXTi7Gkuf7ku12NltI,2755
+pywebexec/templates/index.html,sha256=3XAXlpluzmTxC75KLzHDI4aJvQyQrOShB_weJ27PE2U,2815
 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,,
+pywebexec-1.6.1.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.6.1.dist-info/METADATA,sha256=UiFTdeosOUAPxCTu68JhlVO5SYAA3qiudlZC3t3rVCI,7801
+pywebexec-1.6.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.6.1.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.6.1.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.6.1.dist-info/RECORD,,