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 command pathing bug

Browse Source
This commit is contained in:
amcmanu3 2023-02-23 11:57:00 -05:00
parent 1f95b22dce
commit 9d1b39d88c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1022,15 +1022,15 @@ class Controller:
) )
move_thread.start() move_thread.start()
def t_update_master_server_dir(self, server_dir, user_id): def t_update_master_server_dir(self, new_server_path, user_id):
server_dir = self.helper.wtol_path(server_dir) new_server_path = self.helper.wtol_path(new_server_path)
self.helper.websocket_helper.broadcast_page( self.helper.websocket_helper.broadcast_page(
"/panel/panel_config", "move_status", "Checking dir" "/panel/panel_config", "move_status", "Checking dir"
) )
current_master = self.helper.wtol_path( current_master = self.helper.wtol_path(
HelpersManagement.get_master_server_dir() HelpersManagement.get_master_server_dir()
) )
if current_master == server_dir: if current_master == new_server_path:
logger.info( logger.info(
"Admin tried to change server dir to current server dir. Canceling..." "Admin tried to change server dir to current server dir. Canceling..."
) )
@ -1040,7 +1040,7 @@ class Controller:
"done", "done",
) )
return return
if self.helper.is_subdir(server_dir, current_master): if self.helper.is_subdir(new_server_path, current_master):
logger.info( logger.info(
"Admin tried to change server dir to be inside a sub directory of the" "Admin tried to change server dir to be inside a sub directory of the"
" current server dir. This will result in a copy loop." " current server dir. This will result in a copy loop."
@ -1055,7 +1055,7 @@ class Controller:
self.helper.websocket_helper.broadcast_page( self.helper.websocket_helper.broadcast_page(
"/panel/panel_config", "move_status", "Checking permissions" "/panel/panel_config", "move_status", "Checking permissions"
) )
if not self.helper.ensure_dir_exists(os.path.join(server_dir, "servers")): if not self.helper.ensure_dir_exists(os.path.join(new_server_path, "servers")):
self.helper.websocket_helper.broadcast_user( self.helper.websocket_helper.broadcast_user(
user_id, user_id,
"send_start_error", "send_start_error",
@ -1067,15 +1067,15 @@ class Controller:
) )
return return
# set the cached serve dir # set the cached serve dir
self.helper.servers_dir = server_dir self.helper.servers_dir = new_server_path
# set DB server dir # set DB server dir
HelpersManagement.set_master_server_dir(server_dir) HelpersManagement.set_master_server_dir(new_server_path)
servers = self.servers.get_all_defined_servers() servers = self.servers.get_all_defined_servers()
# move the servers # move the servers
for server in servers: for server in servers:
server_path = server.get("path") server_path = server.get("path")
new_server_path = os.path.join( new_server_path = os.path.join(
server_dir, "servers", server.get("server_uuid") new_server_path, "servers", server.get("server_uuid")
) )
if os.path.isdir(server_path): if os.path.isdir(server_path):
self.helper.websocket_helper.broadcast_page( self.helper.websocket_helper.broadcast_page(
@ -1096,17 +1096,17 @@ class Controller:
# reset executable path # reset executable path
if current_master in server["executable"]: if current_master in server["executable"]:
server_obj.executable = str(server["executable"]).replace( server_obj.executable = str(server["executable"]).replace(
current_master, server_dir current_master, new_server_path
) )
# reset run command path # reset run command path
if current_master in server["execution_command"]: if current_master in server["execution_command"]:
server_obj.execution_command = str(server["execution_command"]).replace( server_obj.execution_command = str(server["execution_command"]).replace(
current_master, server_dir current_master, new_server_path
) )
# reset log path # reset log path
if current_master in server["log_path"]: if current_master in server["log_path"]:
server_obj.log_path = str(server["log_path"]).replace( server_obj.log_path = str(server["log_path"]).replace(
current_master, server_dir current_master, new_server_path
) )
server_obj.path = new_server_path server_obj.path = new_server_path
failed = False failed = False