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