From 6e7714f97bd25260c3535a9abe9306f03d558b17 Mon Sep 17 00:00:00 2001
From: xpamych <xpamych@yandex.ru>
Date: Wed, 17 May 2023 19:48:57 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B1=D0=B8=D0=BB=20=D1=84?=
 =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20config=5Fark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hlna.py | 98 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 63 insertions(+), 35 deletions(-)

diff --git a/hlna.py b/hlna.py
index cf28f4c..62eea88 100755
--- a/hlna.py
+++ b/hlna.py
@@ -310,6 +310,56 @@ def config_nameserver(map_s):
                 break
     return list_config
 
+
+def config_ports(port_s):
+    port = check_int("Укажите порт сервера: ")
+    port_server = ports(port, port_s, True)
+    return port_server
+
+
+def config_query(query_p):
+    port = check_int("Укажите query порт сервера: ")
+    query_port = ports(port, query_p, False)
+    return query_port
+
+
+def config_rcon(rcon_p):
+    port = check_int("Укажите порт сервера: ")
+    rcon_port = ports(port, rcon_p, True)
+    return rcon_port
+
+
+def config_password():
+    password_server = input("Укажите пароль Сервера: \n")
+    return password_server
+
+def config_adminpassword():
+    adminpassword_server = input("Укажите пароль Сервера: \n")
+    return adminpassword_server
+
+
+def config_players():
+    max_players = check_int("Укажите максимальное количество игроков: \n")
+    if max_players == 0:
+        max_players = 70
+    return max_players
+
+
+def config_listen():
+    print("Передавать сервер в глобальный список серверов steam?")
+    listen_server_amount = check_int("""\n
+1. Да
+2. Нет
+:""")
+    if listen_server_amount == 1:
+        listen_server = True
+    elif listen_server_amount == 2:
+        listen_server = False
+    else:
+        listen_server = True
+    return listen_server
+
+
 def config_ark(list_config=list_config):
     """конфигурирование сервера арк"""
     create_dir(dir_server_ark)
@@ -325,46 +375,24 @@ def config_ark(list_config=list_config):
     count_maps = config_nummap()
     print_line(count_maps)
     for i in range(count_maps):
-
         map_s, port_s, query_p, rcon_p = config_maps(i)
         print_line(map_s, port_s, query_p, rcon_p)
         list_config = config_nameserver(map_s)
-
-
-        port = check_int("Укажите порт сервера: ")
-        port_server = ports(port, port_s, True)
-
-        port = check_int("Укажите query порт сервера: ")
-        query_port = ports(port, query_p, False)
-
-        port = check_int("Укажите порт сервера: ")
-        rcon_port = ports(port, rcon_p, True)
+        port_server = config_ports(port_s)
+        query_port = config_query(query_p)
+        rcon_port = config_rcon(rcon_p)
         rcon_enabled = True
+        password_server = config_password()
+        adminpassword_server = config_adminpassword()
+        max_players = config_players()
+        listen_server = config_listen()
 
-        password_server = input("Укажите пароль Сервера: \n")
-        adminpassword_server = 123
-        max_players = check_int("Укажите максимальное количество игроков: \n")
-        if max_players == 0:
-            max_players = 70
-
-        print("Передавать сервер в глобальный список серверов steam?")
-        listen_server_amount = check_int("""\n
-1. Да
-2. Нет
-:""")
-        if listen_server_amount == 1:
-            listen_server = True
-        elif listen_server_amount == 2:
-            listen_server = False
-        else:
-            listen_server = True
-
-            print_line(cluster_server, map_s, list_config[-1], port_server, query_port,
-                       rcon_enabled, rcon_port, adminpassword_server, password_server, max_players,
-                       cluster_id, cluster_dir_override, listen_server)
-            yaml_create("ARK", "", cluster_server, map_s, list_config[-1], port_server, query_port,
-                        rcon_enabled, rcon_port, adminpassword_server, password_server, max_players,
-                        cluster_id, cluster_dir_override, listen_server)
+        print_line(cluster_server, map_s, list_config[-1], port_server, query_port,
+                   rcon_enabled, rcon_port, adminpassword_server, password_server, max_players,
+                   cluster_id, cluster_dir_override, listen_server)
+        yaml_create("ARK", "", cluster_server, map_s, list_config[-1], port_server, query_port,
+                    rcon_enabled, rcon_port, adminpassword_server, password_server, max_players,
+                    cluster_id, cluster_dir_override, listen_server)
 
 
 def config_7daystodie():