Fixing moved functions calls

app/classes/controllers/servers_controller.py

@@ -198,7 +198,7 @@ class ServersController(metaclass=Singleton):
             self.servers_list.append(temp_server_dict)
 
             if server["auto_start"]:
-                self.servers.set_waiting_start(server["server_id"], True)
+                self.set_waiting_start(server["server_id"], True)
 
             self.refresh_server_settings(server["server_id"])
 

app/classes/shared/main_controller.py

@@ -821,7 +821,7 @@ class Controller:
 
             # if this is the droid... im mean server we are looking for...
             if str(server["server_id"]) == str(server_id):
-                server_data = self.get_server_data(server_id)
+                server_data = self.servers.get_server_data(server_id)
                 server_name = server_data["server_name"]
 
                 logger.info(f"Deleting Server: ID {server_id} | Name: {server_name} ")

app/classes/web/ajax_handler.py

@@ -394,7 +394,7 @@ class AjaxHandler(BaseHandler):
                         server_data["server_port"],
                     )
                     new_server_id = new_server
-                    new_server = self.controller.get_server_data(new_server)
+                    new_server = self.controller.servers.get_server_data(new_server)
                     self.controller.rename_backup_dir(
                         server_id, new_server_id, new_server["server_uuid"]
                     )
@@ -412,7 +412,7 @@ class AjaxHandler(BaseHandler):
                         server_data["server_port"],
                     )
                     new_server_id = new_server
-                    new_server = self.controller.get_server_data(new_server)
+                    new_server = self.controller.servers.get_server_data(new_server)
                     self.controller.rename_backup_dir(
                         server_id, new_server_id, new_server["server_uuid"]
                     )
@@ -522,7 +522,7 @@ class AjaxHandler(BaseHandler):
                 f"{self.controller.servers.get_server_friendly_name(server_id)}"
             )
 
-            server_data = self.controller.get_server_data(server_id)
+            server_data = self.controller.servers.get_server_data(server_id)
             server_name = server_data["server_name"]
 
             self.controller.management.add_to_audit_log(
@@ -546,7 +546,7 @@ class AjaxHandler(BaseHandler):
                 f"{self.controller.servers.get_server_friendly_name(server_id)}"
             )
 
-            server_data = self.controller.get_server_data(server_id)
+            server_data = self.controller.servers.get_server_data(server_id)
             server_name = server_data["server_name"]
 
             self.controller.management.add_to_audit_log(

app/classes/web/panel_handler.py

@@ -18,11 +18,13 @@ from tzlocal import get_localzone
 from croniter import croniter
 from app.classes.controllers.roles_controller import RolesController
 
+from app.classes.models.servers import Servers
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.models.management import HelpersManagement
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.main_models import DatabaseShortcuts
+from app.classes.shared.server import Server
 from app.classes.web.base_handler import BaseHandler
 
 logger = logging.getLogger(__name__)
@@ -1318,7 +1320,7 @@ class PanelHandler(BaseHandler):
             if server_id is None:
                 return
 
-            server_obj = self.controller.servers.get_server_obj(server_id)
+            server_obj: Servers = self.controller.servers.get_server_obj(server_id)
             stale_executable = server_obj.executable
             # Compares old jar name to page data being passed.
             # If they are different we replace the executable name in the
@@ -1356,7 +1358,7 @@ class PanelHandler(BaseHandler):
             server_obj.crash_detection = crash_detection
             server_obj.logs_delete_after = logs_delete_after
             self.controller.servers.update_server(server_obj)
-            self.controller.crash_detection(server_obj)
+            self.controller.servers.crash_detection(server_obj)
 
             self.controller.servers.refresh_server_settings(server_id)
 

app/classes/web/routes/api/roles/index.py

@@ -104,7 +104,7 @@ class ApiRolesIndexHandler(BaseApiHandler):
         server_ids = (
             (
                 {server["server_id"] for server in data["servers"]}
-                & set(self.controller.get_all_server_ids())
+                & set(self.controller.servers.get_all_server_ids())
             )  # Only allow existing servers
             if "servers" in data
             else set()

app/classes/web/routes/api/servers/server/action.py

@@ -90,7 +90,7 @@ class ApiServersServerActionHandler(BaseApiHandler):
             server_data.get("server_port"),
         )
 
-        self.controller.init_all_servers()
+        self.controller.servers.init_all_servers()
 
         self.finish_json(
             200,

app/classes/web/server_handler.py

@@ -240,7 +240,7 @@ class ServerHandler(BaseHandler):
                         server_port,
                     )
 
-                    self.controller.init_all_servers()
+                    self.controller.servers.init_all_servers()
 
                     return