pywebexec 2.3.14__py3-none-any.whl → 2.4.1__py3-none-any.whl

pywebexec/static/css/form.css

@@ -4,6 +4,27 @@
   src: url('../fonts/glyphicons-halflings-regular.eot');
   src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
+.glyphicon-plus-sign:before {
+  content: "\e081";
+}
+.glyphicon-minus-sign:before {
+  content: "\e082";
+}
+.glyphicon-search:before {
+  content: "\e003";
+}
+.glyphicon {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
 
 #schemaForm, .schema-form {
   font-size: 14px;
@@ -12,24 +33,6 @@
   div {
     scrollbar-width: thin;
   }
-  .glyphicon-plus-sign:before {
-    content: "\e081";
-  }
-  .glyphicon-minus-sign:before {
-    content: "\e082";
-  }
-
-  .glyphicon {
-    position: relative;
-    top: 1px;
-    display: inline-block;
-    font-family: 'Glyphicons Halflings';
-    font-style: normal;
-    font-weight: normal;
-    line-height: 1;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
 
   .btn {
     font-size: 14px;
@@ -71,6 +74,7 @@
     display: block;
     margin-top: 5px;
     margin-bottom: 10px;
+    max-width: 300px;
   }
   .form-control {
     font-family: Arial, Helvetica, sans-serif;
@@ -317,4 +321,5 @@
 .swagger-ui textarea {
   min-height: 130px;
   overflow-y: hidden;
-}
+}
+

pywebexec/static/css/style.css

@@ -46,6 +46,57 @@ th {
     position: sticky;
     top: 0;
     z-index: 1;
+    vertical-align: top;
+}
+.th-content {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    white-space: nowrap;
+}
+.sort-btn {
+    color: #aaa;
+    font-size: 14px;
+    user-select: none;
+    display: inline-block;
+    width: 7px;
+    text-align: center;
+    flex-shrink: 0;
+}
+.sort-btn[data-sort-order="asc"] {
+    color: #5a5;
+}
+.sort-btn[data-sort-order="desc"] {
+    color: #5a5;
+}
+.column-filter {
+    display: block;
+    width: 90%;
+    max-width: 300px;
+    margin: 5px 0px 0px 0px;
+    padding: 2px 5px;
+    text-indent: 5px;
+    border: 1px solid #666;
+    border-radius: 15px;
+    font-size: 12px;
+    background: #444;
+    color: #eee
+}
+.column-filter:focus {
+    outline: none;
+    border-color: #666;
+    background: #ddd;
+    color: #222;
+}
+.column-filter:focus::placeholder {
+    color: transparent;
+}
+.column-filter::placeholder {
+    font-family: 'Glyphicons Halflings';
+    /* content: "\e003"; */
+    font-size: 12px;
+    /* text-align: right; */
+    color: #888;
 }
 .outcol {
     width: 100%;
@@ -133,6 +184,7 @@ form {
     width: 16px;
     height: 16px;
     min-width: 16px;
+    margin-left: 5px;
     margin-right: 5px;
     background-size: contain;
     background-repeat: no-repeat;
@@ -254,7 +306,7 @@ code {
     font-size: 13px;
 }
 
-.show-command-list-button .arrow {
+.show-command-list-button .ar- {
     visibility: hidden; /* Hide arrow by default */
 }
 
@@ -469,13 +521,25 @@ body.dimmed * {
 }
 .nbrunning {
     display: inline-block;
-    font-size: 13px;
+    font-size: 10px;
     font-weight: normal;
     border: 1px solid #aaa;
     border-radius: 17px;
     min-width: 17px;
     text-align: center;
 }
+.row-count {
+    display: inline-block;
+    font-size: 11px;
+    font-weight: normal;
+    border: 1px solid #aaa;
+    border-radius: 17px;
+    /* min-width: 17px; */
+    text-align: center;
+    padding: 0px 4px;
+    margin-left: auto;
+    cursor: pointer
+}
 
 .xterm-accessibility {
     display: none;
@@ -483,4 +547,8 @@ body.dimmed * {
 .swaggerlink {
     text-decoration: none;
     font-size: 10px;
-}
+}
+
+#statusRunning > span {
+    vertical-align: text-top;
+}

pywebexec/static/js/script.js

@@ -181,14 +181,19 @@ async function fetchCommands(hide=false) {
                 </td>
             `;
             commandsTbody.appendChild(commandRow);
+            const commandsTable = document.getElementById('commandsTable');
         });
         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"));
+            const thStatus = document.getElementById('statusRunning');
+            thStatus.innerHTML = `Running  <span class="status-icon status-running"></span><span class="system-font nbrunning">${runningCommands.length}</span>`;
+            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");
+            const thStatus = document.getElementById('statusRunning');
+            thStatus.innerHTML = `Status  <span class="status-icon status-norun"></span>`;
+            thStatus.setAttribute('title', "no command running");
         }
+        // Apply filters after table update
+        applyFilters(document.getElementById('commandsTable'));
         document.getElementById('dimmer').style.display = 'none';
     } catch (error) {
         console.log('Error fetching commands:', error);
@@ -227,6 +232,10 @@ async function fetchOutput(url) {
                     if (htmlContent) {
                         document.getElementById('output').innerHTML = htmlContent;
                         document.getElementById('output').classList.add('outputhtml');
+                        const table = document.getElementById('output').querySelector('table');
+                        if (table != undefined && table != null) {
+                            initTableFilters(table);
+                        }
                     } else {
                         if (slider.value == 1000)
                             terminal.write(data.output);
@@ -321,6 +330,11 @@ async function viewOutput(command_id) {
                 if (htmlContent) {
                     document.getElementById('output').innerHTML = htmlContent;
                     document.getElementById('output').classList.add('outputhtml');
+                    const table = document.getElementById('output').querySelector('table');
+                    console.log(table);
+                    if (table != undefined && table != null) {
+                        initTableFilters(table);
+                    }
                 } else {
                     terminal.write(output);
                 }
@@ -535,7 +549,7 @@ toggleButton.addEventListener('click', toggleFetchOutput);
 toggleFitButton.addEventListener('click', toggleFit);
 setFitIcon();
 
-document.getElementById('thStatus').addEventListener('click', () => {
+document.getElementById('statusRunning').addEventListener('click', () => {
     showRunningOnly = !showRunningOnly;
     hiddenCommandIds = [];
     fetchCommands(showRunningOnly);

pywebexec/static/js/tablefilter.js

@@ -0,0 +1,201 @@
+function initTableFilters(table) {
+    const headers = table.querySelectorAll('thead th');
+    headers.forEach((header, index) => {
+        if (index !== 4 || table!==commandsTable) { // Skip Action column
+            const contentSpan = document.createElement('span');
+            contentSpan.className = 'th-content';
+            
+            // Add sort button first
+            const sortBtn = document.createElement('span');
+            sortBtn.className = 'sort-btn';
+            sortBtn.innerHTML = '⇕';
+            sortBtn.style.cursor = 'pointer';
+            sortBtn.setAttribute('data-sort-order', '');
+            sortBtn.onclick = () => toggleSort(table, index, sortBtn);
+            
+            // Move existing elements into the content span
+            while (header.firstChild) {
+                contentSpan.appendChild(header.firstChild);
+            }
+            
+            // Add sort button at the beginning
+            contentSpan.insertBefore(sortBtn, contentSpan.firstChild);
+            
+            // Add export button and row counter for last column
+            if (index === headers.length - 1) {
+                // Add row counter
+                const rowCount = document.createElement('span');
+                rowCount.className = 'row-count';
+                rowCount.classList.add('system-font');
+                rowCount.onclick = () => exportToExcel(table);
+                contentSpan.appendChild(rowCount);
+            }
+            
+            header.appendChild(contentSpan);
+            
+            // Add filter input
+            const input = document.createElement('input');
+            input.type = 'search';
+            input.className = 'column-filter';
+            input.placeholder = ''; // Unicode for magnifying glass
+            input.addEventListener('input', () => applyFilters(table));
+            header.appendChild(input);
+        }
+    });
+    // Initialize row count
+    updateRowCount(table, table.querySelectorAll('tbody tr').length);
+}
+
+function updateRowCount(table, count) {
+    const rowCount = table.querySelector('.row-count');
+    if (rowCount) {
+        rowCount.textContent = `⤓ ${count}`;
+    }
+}
+
+function toggleSort(table, colIndex, sortBtn) {
+    // Reset other sort buttons
+    table.querySelectorAll('.sort-btn').forEach(btn => {
+        if (btn !== sortBtn) {
+            btn.setAttribute('data-sort-order', '');
+            btn.innerHTML = '⇕';
+        }
+    });
+
+    // Toggle sort order
+    const currentOrder = sortBtn.getAttribute('data-sort-order');
+    let newOrder = 'asc';
+    if (currentOrder === 'asc') {
+        newOrder = 'desc';
+        sortBtn.innerHTML = '⇓';
+    } else if (currentOrder === 'desc') {
+        newOrder = '';
+        sortBtn.innerHTML = '⇕';
+    } else {
+        sortBtn.innerHTML = '⇑';
+    }
+    sortBtn.setAttribute('data-sort-order', newOrder);
+    sortBtn.setAttribute('data-col-index', colIndex); // Store column index on the button
+    applyFilters(table);
+}
+
+function applyFilters(table) {
+    const rows = Array.from(table.querySelectorAll('tbody tr'));
+    const filters = Array.from(table.querySelectorAll('.column-filter'))
+        .map(filter => ({
+            value: filter.value.toLowerCase(),
+            index: filter.parentElement.cellIndex,
+            regexp: filter.value ? (() => {
+                try { return new RegExp(filter.value, 'i'); } 
+                catch(e) { return null; }
+            })() : null
+        }));
+
+    // First apply filters
+    const filteredRows = rows.filter(row => {
+        // If no filters are active, show all rows
+        if (filters.every(f => !f.value)) {
+            row.style.display = '';
+            return true;
+        }
+        const cells = row.cells;
+        const shouldShow = !filters.some(filter => {
+            if (!filter.value) return false;
+            const cellText = cells[filter.index]?.innerText || '';
+            if (filter.regexp) return !filter.regexp.test(cellText);
+            return !cellText.toLowerCase().includes(filter.value);
+        });
+        row.style.display = shouldShow ? '' : 'none';
+        return shouldShow;
+    });
+
+    // Update row count
+    updateRowCount(table, filteredRows.length);
+
+    // Then apply sorting if active
+    const sortBtn = table.querySelector('.sort-btn[data-sort-order]:not([data-sort-order=""])');
+    if (sortBtn) {
+        const colIndex = parseInt(sortBtn.getAttribute('data-col-index'));
+        const sortOrder = sortBtn.getAttribute('data-sort-order');
+        
+        filteredRows.sort((a, b) => {
+            const aVal = a.cells[colIndex]?.innerText.trim() || '';
+            const bVal = b.cells[colIndex]?.innerText.trim() || '';
+            
+            // Check if both values are numeric
+            const aNum = !isNaN(aVal) && !isNaN(parseFloat(aVal));
+            const bNum = !isNaN(bVal) && !isNaN(parseFloat(bVal));
+            
+            if (aNum && bNum) {
+                // Numeric comparison
+                return sortOrder === 'asc' 
+                    ? parseFloat(aVal) - parseFloat(bVal)
+                    : parseFloat(bVal) - parseFloat(aVal);
+            }
+            
+            // Fallback to string comparison
+            if (aVal < bVal) return sortOrder === 'asc' ? -1 : 1;
+            if (aVal > bVal) return sortOrder === 'asc' ? 1 : -1;
+            return 0;
+        });
+
+        // Reorder visible rows
+        const tbody = table.querySelector('tbody');
+        filteredRows.forEach(row => tbody.appendChild(row));
+    }
+}
+
+function exportToExcel(table) {
+    // Create HTML content
+    const html = `
+        <html>
+            <head>
+                <meta charset="UTF-8">
+                <style>
+                    table { border-collapse: collapse; }
+                    th, td { border: 1px solid black; padding: 5px; }
+                    th { background-color: #f2f2f2; }
+                </style>
+            </head>
+            <body>
+                <table>
+                    <thead>
+                        <tr>${
+                            Array.from(table.querySelectorAll('thead th'))
+                                .filter((_, i) => i !== 4 || table !== commandsTable)
+                                .map(th => `<th>${th.querySelector('.th-content')?.textContent.replace('⇕', '').replace(/⤓.*/, '').trim() || ''}</th>`)
+                                .join('')
+                        }</tr>
+                    </thead>
+                    <tbody>${
+                        Array.from(table.querySelectorAll('tbody tr'))
+                            .filter(row => row.style.display !== 'none')
+                            .map(row => 
+                                `<tr>${
+                                    Array.from(row.cells)
+                                        .filter((_, i) => i !== 4 || table !== commandsTable)
+                                        .map(cell => `<td>${cell.textContent.trim()}</td>`)
+                                        .join('')
+                                }</tr>`
+                            ).join('')
+                    }</tbody>
+                </table>
+            </body>
+        </html>`;
+
+    // Create and trigger download
+    const blob = new Blob([html], { type: 'application/vnd.ms-excel' });
+    const url = window.URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = 'export_' + new Date().toISOString().slice(0,10) + '.xls';
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+    window.URL.revokeObjectURL(url);
+}
+
+let commandsTable = document.querySelector('#commandsTable');
+document.addEventListener('DOMContentLoaded', () => {
+    if (commandsTable) initTableFilters(commandsTable);
+});

pywebexec/templates/index.html

@@ -33,13 +33,13 @@
         <div id="paramsHelp" class="markdown"></div>
     </div>
     <div class="table-container" id="tableContainer">
-        <table>
+        <table id="commandsTable">
             <thead>
                 <tr>
                     <th>ID</th>
                     <th>Start Time</th>
                     <th>Duration</th>
-                    <th id="thStatus"><span class="status-icon status-norun"></span>Status</th>
+                    <th id="thStatus"><div id="statusRunning"></div></th>
                     <th>Action</th>
                     <th>Command</th>
                     <th>Output</th>
@@ -75,6 +75,7 @@
     <script type="text/javascript" src="/static/js/script.js"></script>
     <script type="text/javascript" src="/static/js/executables.js"></script>
     <script type="text/javascript" src="/static/js/schemaform.js"></script>
+    <script type="text/javascript" src="/static/js/tablefilter.js"></script>
 
 
 </body>

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.14'
-__version_tuple__ = version_tuple = (2, 3, 14)
+__version__ = version = '2.4.1'
+__version_tuple__ = version_tuple = (2, 4, 1)

{pywebexec-2.3.14.dist-info → pywebexec-2.4.1.dist-info}/METADATA

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

{pywebexec-2.3.14.dist-info → pywebexec-2.4.1.dist-info}/RECORD

@@ -2,10 +2,10 @@ pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=oiCMlo2o3AkkgXDarUSx8T3FWXKI0vk1-EPnx5FGBd8,1332
 pywebexec/pywebexec.py,sha256=NT4f7Xd4qMkAgjgwguqKKbUkOTCqT7ArRYlsW57Pfwg,48477
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=Aelhd_nWH-KFOx_jUKbvGukd7h0Q1WZNZKS7Tu4SHi0,513
-pywebexec/static/css/form.css,sha256=riFFi02xtUXusTTZOU3RSZykutJWMFfK65-eR5RbhY8,7252
+pywebexec/version.py,sha256=H3hbvip-BJTNbNG0ITRXctaII3Vc2949yckZEGuAGg8,511
+pywebexec/static/css/form.css,sha256=2JUhraeL46JaiNoD_MSKA2JdouHkXaamhd77DnCqG8k,7291
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
-pywebexec/static/css/style.css,sha256=pUmylXwbFIoXrdaJRVOUohlKIhOIilapH97NyIlgGV4,10343
+pywebexec/static/css/style.css,sha256=X0f9IcYLgESCFHwL8TVhDNaeIeLZERkLt4U8ugL2meM,11672
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
 pywebexec/static/css/swagger-ui.css.map,sha256=dJy-xBn_htK4BNupTMIl33ddse7BXsrCdDJWlTJodnw,258842
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -36,8 +36,9 @@ pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVa
 pywebexec/static/js/executables.js,sha256=cTgCFHr_F9bFCirtfG_uR32vOY3vNUr4Ih3Wglj5lFc,11988
 pywebexec/static/js/popup.js,sha256=IaKmk2U2hEn-Nv6krf_PPW6LaG8NcpCkJKb7lUX0qZo,11457
 pywebexec/static/js/schemaform.js,sha256=2AIjwdjSDTE2ide8UMmQt4tS-7-JKqidKdopq9mNzvo,12458
-pywebexec/static/js/script.js,sha256=TI3TSylgBxh_a6QvYWlg4CyJ6LMPxnhFl8WRtRDGD0Y,20810
+pywebexec/static/js/script.js,sha256=SpNmskHKJHza0Au7QWrb17EKqiMPbMz5CDmaLt_i3M4,21548
 pywebexec/static/js/swagger-form.js,sha256=CLcSHMhk5P4-_2MIRBoJLgEnIj_9keDDSzUugXHZjio,4565
+pywebexec/static/js/tablefilter.js,sha256=Yy4oC--5kHwbKxM9MpmLPTty_4hthHTk5xfRXYDbbqA,7772
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
 pywebexec/static/js/js-yaml/js-yaml.min.js,sha256=Rdw90D3AegZwWiwpibjH9wkBPwS9U4bjJ51ORH8H69c,39430
 pywebexec/static/js/marked/LICENSE.md,sha256=jjo_gvWaYJWPVsoI9EVkfDKkcz3HymwsRvbriYRxq5w,2942
@@ -64,12 +65,12 @@ pywebexec/static/jsonform/deps/underscore.js,sha256=SzKOQsVYGX1bmddyfPzGC6yXY_rW
 pywebexec/static/jsonform/deps/img/glyphicons-halflings.png,sha256=hpJM0AbbMLnU8UGOBs172D7vK-dooQ8n0s_ybml3zO0,13826
 pywebexec/static/jsonform/lib/jsonform.js,sha256=U-BvOgq5gCvSUo36qSAK7Y91RPKOq7vZShkIYpzwlkk,138525
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywebexec/templates/index.html,sha256=w18O2plH_yS8bqlPsu5hwFFmCj9H2hWLSV8B6ADcSwU,3900
+pywebexec/templates/index.html,sha256=29-MBjeJ5mgYdrkRB27WiY0okQLYcFFycJvdCMuwvV0,3974
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=MAPr-z96VERAecDvX37V8q2Nxph-O0fNDBul1x2w9SI,1147
-pywebexec-2.3.14.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.3.14.dist-info/METADATA,sha256=8PDed7Qx0Rfvb3OExe836rpjUEZDoGgTcqQFHhhpvWA,13016
-pywebexec-2.3.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pywebexec-2.3.14.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.3.14.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.3.14.dist-info/RECORD,,
+pywebexec-2.4.1.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.4.1.dist-info/METADATA,sha256=NDiz3mJy1lEvTjgwbofaIR0UaIxhqsxxvbJ5po0Ffdc,13015
+pywebexec-2.4.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pywebexec-2.4.1.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.4.1.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.4.1.dist-info/RECORD,,