pywebexec 1.2.7__py3-none-any.whl → 1.2.8__py3-none-any.whl

pywebexec/static/css/style.css

@@ -34,6 +34,8 @@ select { /* Safari bug */
     font-size: 15px;
     border: #aaa solid 1px;
     border-radius: 5px;
+    padding: 0px 5px 5px 0px;
+    min-width: 150px;
 }
 .output {
     white-space: pre-wrap;
@@ -178,7 +180,6 @@ form {
     border: 1px solid #aaa;
     border-radius: 5px;
     padding: 0px 5px 0px 5px;
-    max-height: 300px;
     overflow-y: auto;
     z-index: 1000;
 }
@@ -188,7 +189,7 @@ form {
     cursor: pointer;
 }
 
-.command-item:hover {
+.command-item:hover, .command-item.highlighted {
     background-color: #eee;
 }
 

pywebexec/static/js/commands.js

@@ -1,43 +1,41 @@
 // commands.js
 let commandInput = document.getElementById('commandName');
 let paramsInput = document.getElementById('params');
-let commandListDiv = document.getElementById('commandList');
+let commandListSelect = document.getElementById('commandList');
 let showCommandListButton = document.getElementById('showCommandListButton');
+let isHandlingKeydown = false;
 
 function unfilterCommands() {
-    const items = commandListDiv.getElementsByClassName('command-item');
-    Array.from(items).forEach(item => {
-        item.style.display = 'block';
-    });
-    adjustCommandListWidth();
+    const options = commandListSelect.options;
+    for (let i = 0; i < options.length; i++) {
+        options[i].style.display = 'block';
+    }
+    commandListSelect.size = Math.min(20, commandListSelect.options.length);
 }
 
 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;
+    const value = commandInput.value.slice(0, commandInput.selectionStart);
+    const options = commandListSelect.options;
+    let nbVisibleItems = 0;
+    for (let i = 0; i < options.length; i++) {
+        if (options[i].text.startsWith(value)) {
+            options[i].style.display = 'block';
+            nbVisibleItems += 1;
         } else {
-            item.style.display = 'none';
+            options[i].style.display = 'none';
         }
-    });
-    commandListDiv.style.display = hasVisibleItems ? 'block' : 'none';
-    if (hasVisibleItems) {
-        commandListDiv.classList.add('show');
+    }
+    if (nbVisibleItems>1) {
+        commandListSelect.size = Math.min(20, nbVisibleItems);
     } else {
-        commandListDiv.classList.remove('show');
+        commandListSelect.style.display = 'none';
     }
-    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`;
+    commandListSelect.style.left = `${rect.left}px`;
+    commandListSelect.style.top = `${rect.bottom}px`;
 }
 
 function adjustInputWidth(input) {
@@ -45,20 +43,6 @@ function adjustInputWidth(input) {
     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', () => {
@@ -83,12 +67,12 @@ commandInput.addEventListener('input', (event) => {
         commandInput.setSelectionRange(newValue.length, newValue.length);
     }
     const value = commandInput.value;
-    const items = Array.from(commandListDiv.getElementsByClassName('command-item'));
+    const options = commandListSelect.options;
     if (value) {
-        const match = items.find(item => item.textContent.startsWith(value));
+        const match = Array.from(options).find(option => option.text.startsWith(value));
         if (match) {
-            commandInput.value = match.textContent;
-            commandInput.setSelectionRange(value.length, match.textContent.length);
+            commandInput.value = match.text;
+            commandInput.setSelectionRange(value.length, match.text.length);
         } else {
             commandInput.value = value.slice(0, -1);
         }
@@ -97,47 +81,92 @@ commandInput.addEventListener('input', (event) => {
     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';
+    if (event.key === ' ' || event.key === 'ArrowRight') {
+        event.preventDefault();
+        paramsInput.focus();
+        paramsInput.setSelectionRange(0, paramsInput.value.length);
+    } else if (event.key === 'ArrowDown') {
+        /*setCommandListPosition();*/
         unfilterCommands();
+        commandListSelect.style.display = 'block';
+        commandListSelect.focus();
+        commandListSelect.selectedIndex = 0;
+        event.preventDefault();
+    }
+});
+
+paramsInput.addEventListener('keydown', (event) => {
+    if (event.key === 'ArrowLeft' && paramsInput.selectionStart === 0) {
+        commandInput.focus();
+        commandInput.setSelectionRange(0, commandInput.value.length);
+        event.preventDefault();
+    }
+});
+
+commandListSelect.addEventListener('keydown', (event) => {
+    if (event.key === 'Enter') {
+        event.preventDefault(); // Prevent form submission
+        const selectedOption = commandListSelect.options[commandListSelect.selectedIndex];
+        commandInput.value = selectedOption.text;
+        commandListSelect.style.display = 'none';
+        adjustInputWidth(commandInput);
+        paramsInput.focus();
+        return;
     }
+    if (event.key === 'ArrowUp' && commandListSelect.selectedIndex == 0) {
+        commandInput.focus();
+        commandListSelect.style.display = 'none'
+    }
+});
+
+commandListSelect.addEventListener('click', (event) => {
+    event.preventDefault(); // Prevent form submission
+    const selectedOption = commandListSelect.options[commandListSelect.selectedIndex];
+    commandInput.value = selectedOption.text;
+    commandListSelect.style.display = 'none';
+    adjustInputWidth(commandInput);
+    paramsInput.focus();
+});
+
+
+commandInput.addEventListener('click', () => {
+    setCommandListPosition();
+    if (commandListSelect.style.display == 'none')
+        commandListSelect.style.display = 'block';
+    else
+        commandListSelect.style.display = 'none';
+    filterCommands();
 });
 
 commandInput.addEventListener('blur', (event) => {
-    if (event.relatedTarget === showCommandListButton) {
+    if (event.relatedTarget === showCommandListButton || event.relatedTarget === commandListSelect) {
         event.preventDefault();
         return;
     }
-    commandListDiv.style.display = 'none';
-    commandListDiv.classList.remove('show');
+    commandListSelect.style.display = 'none';
     adjustInputWidth(commandInput);
 });
 
-showCommandListButton.addEventListener('mousedown', (event) => {
+showCommandListButton.addEventListener('click', (event) => {
     event.preventDefault();
     setCommandListPosition();
-    commandListDiv.style.display = 'block';
+    if (commandListSelect.style.display == 'none')
+        commandListSelect.style.display = 'block';
+    else
+        commandListSelect.style.display = 'none';
     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);
+    if (!commandInput.contains(event.target) && !commandListSelect.contains(event.target) && !showCommandListButton.contains(event.target)) {
+        commandListSelect.style.display = 'none';
     }
 });
 
 window.addEventListener('keydown', (event) => {
-    if (document.activeElement !== paramsInput) {
+    if ([commandInput, paramsInput, commandListSelect].includes(document.activeElement)) return;
+    if (event.code === `Key${event.key.toUpperCase()}`) {
         commandInput.focus();
         commandInput.dispatchEvent(new KeyboardEvent('keydown', event));
     }
@@ -161,23 +190,16 @@ async function fetchExecutables() {
             throw new Error('Failed to fetch command status');
         }
         const executables = await response.json();
-        commandListDiv.innerHTML = '';
+        commandListSelect.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);
+            const option = document.createElement('option');
+            option.className = 'command-item';
+            option.text = executable;
+            commandListSelect.appendChild(option);
         });
-        // Ensure the elements are rendered before measuring their widths
-        requestAnimationFrame(adjustCommandListWidth);
     } catch (error) {
         alert("Failed to fetch executables");
     }
+    commandListSelect.size = Math.min(20, commandListSelect.options.length)
+
 }

pywebexec/static/js/script.js

@@ -56,6 +56,8 @@ document.getElementById('launchForm').addEventListener('submit', async (event) =
         await new Promise(r => setTimeout(r, 200));
         fetchCommands();
         viewOutput(data.command_id);
+        commandInput.focus()
+        commandInput.setSelectionRange(0, commandInput.value.length)
     } catch (error) {
         console.log('Error running command:', error);
     }

pywebexec/templates/index.html

@@ -19,11 +19,11 @@
             <div id="showCommandListButton" class="show-command-list-button">
                 <span class="arrow">&#9660;</span>
             </div>
+            <select id="commandList" class="command-list" size="20"></select>
             <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>

pywebexec/version.py

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

{pywebexec-1.2.7.dist-info → pywebexec-1.2.8.dist-info}/METADATA

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

{pywebexec-1.2.7.dist-info → pywebexec-1.2.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
 pywebexec/pywebexec.py,sha256=LRKJ2KgklZsHawd97mSKodBpH5gLm3oMza30hcLcekc,22735
-pywebexec/version.py,sha256=eUTJamBaZbdGP80CUfd3WS7PTAr5iMj50aNYRf1wwQ8,411
-pywebexec/static/css/style.css,sha256=n9FBJQ8CWUM8Aya-Nr_7ia45GgoYBeP8LKWgiq-PIMQ,5121
+pywebexec/version.py,sha256=s3iHFZtIHrLA43BEwwqCJ5Ch9SA-UTWHAi57WzfyPLM,411
+pywebexec/static/css/style.css,sha256=s3rpd-sbnu_T4MogbVjjT05edhmGdMtlwAMx_9n8834,5177
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
 pywebexec/static/images/aborted.svg,sha256=_mP43hU5QdRLFZIknBgjx-dIXrHgQG23-QV27ApXK2A,381
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -11,17 +11,17 @@ pywebexec/static/images/failed.svg,sha256=ADZ7IKrUyOXtqpivnz3VcH0-Wru-I5MOi3OJAk
 pywebexec/static/images/favicon.svg,sha256=ti80IfuDZwIvQcmJxkOeUaB1iMsiyOPmQmVO-h0y1IU,1126
 pywebexec/static/images/running.gif,sha256=iYuzQGkMxrakSIwt6gPieKCImGZoSAHmU5MUNZa7cpw,25696
 pywebexec/static/images/success.svg,sha256=PJDcCSTevJh7rkfSFLtc7P0pbeh8PVQBS8DaOLQemmc,489
-pywebexec/static/js/commands.js,sha256=JvAdUqxSzPlCrF_W0v6oiwy6gcDUBBxriLtKuZTX_hE,6144
-pywebexec/static/js/script.js,sha256=lHQCHOrERRZ5Q9RcpnErL1ID_gngNRCBqzvwno6G_b0,9677
+pywebexec/static/js/commands.js,sha256=XfrnyRVjfZ8eOq9XpJXNVVzuvzLHqa81Ot99DSRL_Rk,6954
+pywebexec/static/js/script.js,sha256=1ypziT5pOmHj_15MUvBf0ChjzEpAQ-ji4W9nhxoI_iM,9775
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/ansi_up.min.js,sha256=KNGV0vEr30hNqKQimTAvGVy-icD5A1JqMQTtvYtKR2Y,13203
 pywebexec/static/js/xterm/xterm-addon-fit.js,sha256=Pprm9pZe4SadVXS5Bc8b9VnC9Ex4QlWwA0pxOH53Gck,1460
 pywebexec/static/js/xterm/xterm.js,sha256=Bzka76jZwEhVt_LlS0e0qMw7ryGa1p5qfxFyeohphBo,283371
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywebexec/templates/index.html,sha256=zpErZg3Z7eO5wc9k-pLuaZqrNNu2K768-TsQJQecgnQ,2092
-pywebexec-1.2.7.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.2.7.dist-info/METADATA,sha256=GcjX8phAGL_HdTRBic46s-UGZ9g2q4lZVOJHOZGgu8I,6936
-pywebexec-1.2.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.2.7.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.2.7.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.2.7.dist-info/RECORD,,
+pywebexec/templates/index.html,sha256=M-9JUAR5vrk-19oF8CpxkWJvyWJkZIa71AI-1jpsMWE,2116
+pywebexec-1.2.8.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.2.8.dist-info/METADATA,sha256=lNTx0DEKtyTGW4huTsiNf-ZPfoer9Ieaz5uTndBglCE,6936
+pywebexec-1.2.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.2.8.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.2.8.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.2.8.dist-info/RECORD,,