From 8d0d068b76d4289506b971753e7e57856e609dbc Mon Sep 17 00:00:00 2001
From: sitisll <sitislllll@gmail.com>
Date: Tue, 21 Feb 2023 16:39:06 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D1=86=D0=B5=D0=BB=D0=BE=D0=BC=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=87=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hlna.py | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/hlna.py b/hlna.py
index ee60700..73800e6 100755
--- a/hlna.py
+++ b/hlna.py
@@ -128,6 +128,7 @@ def config(map_server=list_config):
                 amount_map = i + 1
             if 0<amount_map<=12:
                 break
+
         match amount_map:
             case 1:
                 map_server.append("TheIsland")
@@ -264,7 +265,7 @@ def enablemap(m,e):
         
 @hlna.command()       
 def servers(map_server=list_config):
-    if map_server==[]:
+    if map_server==[] and delist_config==[]:
         print("Сервера не установлены")
     else:
         for i in map_server:
@@ -286,17 +287,32 @@ def servers(map_server=list_config):
             Кластер id: {cluster_id}""")
             print("-" * 40)
             print("\n")
+    if delist_config!=[]:
+        x = input("Есть неактивные сервера, показать Y/n: ")
+        if x!="n":
+            for i in delist_config:
+                cluster_server, name_server, port_server, query_port, password_server, max_players, dir_server, mods_id, listen_server, cluster_id, cluster_dir_ovverride = read_yaml(i, False)
+                print(f"""
+                Сервер: {i}
+                Имя сервера: {name_server}
+                Кластер: {cluster_server}
+                Порт сервера: {port_server}
+                Query порт: {query_port}
+                Пароль: {password_server}
+                Максимальное кол-во игроков: {max_players}
+                Моды: {mods_id}
+                Кластер id: {cluster_id}""")
+                print("-" * 40)
+                print("\n")
+            
     
 
 
 @hlna.command(help='Для запуска, сконфигурированного сервера или кластера')
-@click.option('-m', default='all-E', help="Название карты для запуска или all для запуска все карт")
+@click.option('-m', default='all', help="Название карты для запуска или all для запуска все карт")
 def start(m, map_server=list_config):
     if map_server!=[]:
         if m == "all":
-            print("запускаем ВСЕ карты")
-            map_server += delist_config 
-        elif m == "all-E":
             print("Запускаем все активные карты")
         else:
             m = m.split(",")
@@ -323,8 +339,12 @@ def start(m, map_server=list_config):
             print(f"Карта {i} не установлена")
 
 
-def read_yaml(map_server):
-    with open(f"{home_dir}/.config/hlna/{map_server}", "r") as yamlfile:
+def read_yaml(map_server, flag=True):
+    if flag == True:
+        dirs=f"{home_dir}/.config/hlna/{map_server}"
+    else:
+        dirs=f"{home_dir}/.config/hlna/deactivated/{map_server}"
+    with open(dirs, "r") as yamlfile:
         data = yaml.load(yamlfile, Loader=yaml.FullLoader)
         data = data[0]
         dir_server = data['ServerPath']