diff --git a/dodo.py b/dodo.py index cb4b9ec..f415c79 100755 --- a/dodo.py +++ b/dodo.py @@ -91,15 +91,6 @@ def modinstall(id, map_server=list_config): @dodo.command(help='Для конфигурирования параметров запускаемого сервера или кластера серверов') def config(map_server=list_config): - query_p = [] - port_s = [] - for i in map_server: - with open(f"{home_dir}/.config/dodo/{i}", "r") as yamlfile: - data = yaml.load(yamlfile, Loader=yaml.FullLoader) - data = data[0] - port_s.append(data['Port']) - query_p.append(data['QueryPort']) - cluster_dir_override = "" cluster_id = "" count_cluster = check_int("""Укажите требуется ли кластер? @@ -176,12 +167,25 @@ def config(map_server=list_config): name_server = input("Укажите название Сервера: \n") if name_server == "": name_server = map_server[-1] + try: + query_p = [] + port_s = [] + for i in map_server: + with open(f"{home_dir}/.config/dodo/{i}", "r") as yamlfile: + data = yaml.load(yamlfile, Loader=yaml.FullLoader) + data = data[0] + port_s.append(data['Port']) + query_p.append(data['QueryPort']) + except: + query_p = [] + port_s = [] while True: port_server = check_int("Укажите порт Сервера <7777>: \n") if port_server == 0: if port_s == []: port_server = 7777 else: + print() port_server = max(port_s) + 2 if port_server is port_s: # если веденный порт есть в списке портов print("Этот порт уже занят") @@ -202,7 +206,7 @@ def config(map_server=list_config): break password_server = input("Укажите пароль Сервера: \n") max_players = check_int("Укажите максимальное количество игроков: \n") - if max_players == "": + if max_players == 0: max_players = 70 yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players, cluster_id, cluster_dir_override)