pywebexec 1.5.10__tar.gz → 1.5.12__tar.gz

{pywebexec-1.5.10/pywebexec.egg-info → pywebexec-1.5.12}/PKG-INFO

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

{pywebexec-1.5.10 → pywebexec-1.5.12}/pywebexec/static/css/style.css

@@ -83,6 +83,7 @@ form {
     display: inline-block;
     width: 16px;
     height: 16px;
+    min-width: 16px;
     margin-right: 5px;
     background-size: contain;
     background-repeat: no-repeat;
@@ -95,7 +96,7 @@ form {
     vertical-align: bottom;
 }
 .status-running { 
-    background-image: url("/static/images/running.gif")
+    background-image: url("/static/images/running.svg")
 }
 .status-success { 
     background-image: url("/static/images/success.svg")
@@ -254,16 +255,18 @@ body.dimmed * {
     transform: translate(-50%, -50%);
 }
 /* allow wide chars in terminal */
+/*
 span {
     letter-spacing: 0px !important;
     margin-right: -0.17px;
     margin-left: -0.09px
 }
+*/
 .slider-container {
     display: flex;
     align-items: center;
-    gap: 10px;
-    margin-top: 10px;
+    gap: 7px;
+    margin-top: 5px;
 }
 #outputSlider {
     width: 100%;
@@ -324,10 +327,11 @@ span {
 .pause-resume-button {
     background-color: transparent;
     border: none;
-    padding: 0;
-    width: 24px;
+    /*padding: 0;*/
+    min-width: 24px;
     height: 24px;
     cursor: pointer;
+    flex-shrink: 0;
 }
 
 
@@ -345,3 +349,17 @@ span {
     pointer-events: none;
 }
 
+.command-info {
+    display: inline-block;
+    padding: 5px 10px 5px 10px;
+    background-color: #ddd;
+    max-width: 300px;
+    white-space: nowrap;
+    border-radius: 5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex-shrink: 0;
+    font-family: Consolas NF, monospace;
+    font-size: 13px;
+}
+

pywebexec-1.5.12/pywebexec/static/images/running.svg

@@ -0,0 +1 @@
+<svg fill="#2b9753" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" stroke="#2b9753" stroke-width="0.00024000000000000003"><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.10 → pywebexec-1.5.12}/pywebexec/static/js/popup.js

@@ -109,14 +109,17 @@ async function fetchOutput(url) {
             }
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
-                document.title = document.title.replace('[running]',`[${data.status}]`);
                 clearInterval(outputInterval);
+                document.title = document.title.replace('[running]',`[${data.status}]`);
                 toggleButton.style.display = 'none';
+                document.getElementById('commandStatus').classList.remove('status-running');
+                document.getElementById('commandStatus').classList.add(`status-${data.status}`);
             } else {
                 toggleButton.style.display = 'block';
                 const title = extractTitle(data.output);
                 if (title) {
                     document.title = `${title} - [running]`;
+                    document.getElementById('commandInfo').innerHTML = `<span id="commandStatus" class="status-icon status-running"></span>${title}`;
                 }
             }
         }
@@ -141,6 +144,10 @@ async function viewOutput(command_id) {
             return;
         }
         const data = await response.json();
+        const commandInfo = document.getElementById('commandInfo');
+        const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
+        commandInfo.innerHTML = `<span id="commandStatus" class="status-icon status-${data.status}"></span>${command}`;
+        commandInfo.setAttribute('title', command);
         document.title = `${data.command} ${data.params.join(' ')} - [${data.status}]`;
         if (data.command == 'term')
             terminal.options.cursorInactiveStyle = 'outline';

{pywebexec-1.5.10 → pywebexec-1.5.12}/pywebexec/static/js/script.js

@@ -196,12 +196,14 @@ async function fetchOutput(url) {
             if (data.status != 'running') {
                 clearInterval(outputInterval);
                 toggleButton.style.display = 'none';
+                document.getElementById('commandStatus').classList.remove('status-running');
+                document.getElementById('commandStatus').classList.add(`status-${data.status}`);
             } else {
                 toggleButton.style.display = 'block';
-                /*const title = extractTitle(data.output);
+                const title = extractTitle(data.output);
                 if (title) {
-                    document.title = title;
-                }*/
+                    document.getElementById('commandInfo').innerHTML = `<span id="commandStatus" class="status-icon status-running"></span>${title}`;
+                }
             }
         }
     } catch (error) {
@@ -225,6 +227,10 @@ async function viewOutput(command_id) {
             return;
         }
         const data = await response.json();
+        const commandInfo = document.getElementById('commandInfo');
+        const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
+        commandInfo.innerHTML = `<span id="commandStatus" class="status-icon status-${data.status}"></span>${command}`;
+        commandInfo.setAttribute('title', command);
         if (data.command == 'term')
             terminal.options.cursorInactiveStyle = 'outline';
         else

{pywebexec-1.5.10 → pywebexec-1.5.12}/pywebexec/templates/index.html

@@ -51,6 +51,7 @@
         <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.10 → pywebexec-1.5.12}/pywebexec/templates/popup.html

@@ -19,6 +19,7 @@
         <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.10 → pywebexec-1.5.12}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.10'
-__version_tuple__ = version_tuple = (1, 5, 10)
+__version__ = version = '1.5.12'
+__version_tuple__ = version_tuple = (1, 5, 12)

{pywebexec-1.5.10 → pywebexec-1.5.12/pywebexec.egg-info}/PKG-INFO

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

{pywebexec-1.5.10 → pywebexec-1.5.12}/pywebexec.egg-info/SOURCES.txt

@@ -27,7 +27,7 @@ pywebexec/static/images/font-increase.svg
 pywebexec/static/images/pause.svg
 pywebexec/static/images/popup.svg
 pywebexec/static/images/resume.svg
-pywebexec/static/images/running.gif
+pywebexec/static/images/running.svg
 pywebexec/static/images/success.svg
 pywebexec/static/js/commands.js
 pywebexec/static/js/popup.js