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

поправлен enablemap

Browse Source
This commit is contained in:
sitisll 2023-05-10 12:37:32 +03:00
parent cbecbcecda
commit 6c68c659dd
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hlna.py
View File

@ -288,10 +288,7 @@ def yaml_create(cluster_server, map_s, name_server, port_server, query_port, rco
def systemd_unit_create(name_server=list_config): def systemd_unit_create(name_server=list_config):
for i in name_server: for i in name_server:
data = read_yaml(i) data = read_yaml(i)
if not data['Cluster']: ntff = "" if not data['Cluster'] else "-NoTransferFromFiltering"
ntff = ""
else:
ntff = "-NoTransferFromFiltering"
unit_file = f"{dir_unit}ARK_{data['SessionName']}.service" unit_file = f"{dir_unit}ARK_{data['SessionName']}.service"
unit_text = f'''[Unit] unit_text = f'''[Unit]
Description=ARK: Survival Evolved dedicated server - {data['map']} Description=ARK: Survival Evolved dedicated server - {data['map']}
@ -335,7 +332,6 @@ test_mod_install()
@click.option("-e/-d", default=True, help="-e активировать карты, -d деактивировать") @click.option("-e/-d", default=True, help="-e активировать карты, -d деактивировать")
def enablemap(m, e): def enablemap(m, e):
"""Включение/выключение карт""" """Включение/выключение карт"""
m = m.split(",") m = m.split(",")
if not os.path.isdir(dir_deactivated): if not os.path.isdir(dir_deactivated):
create_dir(dir_deactivated) create_dir(dir_deactivated)
@ -343,7 +339,7 @@ def enablemap(m, e):
port_s = [] port_s = []
query_p = [] query_p = []
for k in list_config: for k in list_config:
data = read_yaml(k) data = read_yaml(k, False)
port_s.append(data['Port']) port_s.append(data['Port'])
query_p.append(data['QueryPort']) query_p.append(data['QueryPort'])
for i in m: for i in m:
@ -470,10 +466,7 @@ def start(m, b, name_server=list_config):
def read_yaml(list_config, flag=True): def read_yaml(list_config, flag=True):
# Читаем конфиги активных или неактивных карт в зависимости от флага # Читаем конфиги активных или неактивных карт в зависимости от флага
if flag: dirs = f"{dir_maps}{list_config}" if flag else f"{dir_deactivated}{list_config}"
dirs = f"{dir_maps}{list_config}"
else:
dirs = f"{dir_deactivated}{list_config}"
with open(dirs, "r") as yamlfile: with open(dirs, "r") as yamlfile:
data = yaml.load(yamlfile, Loader=yaml.FullLoader) data = yaml.load(yamlfile, Loader=yaml.FullLoader)
return data[0] # возвращаем словарь со всеми значениями return data[0] # возвращаем словарь со всеми значениями