Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix server importing for bedrock that's not a zip

Browse Source
This commit is contained in:
Andrew
2022-03-01 18:31:38 -05:00
parent e1340d61ff
commit c8c1f301c0
3 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/classes/shared/main_controller.py
View File

@ -1,9 +1,9 @@
import os
import pathlib
import shutil
import time
import logging
import tempfile
from distutils import dir_util
from typing import Union
from peewee import DoesNotExist
@ -329,7 +329,10 @@ class Controller:
helper.ensure_dir_exists(new_server_dir)
helper.ensure_dir_exists(backup_path)
server_path = helper.get_os_understandable_path(server_path)
dir_util.copy_tree(server_path, new_server_dir)
try:
file_helper.copy_dir(server_path, new_server_dir, True)
except shutil.Error as ex:
logger.error(f"Server import failed with error: {ex}")
has_properties = False
for item in os.listdir(new_server_dir):
@ -418,7 +421,10 @@ class Controller:
helper.ensure_dir_exists(new_server_dir)
helper.ensure_dir_exists(backup_path)
server_path = helper.get_os_understandable_path(server_path)
dir_util.copy_tree(server_path, new_server_dir)
try:
file_helper.copy_dir(server_path, new_server_dir, True)
except shutil.Error as ex:
logger.error(f"Server import failed with error: {ex}")
has_properties = False
for item in os.listdir(new_server_dir):
@ -443,7 +449,8 @@ class Controller:
new_id = self.register_server(server_name, server_id, new_server_dir, backup_path, server_command, server_exe,
server_log_file, server_stop, port, server_type='minecraft-bedrock')
os.chmod(full_jar_path, 2775)
if os.name != "nt":
os.chmod(full_jar_path, 2775)
return new_id
def import_bedrock_zip_server(self, server_name: str, zip_path: str, server_exe: str, port: int):
@ -491,7 +498,9 @@ class Controller:
new_id = self.register_server(server_name, server_id, new_server_dir, backup_path, server_command, server_exe,
server_log_file, server_stop, port, server_type='minecraft-bedrock')
os.chmod(full_jar_path, 2775)
if os.name != "nt":
os.chmod(full_jar_path, 2775)
return new_id
#************************************************************************************************