Improving code readability

Author: igroman787

mytoninstaller/node_args.py

@@ -2,8 +2,8 @@
 
 def get_validator_service():
     path = '/etc/systemd/system/validator.service'
-    with open(path, 'r') as f:
-        return f.read()
+    with open(path, 'r') as file:
+        return file.read()
 #end define
 
 
@@ -14,22 +14,19 @@ def get_node_start_command():
             return line.split('=')[1].strip()
 #end define
 
+def get_node_args(start_command: str = None):
+    if start_command is None:
+        start_command = get_node_start_command()
+    #end if
 
-def get_node_args(command: str = None):
-    if command is None:
-        command = get_node_start_command()
-    result = {}  # {key: [value1, value2]}
-    key = ''
-    for c in command.split(' ')[1:]:
-        if c.startswith('--') or c.startswith('-'):
-            if key:
-                result[key] = result.get(key, []) + ['']
-            key = c
-        elif key:
-            result[key] = result.get(key, []) + [c]
-            key = ''
-    if key:
-        result[key] = result.get(key, []) + ['']
+    result = dict() # {key: [value1, value2]}
+    node_args = start_command.split(' ')[1:]
+    key = None
+    for item in node_args:
+        if item.startswith('-'):
+            key = item
+            result[key] = list()
+        else:
+            result[key].append(item)
     return result
 #end define
-

mytoninstaller/scripts/set_node_argument.py

@@ -11,23 +11,35 @@ def set_node_arg(arg_name: str, arg_value: str = ''):
     """
     assert arg_name.startswith('-'), 'arg_name must start with "-" or "--"'
     service = get_validator_service()
-    command = get_node_start_command()
-    if command.split(' ')[0] != '/usr/bin/ton/validator-engine/validator-engine':
-        raise Exception('Invalid node start command in service file')
-    if command is None:
+    start_command = get_node_start_command()
+    if start_command is None:
         raise Exception('Cannot find node start command in service file')
-    args = get_node_args(command)
+    first_arg = start_command.split(' ')[0]
+    if first_arg != '/usr/bin/ton/validator-engine/validator-engine':
+        raise Exception('Invalid node start command in service file')
+    #end if
+    
+    node_args = get_node_args(start_command)
     if arg_value == '-d':
-        args.pop(arg_name, None)
+        node_args.pop(arg_name, None)
     else:
         if ' ' in arg_value:
-            args[arg_name] = arg_value.split()
+            node_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)
+            node_args[arg_name] = [arg_value]
+    #end if
+
+    buffer = list()
+    buffer.append(first_arg)
+    for key, value_list in node_args.items():
+        if len(value_list) == 0:
+            buffer.append(f"{key}")
+        for value in value_list:
+            buffer.append(f"{key} {value}")
+    new_start_command = ' '.join(buffer)
+    new_service = service.replace(start_command, new_start_command)
+    with open('/etc/systemd/system/validator.service', 'w') as file:
+        file.write(new_service)
     restart_node()
 #end define