pywebexec 2.1.9__tar.gz → 2.1.10__tar.gz

{pywebexec-2.1.9/pywebexec.egg-info → pywebexec-2.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 2.1.9
+Version: 2.1.10
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -263,7 +263,7 @@ $ curl -X POST http://<srv>/commands/<cmd> -H "Content-Type: application/json" -
 The schema options are used to customize the command line arguments generation, just add a `schema_options` section to the schema.
 ```yaml
 schema_options:
-  separator: "=" # --param=value (default is " ") 
+  separator_params: {"*": " ", "param2": "="}}"=" # --param2=value (default is " ") 
   noprefix_params: ["param1", "param2"] # omit --param prefix, use "*" to omit all
   convert_params: {"param1": "param2"} # convert param1 to param2
 ```

{pywebexec-2.1.9 → pywebexec-2.1.10}/README.md

@@ -198,7 +198,7 @@ $ curl -X POST http://<srv>/commands/<cmd> -H "Content-Type: application/json" -
 The schema options are used to customize the command line arguments generation, just add a `schema_options` section to the schema.
 ```yaml
 schema_options:
-  separator: "=" # --param=value (default is " ") 
+  separator_params: {"*": " ", "param2": "="}}"=" # --param2=value (default is " ") 
   noprefix_params: ["param1", "param2"] # omit --param prefix, use "*" to omit all
   convert_params: {"param1": "param2"} # convert param1 to param2
 ```

{pywebexec-2.1.9 → pywebexec-2.1.10}/pywebexec/pywebexec.py

@@ -834,7 +834,7 @@ def run_dynamic_command(cmd):
         #   noprefix_params: ["param1", "param2"] or ["*"] to omit --param prefix
         #   convert_params: {"param1": "param2"} to convert param1 to param2
         exe = get_executable(cmd)
-        separator = exe.get("schema", {}).get("schema_options", {}).get("separator", " ")
+        separator_params = exe.get("schema", {}).get("schema_options", {}).get("separator_params", {})
         noprefix = exe.get("schema", {}).get("schema_options", {}).get("noprefix_params", {})
         convert_params = exe.get("schema", {}).get("schema_options", {}).get("convert_params", {})
         schema_params = exe.get("schema", {}).get("properties", {})
@@ -851,6 +851,11 @@ def run_dynamic_command(cmd):
                 if value is None:
                     continue
                 prefix = ""
+                separator = " "
+                if '*' in separator_params:
+                    separator = separator_params['*']
+                if param in separator_params:
+                    separator = separator_params[param]
                 if param in convert_params:
                     param = convert_params[param]
                     prefix = param

{pywebexec-2.1.9 → pywebexec-2.1.10}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.9'
-__version_tuple__ = version_tuple = (2, 1, 9)
+__version__ = version = '2.1.10'
+__version_tuple__ = version_tuple = (2, 1, 10)

{pywebexec-2.1.9 → pywebexec-2.1.10/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 2.1.9
+Version: 2.1.10
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -263,7 +263,7 @@ $ curl -X POST http://<srv>/commands/<cmd> -H "Content-Type: application/json" -
 The schema options are used to customize the command line arguments generation, just add a `schema_options` section to the schema.
 ```yaml
 schema_options:
-  separator: "=" # --param=value (default is " ") 
+  separator_params: {"*": " ", "param2": "="}}"=" # --param2=value (default is " ") 
   noprefix_params: ["param1", "param2"] # omit --param prefix, use "*" to omit all
   convert_params: {"param1": "param2"} # convert param1 to param2
 ```