From e8feb51bbe6e2a1b05d1de6761b6ab64d31b113d Mon Sep 17 00:00:00 2001
From: xpamych <xpamych@yandex.ru>
Date: Mon, 29 May 2023 22:21:40 +0300
Subject: [PATCH] 1

---
 hlna.py | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/hlna.py b/hlna.py
index 413418e..68e701c 100755
--- a/hlna.py
+++ b/hlna.py
@@ -796,13 +796,10 @@ def check_exist_servers(g):
 def start_stop(action, g, m):
     """Функция изменения статусов сервера"""
     if g == "ark":
-
         check_exist_servers(g)
         name_servers = choose_map(g, m)
         for i in name_servers:
             if action == "stop" or action == "restart":
-                print(action)
-                print_line(i, flag="CYAN")
                 rcon_local(i, "SaveWorld")
             data = read_yaml(i, g="ark", flag=True)
             x = os.system(f"systemctl --user {action} ark_{data['SessionName'].lower()}.service")
@@ -874,29 +871,27 @@ def rcon(m, c):
 
 
 def rcon_local(m, c):
-    print_line("вход в rcon", flag="CYAN")
     try:
+        rcon_ports = []
         dict_mapname = {}
         dict_adminpwd = {}
-        if list_config:
-            rcon_ports = []
-            for i in list_config:
-                data = read_yaml(i, g="ark")
-                dict_mapname[data['RCONPort']] = data['map']
-                dict_adminpwd[data['RCONPort']] = data['ServerAdminPassword']
-            if m == "all":
-                for rcon_p in dict_mapname:
+        for i in list_config:
+            data = read_yaml(i, g="ark")
+            dict_mapname[data['RCONPort']] = data['map']
+            dict_adminpwd[data['RCONPort']] = data['ServerAdminPassword']
+        if m == "all":
+            for rcon_p in dict_mapname:
+                rcon_ports.append(rcon_p)
+        else:
+            for rcon_p, name_map in dict_mapname.items():
+                if name_map in m:
                     rcon_ports.append(rcon_p)
-            else:
-                for rcon_p, name_map in dict_mapname.items():
-                    if name_map in m:
-                        rcon_ports.append(rcon_p)
 
-            for port in rcon_ports:
-                passwd = dict_adminpwd[port]
-                with Client('127.0.0.1', port, passwd=str(passwd)) as client:
-                    response = client.run(c)
-                print_line(f"Rcon выполнен {response} {dict_mapname[port]}", flag="GREEN")
+        for port in rcon_ports:
+            passwd = dict_adminpwd[port]
+            with Client('127.0.0.1', port, passwd=str(passwd)) as client:
+                response = client.run(c)
+            print_line(f"Rcon выполнен {response} {dict_mapname[port]}", flag="GREEN")
         else:
             pass
     except: