From f3af712865943862ef69d0f221bc42b95c68fe2a Mon Sep 17 00:00:00 2001 From: xpamych Date: Tue, 16 May 2023 00:21:12 +0300 Subject: [PATCH] 1 --- hlna.py | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/hlna.py b/hlna.py index 2e7da3a..17b56b9 100755 --- a/hlna.py +++ b/hlna.py @@ -740,31 +740,33 @@ def choose_map(arr): @click.argument('c', nargs=1) @click.option('-m', required=True, help="Название карты для применения rcon команды") def rcon(m, c): - dict_mapname = {} - dict_adminpwd = {} - if list_config: - rcon_ports = [] - for i in list_config: - data = read_yaml(i, game="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: + try: + dict_mapname = {} + dict_adminpwd = {} + if list_config: + rcon_ports = [] + for i in list_config: + data = read_yaml(i, game="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) - print_line(f"Карта которая запускается {name_map}") - for port in rcon_ports: - print(f"Rcon выполнен для {port}") - passwd = dict_adminpwd[port] - with Client('127.0.0.1', port, passwd=str(passwd)) as client: - response = client.run(c) - print(response) - else: - pass - + else: + for rcon_p, name_map in dict_mapname.items(): + if name_map in m: + rcon_ports.append(rcon_p) + print_line(f"Карта которая запускается {name_map}") + for port in rcon_ports: + print(f"Rcon выполнен для {port}") + passwd = dict_adminpwd[port] + with Client('127.0.0.1', port, passwd=str(passwd)) as client: + response = client.run(c) + print(response) + else: + pass + except: + print_line(f"Ошибка отправки команды в {m}") def zero(x=""): """Потом пригодится"""