pywebexec 2.1.7__py3-none-any.whl → 2.1.8__py3-none-any.whl

pywebexec/pywebexec.py

@@ -358,6 +358,8 @@ def parseargs():
     parser.add_argument("-k", "--key", type=str, help="Path to https certificate key")
     parser.add_argument("-g", "--gencert", action="store_true", help="https server self signed cert")
     parser.add_argument("-T", "--tokenurl", action="store_true", help="generate safe url to access")
+    parser.add_argument("-C", "--cols", type=int, default=tty_cols, help="terminal columns")
+    parser.add_argument("-R", "--rows", type=int, default=tty_rows, help="terminal rows")
     parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status/shareterm/term",
                         choices=["start","stop","restart","status","shareterm", "term", "run", "run-para"])
     parser.add_argument("command", nargs="*", help="command to run")    
@@ -385,7 +387,7 @@ def parseargs():
         params = args.command[1:]
         command_id = term_command_id
         print("Command:", command_id, flush=True)
-        exit_code = run_command("localhost", args.user, command, params, command_id, tty_rows, tty_cols)
+        exit_code = run_command("localhost", args.user, command, params, command_id, args.rows, args.cols)
         sys.exit(exit_code)
     elif args.action == "run-para":
         runpara = shutil.which("run-para")
@@ -400,7 +402,8 @@ def parseargs():
             sys.exit(1)
         runparams = args.command[0:commandindex]
         command = args.command[commandindex+1:]
-        result = subprocess.run([runpara, '-n', *runparams, "--", sys.argv[0], "-d", args.dir, "--", "run", *command], bufsize=0)
+        result = subprocess.run([runpara, '-n', *runparams, "--", sys.argv[0], "-d", args.dir, "-u", args.user,
+                                 "-C", str(args.cols), "-R", str(args.rows), "--", "run", *command], bufsize=0)
         sys.exit(result.returncode)
 
     (hostname, ip) = host_ip.get_host_ip(args.listen)
@@ -906,7 +909,8 @@ def run_dynamic_command(cmd):
     })
     Path(get_output_file_path(command_id)).touch()
     if batch_values:
-        params = ["-n", "-p", str(parallel), "-D", str(delay), "-P", *batch_values, '--', sys.argv[0], "-d", ".", "-u", user, "--", "run", cmd_path, *params]
+        params = ["-n", "-p", str(parallel), "-D", str(delay), "-P", *batch_values, '--', 
+                  sys.argv[0], "-d", ".", "-u", user, "-C", str(cols), "-R", str(rows), "--", "run", cmd_path, *params]
         cmd_path = shutil.which("run-para")
     thread = threading.Thread(target=run_command, args=(request.remote_addr, user, cmd_path, params, command_id, rows, cols))
     thread.start()

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.7'
-__version_tuple__ = version_tuple = (2, 1, 7)
+__version__ = version = '2.1.8'
+__version_tuple__ = version_tuple = (2, 1, 8)

{pywebexec-2.1.7.dist-info → pywebexec-2.1.8.dist-info}/METADATA

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

{pywebexec-2.1.7.dist-info → pywebexec-2.1.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=wC-E6xtMokjFz9p0FeiK0_COEw2RWbR9zMHojba9XHM,44624
+pywebexec/pywebexec.py,sha256=6xLQml4foHbjLIihLye0cQgMdyyEJQrPUY-rMsPHiSw,44956
 pywebexec/swagger.yaml,sha256=zP_Nz69vZx0iwbKTwiQgSs8rJRUTiGKRyIkWzMPANOE,6688
-pywebexec/version.py,sha256=THS-9QFidqyyR34eNGqu3fdLul8R-2jelw5ShM5U3hQ,511
+pywebexec/version.py,sha256=JNwYT7L17W6XA8Q9TFeLnVI0FvK7eOV1TLduK2unwJc,511
 pywebexec/static/css/form.css,sha256=zwNOJgmaxS0_1CZxH0ZgvwkLUr2FLAHrkvzsNvIY3NQ,4663
 pywebexec/static/css/markdown.css,sha256=3RzUnpVBdF6cQuB_NXV7hMTc0quYU8sfyuZcpsREj6A,1939
 pywebexec/static/css/style.css,sha256=ynccbEDzK07rurLm-UirUs5j_hVfXlIgaHeUIq9WvA0,9969
@@ -66,9 +66,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=KeNLBH9PN_ZuGhzwrjvRTj2oBtbINv_SbwGQpOahNWo,3820
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=9ngyldkyEdLonBjl97mbIZUlVk-jxwcHrvFzMSrveyU,1067
-pywebexec-2.1.7.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.1.7.dist-info/METADATA,sha256=aH20zVADnbGHdJxZ56dkSsImOvF-5X4whROr7GVwhV8,12776
-pywebexec-2.1.7.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-pywebexec-2.1.7.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.1.7.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.1.7.dist-info/RECORD,,
+pywebexec-2.1.8.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.1.8.dist-info/METADATA,sha256=5NKXl1UaXGMi5hc9HF2giiX809nqrKVd70yTK9g39nU,12776
+pywebexec-2.1.8.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+pywebexec-2.1.8.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.1.8.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.1.8.dist-info/RECORD,,