From 3b8446d0420a570a89702fa1fcdc02d89b7db6fa Mon Sep 17 00:00:00 2001
From: sitisll <sitislllll@gmail.com>
Date: Tue, 14 Feb 2023 13:23:32 +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=D1=8B=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dodo.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/dodo.py b/dodo.py
index 7788b9f..4847fa0 100755
--- a/dodo.py
+++ b/dodo.py
@@ -39,6 +39,8 @@ def check_int(number=""):
     while True:
         try:
             x = input(number)
+            if x == "":
+                return x
             x = x.replace(' ', '')
             x = x.replace(',', '')
             x = int(x)
@@ -53,14 +55,25 @@ create_dir(config_dodo)
 
 @dodo.command()
 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_maps = 1
     count_cluster = check_int("""Укажите требуется ли кластер?
     1. Да
     2. Нет
     : """)
-    
+    if count_cluster == "":
+        count_cluster = 2
     if count_cluster == 1:
         cluster_server = True
     else:
@@ -77,8 +90,11 @@ def config(map_server=list_config):
             print(i)
 
     count_maps = check_int("Укажите количество карт: \n")
+    if count_maps == "":
+        count_maps = 1
     for i in range(count_maps):
         while True:
+            "Проверка на выбор карты из списка"
             os.system("clear")
             amount_map = check_int("""Выберите карту из списка указав номер
             1. The Island
@@ -94,8 +110,10 @@ def config(map_server=list_config):
             11. Lost Island
             12. Fjordur
             : """)
-            if 0<=amount_map<=12:
+            if 0<amount_map<=12:
                 break
+        if amount_map == "":
+            amount_map=i+1
         match amount_map:
             case 1:
                 map_server.append("TheIsland")
@@ -122,11 +140,37 @@ def config(map_server=list_config):
             case 12:
                 map_server.append("Fjordur")
 
-        name_server     = input("Укажите название Сервера: \n")
-        port_server     = check_int("Укажите порт Сервера <7777>: \n")
-        query_port      = check_int("Укажите Query-порт Сервера <27015>: \n")
+        name_server = input("Укажите название Сервера: \n")
+        if name_server == "":
+            name_server = map_server[-1]
+        while True:
+            port_server = check_int("Укажите порт Сервера <7777>: \n")
+            if port_server == "":
+                if port_s == []:
+                    port_server = 7777
+                else:
+                    port_server = max(port_s) + 2
+            if port_server is port_s: # если веденный порт есть в списке портов
+                print("Этот порт уже занят")
+            else:
+                port_s.append(port_server)
+                break
+        while True:
+            query_port = check_int("Укажите Query-порт Сервера <27015>: \n")
+            if query_port == "":
+                if query_p == []:
+                    query_port = 27015
+                else:
+                    query_port = max(query_p) + 2
+            if query_port is query_p:  # если веденный порт есть в списке портов
+                print("Этот порт уже занят")
+            else:
+                port_s.append(query_p)
+                break
         password_server = input("Укажите пароль Сервера: \n")
         max_players     = check_int("Укажите максимальное количество игроков: \n")
+        if max_players == "":
+            max_players = 70
 
         yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players, cluster_id, cluster_dir_override)
 
@@ -189,7 +233,6 @@ def start(map_server=list_config):
 
 
 def read_yaml(map_server):
-    print(map_server)
     with open(f"{home_dir}/.config/dodo/{map_server}", "r") as yamlfile:
         data = yaml.load(yamlfile, Loader=yaml.FullLoader)
         data = data[0]