From 566463cd5525e5ffcecbc173b6bee556798b459d Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 14:22:33 -0500 Subject: [PATCH 1/3] Fix bug where "servers" was not appended --- app/classes/shared/main_controller.py | 18 ++++++++++-------- app/classes/web/panel_handler.py | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index 8bcf0bf5..836e5dc9 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -1023,7 +1023,9 @@ class Controller: move_thread.start() def t_update_master_server_dir(self, new_server_path, user_id): + print("in update") new_server_path = self.helper.wtol_path(new_server_path) + new_server_path = os.path.join(new_server_path, "servers") self.helper.websocket_helper.broadcast_page( "/panel/panel_config", "move_status", "Checking dir" ) @@ -1055,7 +1057,7 @@ class Controller: self.helper.websocket_helper.broadcast_page( "/panel/panel_config", "move_status", "Checking permissions" ) - if not self.helper.ensure_dir_exists(os.path.join(new_server_path, "servers")): + if not self.helper.ensure_dir_exists(new_server_path): self.helper.websocket_helper.broadcast_user( user_id, "send_start_error", @@ -1074,8 +1076,8 @@ class Controller: # move the servers for server in servers: server_path = server.get("path") - new_server_path = os.path.join( - new_server_path, "servers", server.get("server_uuid") + new_local_server_path = os.path.join( + new_server_path, server.get("server_uuid") ) if os.path.isdir(server_path): self.helper.websocket_helper.broadcast_page( @@ -1086,7 +1088,7 @@ class Controller: try: self.file_helper.move_dir( server_path, - new_server_path, + new_local_server_path, ) except FileExistsError as e: logger.error(f"Failed to move server with error: {e}") @@ -1096,19 +1098,19 @@ class Controller: # reset executable path if current_master in server["executable"]: server_obj.executable = str(server["executable"]).replace( - current_master, new_server_path + current_master, new_local_server_path ) # reset run command path if current_master in server["execution_command"]: server_obj.execution_command = str(server["execution_command"]).replace( - current_master, new_server_path + current_master, new_local_server_path ) # reset log path if current_master in server["log_path"]: server_obj.log_path = str(server["log_path"]).replace( - current_master, new_server_path + current_master, new_local_server_path ) - server_obj.path = new_server_path + server_obj.path = new_local_server_path failed = False for s in self.servers.failed_servers: if int(s["server_id"]) == int(server.get("server_id")): diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 27758bef..11fa328d 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -848,9 +848,9 @@ class PanelHandler(BaseHandler): page_data["auth-servers"] = auth_servers page_data["role-servers"] = auth_role_servers page_data["user-roles"] = user_roles - page_data[ - "servers_dir" - ] = self.controller.management.get_master_server_dir() + page_data["servers_dir"], _tail = os.path.split( + self.controller.management.get_master_server_dir() + ) page_data["users"] = self.controller.users.user_query(exec_user["user_id"]) page_data["roles"] = self.controller.users.user_role_query( -- GitLab From bd0c975009af1f9f09d088f45ca15c6866595322 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 14:30:59 -0500 Subject: [PATCH 2/3] Remove print statement --- app/classes/shared/main_controller.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index 836e5dc9..95872884 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -1023,7 +1023,6 @@ class Controller: move_thread.start() def t_update_master_server_dir(self, new_server_path, user_id): - print("in update") new_server_path = self.helper.wtol_path(new_server_path) new_server_path = os.path.join(new_server_path, "servers") self.helper.websocket_helper.broadcast_page( -- GitLab From b164bc0ab0fe10253deca351b188e7e7c6596a74 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 4 Mar 2023 15:21:21 +0000 Subject: [PATCH 3/3] Update changelog !567 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d90a11..f3cdcf9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Optimize world size calculation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/550)) - Only copy bedrock_server executable on update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/562)) - Fix bug where unloaded servers could not be deleted ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/566)) +- Fix bug where "servers" was not appended ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/567)) ### Tweaks - Cleanup authentication helpers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/545)) - Optimize file upload progress WS ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/546)) -- GitLab