Plemya-x/hln-a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

фикс ошибок с автоматическим выбором портов

Browse Source
This commit is contained in:
sitisll 2023-02-17 17:48:22 +03:00
parent b5251d4984
commit eb194f5b1c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dodo.py
View File

@ -91,15 +91,6 @@ def modinstall(id, map_server=list_config):
@dodo.command(help='Для конфигурирования параметров запускаемого сервера или кластера серверов') @dodo.command(help='Для конфигурирования параметров запускаемого сервера или кластера серверов')
def config(map_server=list_config): 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_dir_override = ""
cluster_id = "" cluster_id = ""
count_cluster = check_int("""Укажите требуется ли кластер? count_cluster = check_int("""Укажите требуется ли кластер?
@ -176,12 +167,25 @@ def config(map_server=list_config):
name_server = input("Укажите название Сервера: \n") name_server = input("Укажите название Сервера: \n")
if name_server == "": if name_server == "":
name_server = map_server[-1] name_server = map_server[-1]
try:
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'])
except:
query_p = []
port_s = []
while True: while True:
port_server = check_int("Укажите порт Сервера <7777>: \n") port_server = check_int("Укажите порт Сервера <7777>: \n")
if port_server == 0: if port_server == 0:
if port_s == []: if port_s == []:
port_server = 7777 port_server = 7777
else: else:
print()
port_server = max(port_s) + 2 port_server = max(port_s) + 2
if port_server is port_s: # если веденный порт есть в списке портов if port_server is port_s: # если веденный порт есть в списке портов
print("Этот порт уже занят") print("Этот порт уже занят")
@ -202,7 +206,7 @@ def config(map_server=list_config):
break break
password_server = input("Укажите пароль Сервера: \n") password_server = input("Укажите пароль Сервера: \n")
max_players = check_int("Укажите максимальное количество игроков: \n") max_players = check_int("Укажите максимальное количество игроков: \n")
if max_players == "": if max_players == 0:
max_players = 70 max_players = 70
yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players, cluster_id, cluster_dir_override) yaml_create(cluster_server, map_server, name_server, port_server, query_port, password_server, max_players, cluster_id, cluster_dir_override)