pywebexec 1.1.7__tar.gz → 1.1.9__tar.gz

{pywebexec-1.1.7/pywebexec.egg-info → pywebexec-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.1.7
+Version: 1.1.9
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -99,8 +99,8 @@ all commands output / statuses are available in the executables directory in sub
 * Basic Auth
 * LDAP(S)
 * Can be started as a daemon (POSIX)
-* uses gunicorn to serve http/https
-* compatible Linux/MacOS
+* Uses gunicorn to serve http/https
+* Linux/MacOS compatible
 
 ## Customize server
 ```shell
@@ -148,12 +148,14 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
+* log of server are stored in directory `~/[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 
 ## Launch command through API
 
 ```shell
-$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "param":["param1", ...]}
+$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "params":["param1", ...]}
+$ curl http://myhost:8080/command_status/<command_id>
+$ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 ```
 
 ## API reference

{pywebexec-1.1.7 → pywebexec-1.1.9}/README.md

@@ -37,8 +37,8 @@ all commands output / statuses are available in the executables directory in sub
 * Basic Auth
 * LDAP(S)
 * Can be started as a daemon (POSIX)
-* uses gunicorn to serve http/https
-* compatible Linux/MacOS
+* Uses gunicorn to serve http/https
+* Linux/MacOS compatible
 
 ## Customize server
 ```shell
@@ -86,12 +86,14 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
+* log of server are stored in directory `~/[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 
 ## Launch command through API
 
 ```shell
-$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "param":["param1", ...]}
+$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "params":["param1", ...]}
+$ curl http://myhost:8080/command_status/<command_id>
+$ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 ```
 
 ## API reference

{pywebexec-1.1.7 → pywebexec-1.1.9}/pywebexec/pywebexec.py

@@ -541,6 +541,8 @@ def get_command_output(command_id):
         with open(output_file_path, 'r') as output_file:
             output = output_file.read()
         status_data = read_command_status(command_id) or {}
+        if request.headers.get('Accept') == 'text/plain':
+            return f"{output}\nstatus: {status_data.get('status')}", 200, {'Content-Type': 'text/plain'}
         return jsonify({'output': output, 'status': status_data.get("status")})
     return jsonify({'error': 'Invalid command_id'}), 404
 

{pywebexec-1.1.7 → pywebexec-1.1.9}/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.7 → pywebexec-1.1.9}/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.7 → pywebexec-1.1.9}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.7'
-__version_tuple__ = version_tuple = (1, 1, 7)
+__version__ = version = '1.1.9'
+__version_tuple__ = version_tuple = (1, 1, 9)

{pywebexec-1.1.7 → pywebexec-1.1.9/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.1.7
+Version: 1.1.9
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -99,8 +99,8 @@ all commands output / statuses are available in the executables directory in sub
 * Basic Auth
 * LDAP(S)
 * Can be started as a daemon (POSIX)
-* uses gunicorn to serve http/https
-* compatible Linux/MacOS
+* Uses gunicorn to serve http/https
+* Linux/MacOS compatible
 
 ## Customize server
 ```shell
@@ -148,12 +148,14 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
+* log of server are stored in directory `~/[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 
 ## Launch command through API
 
 ```shell
-$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "param":["param1", ...]}
+$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "params":["param1", ...]}
+$ curl http://myhost:8080/command_status/<command_id>
+$ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 ```
 
 ## API reference