pywebexec 1.1.8__tar.gz → 1.1.10__tar.gz

{pywebexec-1.1.8/pywebexec.egg-info → pywebexec-1.1.10}/PKG-INFO

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

{pywebexec-1.1.8 → pywebexec-1.1.10}/pywebexec/pywebexec.py

@@ -342,7 +342,10 @@ def read_command_status(command_id):
     if not os.path.exists(status_file_path):
         return None
     with open(status_file_path, 'r') as f:
-        status_data = json.load(f)
+        try:
+            status_data = json.load(f)
+        except json.JSONDecodeError:
+            return None
     
     # Cache the status if it is not "running"
     if status_data['status'] != 'running':
@@ -520,7 +523,7 @@ def list_commands():
                     params = shlex.join(status['params'])
                 except AttributeError:
                     params = " ".join([shlex.quote(p) if " " in p else p for p in status['params']])
-                command = status['command'] + ' ' + params
+                command = status.get('command', '-') + ' ' + params
                 commands.append({
                     'command_id': command_id,
                     'status': status['status'],

{pywebexec-1.1.8 → pywebexec-1.1.10}/pywebexec/static/css/style.css

@@ -89,10 +89,10 @@ form {
     background-image: url("/static/images/aborted.svg")
 }
 .copy_clip {
-    padding-right: 25px;
+    padding-right: 20px;
     background-repeat: no-repeat;
     background-position: right top;
-    background-size: 25px 16px;
+    background-size: 20px 12px;
     white-space: nowrap;
 }
 .copy_clip:hover {

{pywebexec-1.1.8 → pywebexec-1.1.10}/pywebexec/static/js/script.js

@@ -33,7 +33,7 @@ async function fetchCommands() {
         commandRow.onclick = () => viewOutput(command.command_id);
         commandRow.innerHTML = `
             <td class="monospace">
-                <span class="copy_clip" onclick="copyToClipboard('${command.command_id}', this)">${command.command_id.slice(0, 8)}</span>
+                <span class="copy_clip" onclick="copyToClipboard('${command.command_id}', this, event)">${command.command_id.slice(0, 8)}</span>
             </td>
             <td><span class="status-icon status-${command.status}"></span>${command.status}</td>
             <td>${formatTime(command.start_time)}</td>
@@ -41,8 +41,7 @@ async function fetchCommands() {
             <td>${command.exit_code}</td>
             <td>${command.command.replace(/^\.\//, '')}</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}')">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}')">Run</button>`}
             </td>
             <td class="monospace outcol">${command.last_output_line || ''}</td>
         `;
@@ -146,12 +145,14 @@ function formatDuration(startTime, endTime) {
     return `${hours}h ${minutes}m ${seconds}s`;
 }
 
-function copyToClipboard(text, element) {
+function copyToClipboard(text, element, event) {
+    event.stopPropagation();
+    event.stopImmediatePropagation();
     navigator.clipboard.writeText(text).then(() => {
         element.classList.add('copy_clip_ok');
         setTimeout(() => {
             element.classList.remove('copy_clip_ok');
-        }, 2000);
+        }, 1000);
     });
 }
 

{pywebexec-1.1.8 → pywebexec-1.1.10}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.8'
-__version_tuple__ = version_tuple = (1, 1, 8)
+__version__ = version = '1.1.10'
+__version_tuple__ = version_tuple = (1, 1, 10)

{pywebexec-1.1.8 → pywebexec-1.1.10/pywebexec.egg-info}/PKG-INFO

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