pywebexec 1.5.18__tar.gz → 1.6.0__tar.gz

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

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

{pywebexec-1.5.18 → pywebexec-1.6.0}/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;

pywebexec-1.6.0/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-1.5.18 → pywebexec-1.6.0}/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 (${runningCommands.length})`;
+            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}${data.status === 'failed' ? ` (${data.exit_code})` : ''}`;
+                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-1.5.18 → pywebexec-1.6.0}/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-1.5.18 → pywebexec-1.6.0}/pywebexec/version.py

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

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

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

{pywebexec-1.5.18 → pywebexec-1.6.0}/pywebexec.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ pywebexec/static/images/failed.svg
 pywebexec/static/images/favicon.svg
 pywebexec/static/images/font-decrease.svg
 pywebexec/static/images/font-increase.svg
+pywebexec/static/images/norun.svg
 pywebexec/static/images/pause.svg
 pywebexec/static/images/popup.svg
 pywebexec/static/images/resume.svg