support multiple node args with same name

Author: yungwine

mytoninstaller/mytoninstaller.py

@@ -133,16 +133,18 @@ def Status(local, args):
 	node_args = get_node_args()
 	color_print("{cyan}===[ Node arguments ]==={endc}")
 	for key, value in node_args.items():
-		print(f"{key}: {value}")
+		for v in value:
+			print(f"{key}: {v}")
 #end define
 
 
 def set_node_argument(local, args):
 	if len(args) < 1:
-		color_print("{red}Bad args. Usage:{endc} set_node_argument <arg-name> [arg-value] [-d (to delete)]")
+		color_print("{red}Bad args. Usage:{endc} set_node_argument <arg-name> [arg-value] [-d (to delete)].\n"
+					"Examples: 'set_node_argument --archive-ttl 86400' or 'set_node_argument --archive-ttl -d' or 'set_node_argument -M' or 'set_node_argument --add-shard 0:2000000000000000 0:a000000000000000'")
 		return
 	arg_name = args[0]
-	args = [arg_name, args[1] if len(args) > 1 else ""]
+	args = [arg_name, " ".join(args[1:])]
 	script_path = pkg_resources.resource_filename('mytoninstaller.scripts', 'set_node_argument.py')
 	run_as_root(['python3', script_path] + args)
 	color_print("set_node_argument - {green}OK{endc}")

mytoninstaller/node_args.py

@@ -18,18 +18,18 @@ def get_node_start_command():
 def get_node_args(command: str = None):
     if command is None:
         command = get_node_start_command()
-    result = {}
+    result = {}  # {key: [value1, value2]}
     key = ''
     for c in command.split(' ')[1:]:
         if c.startswith('--') or c.startswith('-'):
             if key:
-                result[key] = ''
+                result[key] = result.get(key, []) + ['']
             key = c
         elif key:
-            result[key] = c
+            result[key] = result.get(key, []) + [c]
             key = ''
     if key:
-        result[key] = ''
+        result[key] = result.get(key, []) + ['']
     return result
 #end define
 

mytoninstaller/scripts/set_node_argument.py

@@ -20,8 +20,11 @@ def set_node_arg(arg_name: str, arg_value: str = ''):
     if arg_value == '-d':
         args.pop(arg_name, None)
     else:
-        args[arg_name] = arg_value
-    new_command = command.split(' ')[0] + ' ' + ' '.join([f'{k} {v}' for k, v in args.items()])
+        if ' ' in arg_value:
+            args[arg_name] = arg_value.split()
+        else:
+            args[arg_name] = [arg_value]
+    new_command = command.split(' ')[0] + ' ' + ' '.join([f'{k} {v}' for k, vs in args.items() for v in vs])
     new_service = service.replace(command, new_command)
     with open('/etc/systemd/system/validator.service', 'w') as f:
         f.write(new_service)