diff --git a/hlna.py b/hlna.py index c59ceaf..5ef5d16 100755 --- a/hlna.py +++ b/hlna.py @@ -513,7 +513,7 @@ def start_stop(action, g, m, b): if v in m: names_serverstart.append(ns) print_line(f"Карта которая запускается {ns}") - if list_config != []: + if list_config != []: #Перенести выше для проверки наличия конфигов if b == '': if m == "all": names_serverstart = dict_allmapname @@ -569,24 +569,28 @@ def rcon(m, c): print_line(f"Карты: , {m}") dict_mapname = {} dict_adminpwd = {} - for i in list_config: - data = read_yaml(i) - dict_mapname[data['RCONPort']] = data['map'] - dict_adminpwd[data['RCONPort']] = data['ServerAdminPassword'] - rcon_ports = [] - print("dictmapname", dict_mapname) - for rcon_p, name_map in dict_mapname.items(): - print("name_map=", name_map) - print("name_map=", name_map) - print_line(f"переменные name_map и m {name_map} & {m}") # обьединить с таким же блоком в start() - if name_map in m: - rcon_ports.append(rcon_p) - print_line(f"Карта которая запускается {name_map}") - 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(response) + if list_config: + rcon_ports = [] + for i in list_config: + data = read_yaml(i) + dict_mapname[data['RCONPort']] = data['map'] + dict_adminpwd[data['RCONPort']] = data['ServerAdminPassword'] + if m == all: + for rcon_p in dict_mapname: + print(rcon_p) + else: + for rcon_p, name_map in dict_mapname.items(): + print_line(f"переменные name_map и m {name_map} & {m}") # обьединить с таким же блоком в start() + if name_map in m: + rcon_ports.append(rcon_p) + print_line(f"Карта которая запускается {name_map}") + 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(response) + else: + pass def zero(x=""):