From 8ed5109007d4a69ae28af384f08b685f469bf343 Mon Sep 17 00:00:00 2001
From: xpamych <xpamych@yandex.ru>
Date: Mon, 6 Feb 2023 11:41:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B5=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dodo.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/dodo.py b/dodo.py
index ae3a993..944421e 100755
--- a/dodo.py
+++ b/dodo.py
@@ -4,17 +4,9 @@ import yaml
 from pathlib import Path
 
 home_dir = Path.home()
-count_maps = 1
-map_server = "TheIsland"
 dir_server = f"{home_dir}/ARK_Servers/"
-name_server = "Dodo server"
-port_server = 7777
-query_port = 27015
-password_server = ""
-max_players = 70
 mods_id = []
 listen_server = True
-cluster_server = False
 
 if not os.path.exists(dir_server):
     os.mkdir(dir_server)
@@ -22,6 +14,7 @@ if not os.path.exists(dir_server):
 
 def yaml_edit():
     count_maps = 1
+    map_server = "TheIsland"
     print("""Укажите требуется ли кластер?
     1. Да
     2. Нет""")
@@ -83,17 +76,24 @@ def yaml_edit():
 
         print("Укажите Query-порт Сервера <27015>")
         query_port = input("")
-        yaml_create(map_server, query_port, port_server, name_server, cluster_server)
-    return map_server, query_port, port_server, name_server, cluster_server
+
+        print("Укажите пароль Сервера")
+        password_server = input("")
+
+        print("Укажите максимальное количество игроков")
+        max_players = input("")
+
+        yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players)
+        return cluster_server, map_server, name_server, port_server, query_port, password_server, max_players
 
 
-def yaml_create(map_server, query_port, port_server, name_server, cluster_server):
+def yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players):
     if not os.path.exists(f"{home_dir}/.config/dodo/"):
         os.mkdir(f"{home_dir}/.config/dodo/")
     settings_dodo = [
         {
+            'Cluster' : f"{cluster_server}",
             'Map' : f"{map_server}",
-            'ServerPath' : f"{dir_server}",
             'SessionName' : f"{name_server}",
             'Port' : f"{port_server}",
             'QueryPort' : f"{query_port}",
@@ -101,7 +101,7 @@ def yaml_create(map_server, query_port, port_server, name_server, cluster_server
             'MaxPlayers' : f"{max_players}",
             'ModsId' : f"{mods_id}",
             'Listen' : f"{listen_server}",
-            'Cluster' : f"{cluster_server}"
+            'ServerPath' : f"{dir_server}"
         }
 
     ]
@@ -111,7 +111,7 @@ def yaml_create(map_server, query_port, port_server, name_server, cluster_server
 
 
 def read_yaml(map_server):
-    print("начало read" + map_server)
+    print("начало read"  "map_server")
     with open(f"{home_dir}/.config/dodo/{map_server}.yaml", "r") as yamlfile:
         data = yaml.load(yamlfile, Loader=yaml.FullLoader)
         map_server = 'data.Map'
@@ -125,8 +125,8 @@ def read_yaml(map_server):
         listen_server = 'data.Listen'
         cluster_server = 'data.Cluster'
         print(data)
-        print("конец read" + map_server)
-    return map_server, dir_server, password_server, max_players, mods_id, listen_server, query_port, port_server, name_server, cluster_server
+        print("конец read"  "map_server")
+    return cluster_server, map_server, name_server, port_server, query_port, password_server, dir_server, max_players, mods_id,
 
 
 def install():
@@ -143,6 +143,6 @@ def start():
     os.system(f"./ShooterGameServer {map_server}?SessionName={name_server}?Port={port_server}?QueryPort={query_port}?MaxPlayers={max_players}?GameModIds={mods_id}?listen={listen_server}")
 
 
-map_server, query_port, port_server, name_server, cluster_server = yaml_edit()
+cluster_server, map_server, name_server, port_server, query_port, password_server, max_players = yaml_edit()
 install()
 start()