pywebexec 1.2.5__tar.gz → 1.2.7__tar.gz

{pywebexec-1.2.5/pywebexec.egg-info → pywebexec-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.2.5
+Version: 1.2.7
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -83,7 +83,7 @@ $ pywebexec
 ```
 
 * Launch commands with params/view live output/Status using browser
-![pywebexecnew4](https://github.com/user-attachments/assets/55e9058c-d2d9-470e-b3ea-60b10dfc7fce)
+![pywebexecnew6](https://github.com/user-attachments/assets/11415e1f-9f5f-409e-a04c-51eb062a9780)
 
 all commands output / statuses are available in the executables directory in subdirectory `.web_status`
 

{pywebexec-1.2.5 → pywebexec-1.2.7}/README.md

@@ -21,7 +21,7 @@ $ pywebexec
 ```
 
 * Launch commands with params/view live output/Status using browser
-![pywebexecnew4](https://github.com/user-attachments/assets/55e9058c-d2d9-470e-b3ea-60b10dfc7fce)
+![pywebexecnew6](https://github.com/user-attachments/assets/11415e1f-9f5f-409e-a04c-51eb062a9780)
 
 all commands output / statuses are available in the executables directory in subdirectory `.web_status`
 

{pywebexec-1.2.5 → pywebexec-1.2.7}/pywebexec/pywebexec.py

@@ -533,7 +533,7 @@ def list_commands():
             status = read_command_status(command_id)
             if status:
                 try:
-                    params = shlex.join(status['params'])
+                    params = shlex.join(status.get('params', []))
                 except AttributeError:
                     params = " ".join([shlex.quote(p) if " " in p else p for p in status['params']])
                 command = status.get('command', '-') + ' ' + params
@@ -580,6 +580,7 @@ def get_command_output(command_id):
 @app.route('/executables', methods=['GET'])
 def list_executables():
     executables = [f for f in os.listdir('.') if os.path.isfile(f) and os.access(f, os.X_OK)]
+    executables.sort()  # Sort the list of executables alphabetically
     return jsonify(executables)
 
 def main():

{pywebexec-1.2.5 → pywebexec-1.2.7}/pywebexec/static/css/style.css

@@ -40,12 +40,11 @@ select { /* Safari bug */
     background: #111;
     padding: 10px;
     border: 1px solid #ccc;
-    font-family: monospace;
     border-radius: 10px;
     overflow-y: hidden;
 }
 .copy-icon { cursor: pointer; }
-.monospace { font-family: monospace; }
+.monospace { font-family: Consolas NF, monospace; }
 .copied { color: green; margin-left: 5px; }
 button {
     -webkit-appearance: none;
@@ -63,6 +62,11 @@ button {
 form {
     padding-bottom: 15px;
 }
+.form-inline {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
 .status-icon {
     display: inline-block;
     width: 16px;
@@ -104,21 +108,90 @@ form {
 .copy_clip_ok, .copy_clip_ok:hover {
     background-image: url("/static/images/copy_ok.svg");
 }
-input {
-    width: 50%;
+#params, #commandName {
     -webkit-appearance: none;
     -webkit-border-radius: none;
     appearance: none;
     border-radius: 15px;
     padding: 3px;
-    padding-right: 13px;
     border: 1px #aaa solid;
     height: 15px;
     font-size: 15px;
     outline: none;
+    background-color: white;
+    margin: 0; /* Remove margin */
+}
+
+#commandName {
+    width: auto; /* Allow dynamic width */
+    background-size: 16px 16px;
+    border-radius: 15px 0px 0px 15px;
+    border-right: 0px;
     text-indent: 5px;
+    padding-right: 0px;
+}
+#params {
+    width: auto; /* Allow dynamic width */
+    border-radius: 0px 15px 15px 0px;
+    border-left: 0px;
+}
+
+.input-group {
+    display: flex;
+    align-items: center;
+    /*width: 60%;*/
+}
+
+.show-command-list-button {
     background-color: white;
+    cursor: pointer;
+    height: 21px;
+    font-size: 15px;
+    border-top: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    border-radius: 0px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.show-command-list-button .arrow {
+    visibility: hidden; /* Hide arrow by default */
+}
+
+.show-command-list-button:hover .arrow {
+    visibility: visible; /* Show arrow on hover */
+}
+
+#commandName:focus + .show-command-list-button .arrow {
+    visibility: visible; /* Show arrow when input has focus */
+}
+
+#commandList.show + .show-command-list-button .arrow {
+    display: none; /* Hide arrow when list is shown */
+}
+
+.command-list {
+    display: none;
+    position: absolute;
+    background-color: white;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    padding: 0px 5px 0px 5px;
+    max-height: 300px;
+    overflow-y: auto;
+    z-index: 1000;
+}
+
+.command-item {
+    padding: 3px 5px 3px 5px;
+    cursor: pointer;
+}
+
+.command-item:hover {
+    background-color: #eee;
 }
+
 .currentcommand {
     background-color: #eef;
 }
@@ -173,6 +246,8 @@ body.dimmed * {
     visibility: hidden;
     height: 0px;
 }
-span { /* allow wide chars in terminal */
-    letter-spacing: unset !important;
+/* allow wide chars in terminal */
+span {
+    letter-spacing: -0.03px !important;
 }
+

pywebexec-1.2.7/pywebexec/static/images/down-arrow.svg

@@ -0,0 +1 @@
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg"><polygon points="4 3 12 3 8 10 4 3" fill="black" /></svg>

pywebexec-1.2.7/pywebexec/static/js/commands.js

@@ -0,0 +1,183 @@
+// commands.js
+let commandInput = document.getElementById('commandName');
+let paramsInput = document.getElementById('params');
+let commandListDiv = document.getElementById('commandList');
+let showCommandListButton = document.getElementById('showCommandListButton');
+
+function unfilterCommands() {
+    const items = commandListDiv.getElementsByClassName('command-item');
+    Array.from(items).forEach(item => {
+        item.style.display = 'block';
+    });
+    adjustCommandListWidth();
+}
+
+function filterCommands() {
+    const value = commandInput.value;
+    const items = commandListDiv.getElementsByClassName('command-item');
+    let hasVisibleItems = false;
+    Array.from(items).forEach(item => {
+        if (item.textContent.startsWith(value)) {
+            item.style.display = 'block';
+            hasVisibleItems = true;
+        } else {
+            item.style.display = 'none';
+        }
+    });
+    commandListDiv.style.display = hasVisibleItems ? 'block' : 'none';
+    if (hasVisibleItems) {
+        commandListDiv.classList.add('show');
+    } else {
+        commandListDiv.classList.remove('show');
+    }
+    adjustCommandListWidth(); // Adjust width after filtering commands
+}
+
+function setCommandListPosition() {
+    const rect = commandInput.getBoundingClientRect();
+    commandListDiv.style.left = `${rect.left}px`;
+    commandListDiv.style.top = `${rect.bottom}px`;
+    commandListDiv.style.minWidth = `${rect.width}px`;
+}
+
+function adjustInputWidth(input) {
+    input.style.width = 'auto';
+    input.style.width = `${input.scrollWidth}px`;
+}
+
+function adjustCommandListWidth() {
+    commandListDiv.style.width = 'auto'; // Reset width before recalculating
+    const items = Array.from(commandListDiv.getElementsByClassName('command-item'));
+    let maxWidth = 0;
+    items.forEach(item => {
+        if (item.style.display !== 'none') {
+            const itemWidth = item.scrollWidth;
+            if (itemWidth > maxWidth) {
+                maxWidth = itemWidth;
+            }
+        }
+    });
+    commandListDiv.style.width = `${maxWidth}px`;
+}
+
+paramsInput.addEventListener('input', () => adjustInputWidth(paramsInput));
+commandInput.addEventListener('input', () => {
+    adjustInputWidth(commandInput);
+    filterCommands(); // Filter commands on input
+});
+
+paramsInput.addEventListener('mouseover', () => {
+    paramsInput.focus();
+    paramsInput.setSelectionRange(0, paramsInput.value.length);
+});
+
+commandInput.addEventListener('mouseover', () => {
+    commandInput.focus();
+    commandInput.setSelectionRange(0, commandInput.value.length);
+});
+
+commandInput.addEventListener('input', (event) => {
+    if (event.inputType === 'deleteContentBackward') {
+        const newValue = commandInput.value.slice(0, -1);
+        commandInput.value = newValue;
+        commandInput.setSelectionRange(newValue.length, newValue.length);
+    }
+    const value = commandInput.value;
+    const items = Array.from(commandListDiv.getElementsByClassName('command-item'));
+    if (value) {
+        const match = items.find(item => item.textContent.startsWith(value));
+        if (match) {
+            commandInput.value = match.textContent;
+            commandInput.setSelectionRange(value.length, match.textContent.length);
+        } else {
+            commandInput.value = value.slice(0, -1);
+        }
+    }
+    filterCommands();
+    adjustInputWidth(commandInput); // Adjust width on input
+});
+
+commandInput.addEventListener('click', () => {
+    setCommandListPosition();
+    commandListDiv.style.display = 'block';
+    filterCommands();
+});
+
+commandInput.addEventListener('keydown', (event) => {
+    if (event.key === 'ArrowDown') {
+        setCommandListPosition();
+        commandListDiv.style.display = 'block';
+        unfilterCommands();
+    }
+});
+
+commandInput.addEventListener('blur', (event) => {
+    if (event.relatedTarget === showCommandListButton) {
+        event.preventDefault();
+        return;
+    }
+    commandListDiv.style.display = 'none';
+    commandListDiv.classList.remove('show');
+    adjustInputWidth(commandInput);
+});
+
+showCommandListButton.addEventListener('mousedown', (event) => {
+    event.preventDefault();
+    setCommandListPosition();
+    commandListDiv.style.display = 'block';
+    unfilterCommands();
+});
+
+window.addEventListener('click', (event) => {
+    if (!commandInput.contains(event.target) && !commandListDiv.contains(event.target) && !showCommandListButton.contains(event.target)) {
+        commandListDiv.style.display = 'none';
+        commandListDiv.classList.remove('show');
+        adjustInputWidth(commandInput);
+    }
+});
+
+window.addEventListener('keydown', (event) => {
+    if (document.activeElement !== paramsInput) {
+        commandInput.focus();
+        commandInput.dispatchEvent(new KeyboardEvent('keydown', event));
+    }
+});
+
+window.addEventListener('resize', () => {
+    setCommandListPosition();
+});
+
+window.addEventListener('load', () => {
+    fetchExecutables();
+    adjustInputWidth(paramsInput); // Adjust width on load
+    adjustInputWidth(commandInput); // Adjust width on load
+    setCommandListPosition();
+});
+
+async function fetchExecutables() {
+    try {
+        const response = await fetch('/executables');
+        if (!response.ok) {
+            throw new Error('Failed to fetch command status');
+        }
+        const executables = await response.json();
+        commandListDiv.innerHTML = '';
+        executables.forEach(executable => {
+            const div = document.createElement('div');
+            div.className = 'command-item';
+            div.textContent = executable;
+            div.addEventListener('mousedown', () => {
+                commandInput.value = executable;
+                commandListDiv.style.display = 'none';
+                commandListDiv.classList.remove('show');
+                adjustInputWidth(commandInput);
+                paramsInput.focus();
+            });
+            commandListDiv.appendChild(div);
+        });
+        // Ensure the elements are rendered before measuring their widths
+        requestAnimationFrame(adjustCommandListWidth);
+    } catch (error) {
+        alert("Failed to fetch executables");
+    }
+}

{pywebexec-1.2.5 → pywebexec-1.2.7}/pywebexec/static/js/script.js

@@ -7,7 +7,21 @@ const terminal = new Terminal({
     cursorHidden: true,
     disableStdin: true,
     convertEol: true,
-    fontFamily: 'Consolas NF, monospace, courier-new, courier'
+    fontFamily: 'Consolas NF, monospace, courier-new, courier',
+    scrollBack: 999999,
+    theme: {
+        background: '#111412',
+        black: '#111412',
+        green: '#088a5b',
+        blue: "#2760aa",
+        red: '#ba1611',
+        yellow: "#cf8700",
+        magenta: "#4c3d80",
+        cyan: "#00a7aa",
+        brightBlack: "#243C4F",
+        brightBlue: "#5584b1",
+    },
+    rescaleOverlappingGlyphs: true,
 });
 const fitAddon = new FitAddon.FitAddon();
 terminal.loadAddon(fitAddon);
@@ -73,10 +87,9 @@ async function fetchCommands() {
                 <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>${command.exit_code}</td>
-                <td><span class="status-icon status-${command.status}"></span>${command.status}</td>
+                <td><span class="status-icon status-${command.status}"></span>${command.status}${command.status === 'failed' ? ` (${command.exit_code})` : ''}</td>
                 <td>
-                    ${command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}')">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}')">Run</button>`}
+                    ${command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}', event)">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}', event)">Run</button>`}
                 </td>
                 <td class="monospace outcol">${command.last_output_line || ''}</td>
             `;
@@ -89,27 +102,6 @@ async function fetchCommands() {
     }
 }
 
-async function fetchExecutables() {
-    try {
-        const response = await fetch('/executables');
-        if (!response.ok) {
-            throw new Error('Failed to fetch command status');
-        }
-        const executables = await response.json();
-        const commandNameSelect = document.getElementById('commandName');
-        commandNameSelect.innerHTML = '';
-        executables.forEach(executable => {
-            const option = document.createElement('option');
-            option.value = executable;
-            option.textContent = executable;
-            commandNameSelect.appendChild(option);
-        });
-    } catch (error) {
-        console.log('Error fetching executables:', error);
-        alert("Failed to fetch executables");
-    }
-}
-
 async function fetchOutput(url) {
     try {
         const response = await fetch(url);
@@ -156,7 +148,9 @@ async function viewOutput(command_id) {
     }
 }
 
-async function relaunchCommand(command_id) {
+async function relaunchCommand(command_id, event) {
+    event.stopPropagation();
+    event.stopImmediatePropagation();
     try {
         const response = await fetch(`/command_status/${command_id}`);
         if (!response.ok) {
@@ -189,7 +183,9 @@ async function relaunchCommand(command_id) {
     }
 }
 
-async function stopCommand(command_id) {
+async function stopCommand(command_id, event) {
+    event.stopPropagation();
+    event.stopImmediatePropagation();
     try {
         const response = await fetch(`/stop_command/${command_id}`, {
             method: 'POST'
@@ -270,11 +266,7 @@ function initResizer() {
 }
 
 window.addEventListener('resize', adjustOutputHeight);
-window.addEventListener('load', () => {
-    adjustOutputHeight();
-    initResizer();
-});
+window.addEventListener('load', initResizer);
 
-fetchExecutables();
 fetchCommands();
-setInterval(fetchCommands, 5000);
+setInterval(fetchCommands, 5000);

{pywebexec-1.2.5 → pywebexec-1.2.7}/pywebexec/templates/index.html

@@ -12,13 +12,18 @@
         <div class="dimmer-text">Server not reachable</div>
     </div>
     <h2><span class="status-icon title-icon"></span>{{ title }}</h2>
-    <form id="launchForm">
+    <form id="launchForm" class="form-inline">
         <label for="commandName">Command</label>
-        <select id="commandName" name="commandName"></select>
-        <label for="params">Params</label>
-        <input type="text" id="params" name="params">
+        <div class="input-group">
+            <input type="text" id="commandName" name="commandName" size=5 autocomplete="off" style="width: 100px;" autofocus>
+            <div id="showCommandListButton" class="show-command-list-button">
+                <span class="arrow">&#9660;</span>
+            </div>
+            <input type="text" id="params" name="params" oninput="this.style.width = ((this.value.length + 1) * 8) + 'px';">
+        </div>
         <button type="submit">Run</button>
     </form>
+    <div id="commandList" class="command-list"></div>
     <div class="table-container" id="tableContainer">
         <table>
             <thead>
@@ -27,7 +32,6 @@
                     <th>Start Time</th>
                     <th>Duration</th>
                     <th>Command</th>
-                    <th>Exit</th>
                     <th>Status</th>
                     <th>Action</th>
                     <th>Output</th>
@@ -44,5 +48,6 @@
     <script src="/static/js/xterm/xterm.js"></script>
     <script src="/static/js/xterm/xterm-addon-fit.js"></script>
     <script type="text/javascript" src="/static/js/script.js"></script>
+    <script type="text/javascript" src="/static/js/commands.js"></script>
 </body>
 </html>

{pywebexec-1.2.5 → pywebexec-1.2.7}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.2.5'
-__version_tuple__ = version_tuple = (1, 2, 5)
+__version__ = version = '1.2.7'
+__version_tuple__ = version_tuple = (1, 2, 7)

{pywebexec-1.2.5 → pywebexec-1.2.7/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.2.5
+Version: 1.2.7
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -83,7 +83,7 @@ $ pywebexec
 ```
 
 * Launch commands with params/view live output/Status using browser
-![pywebexecnew4](https://github.com/user-attachments/assets/55e9058c-d2d9-470e-b3ea-60b10dfc7fce)
+![pywebexecnew6](https://github.com/user-attachments/assets/11415e1f-9f5f-409e-a04c-51eb062a9780)
 
 all commands output / statuses are available in the executables directory in subdirectory `.web_status`
 

{pywebexec-1.2.5 → pywebexec-1.2.7}/pywebexec.egg-info/SOURCES.txt

@@ -18,10 +18,12 @@ pywebexec/static/css/xterm.css
 pywebexec/static/images/aborted.svg
 pywebexec/static/images/copy.svg
 pywebexec/static/images/copy_ok.svg
+pywebexec/static/images/down-arrow.svg
 pywebexec/static/images/failed.svg
 pywebexec/static/images/favicon.svg
 pywebexec/static/images/running.gif
 pywebexec/static/images/success.svg
+pywebexec/static/js/commands.js
 pywebexec/static/js/script.js
 pywebexec/static/js/xterm/LICENSE
 pywebexec/static/js/xterm/ansi_up.min.js