From f6a82c466df4e843e3d51c1c7c19158c85f24b0c Mon Sep 17 00:00:00 2001 From: "Sitislllll@gmail.com" Date: Fri, 10 Feb 2023 09:50:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20cluster=5Fid,=20=D0=BD=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC=20=D1=8D=D1=82=D0=B0=D0=BF=D0=B5?= =?UTF-8?q?=20=D1=83=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=B2=20=D0=BF=D1=80=D0=BE=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dodo.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dodo.py b/dodo.py index 8c3f2d3..7772b1f 100755 --- a/dodo.py +++ b/dodo.py @@ -43,17 +43,22 @@ create_dir(dir_server) create_dir(config_dodo) -def yaml_edit(map_server): +def yaml_edit(map_server=map_server): + claster_id = None count_maps = 1 count_cluster = check_int("""Укажите требуется ли кластер? 1. Да 2. Нет : """) + if count_cluster == 1: cluster_server = True else: cluster_server = False - + if cluster_server == True: + claster_id = input("Укажите id для кластера, любое сочитание символов: \n") + if map_server != []: + print("Уже установленные карты: ", map_server) count_maps = check_int("Укажите количество карт: \n") for i in range(int(count_maps)): amount_map = check_int("""Выберите карту из списка указав номер @@ -102,20 +107,17 @@ def yaml_edit(map_server): password_server = input("Укажите пароль Сервера: \n") max_players = check_int("Укажите максимальное количество игроков: \n") - yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players) + yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players, claster_id) "--------------Запись в файл map_server------------------------" with open(f"{config_dodo}/map_server", "w") as file: #создаем или открываем файл с картами for line in map_server: # пробегаемся по массиву с картами file.write(line + '\n') # и записываем по строчно "--------------------------------------------------------------" - return cluster_server, map_server, name_server, port_server, query_port, password_server, max_players, count_maps - -def yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players): +def yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players, claster_id): settings_dodo = [ { 'Cluster' : cluster_server, - 'Map' : map_server, 'SessionName' : name_server, 'Port' : port_server, 'QueryPort' : query_port, @@ -126,12 +128,16 @@ def yaml_create(cluster_server, map_server, name_server, port_server, query_port 'ServerPath' : dir_server } ] + + print(claster_id) + if claster_id != None: + settings_dodo[0]['clasterid'] = claster_id with open(config_dodo + f"{map_server[-1]}.yaml", 'w') as yamlfile: data = yaml.dump(settings_dodo, yamlfile) print("Конфиг создан") -def install(map_server): +def install(map_server=map_server): for i in map_server: cluster_server, name_server, port_server, query_port, password_server, max_players, dir_server, mods_id, listen_server = read_yaml(i) create_dir(dir_server + i)