NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-31 12:56:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Should work now :)

Browse Source
This commit is contained in:
Silversthorn 2022-06-12 17:13:39 +02:00
parent 430f9f9fcf
commit 007218111f
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/classes/controllers/servers_controller.py
View File

@ -94,7 +94,10 @@ class ServersController(metaclass=Singleton):
@staticmethod @staticmethod
def update_server(server_obj): def update_server(server_obj):
ret = HelperServers.update_server(server_obj) ret = HelperServers.update_server(server_obj)
ServersController().refresh_server_settings(server_obj.server_id) server_instance: ServerInstance = ServersController().get_server_instance_by_id(
server_obj.server_id
)
server_instance.update_server_instance()
return ret return ret
@staticmethod @staticmethod
@ -236,7 +239,7 @@ class ServersController(metaclass=Singleton):
@staticmethod @staticmethod
def get_authorized_servers(user_id): def get_authorized_servers(user_id):
server_data: t.List[t.Dict[str, t.Any]] = [] server_data: ServerInstance.List[ServerInstance.Dict[str, t.Any]] = []
user_roles = HelperUsers.user_role_query(user_id) user_roles = HelperUsers.user_role_query(user_id)
for user in user_roles: for user in user_roles:
role_servers = PermissionsServers.get_role_servers_from_role_id( role_servers = PermissionsServers.get_role_servers_from_role_id(
@ -269,14 +272,14 @@ class ServersController(metaclass=Singleton):
server_data = [] server_data = []
try: try:
for server in self.servers_list: for server in self.servers_list:
srv = ServersController().get_server_instance_by_id( srv: ServerInstance = ServersController().get_server_instance_by_id(
server.get("server_id") server.get("server_id")
) )
latest = srv.stats_helper.get_latest_server_stats() latest = srv.stats_helper.get_latest_server_stats()
server_data.append( server_data.append(
{ {
"server_data": ServersController.get_server_data_by_id( "server_data": DatabaseShortcuts.get_data_obj(
server.get("server_id") srv.server_object
), ),
"stats": latest, "stats": latest,
"user_command_permission": True, "user_command_permission": True,
@ -332,9 +335,7 @@ class ServersController(metaclass=Singleton):
user_command_permission = False user_command_permission = False
server_data.append( server_data.append(
{ {
"server_data": ServersController.get_server_data_by_id( "server_data": DatabaseShortcuts.get_data_obj(srv.server_object),
server.server_id
),
"stats": latest, "stats": latest,
"user_command_permission": user_command_permission, "user_command_permission": user_command_permission,
} }

8
app/classes/shared/server.py
View File

@ -1,4 +1,5 @@
from contextlib import redirect_stderr from contextlib import redirect_stderr
from http import server
import os import os
import re import re
import shutil import shutil
@ -139,6 +140,13 @@ class ServerInstance:
# ********************************************************************************** # **********************************************************************************
# Minecraft Server Management # Minecraft Server Management
# ********************************************************************************** # **********************************************************************************
def update_server_instance(self):
server_data: Servers = HelperServers.get_server_obj(self.server_id)
self.server_path = server_data.path
self.jar_update_url = server_data.executable_update_url
self.name = server_data.server_name
self.server_object = server_data
def reload_server_settings(self): def reload_server_settings(self):
server_data = HelperServers.get_server_data_by_id(self.server_id) server_data = HelperServers.get_server_data_by_id(self.server_id)
self.settings = server_data self.settings = server_data

4
app/classes/web/panel_handler.py
View File

@ -259,7 +259,7 @@ class PanelHandler(BaseHandler):
for server in defined_servers[:]: for server in defined_servers[:]:
if str(server.server_id) == str(server_id): if str(server.server_id) == str(server_id):
page_servers.append( page_servers.append(
ServersController.get_server_data_by_id(server.server_id) DatabaseShortcuts.get_data_obj(server.server_object)
) )
user_order.remove(server_id) user_order.remove(server_id)
defined_servers.remove(server) defined_servers.remove(server)
@ -268,7 +268,7 @@ class PanelHandler(BaseHandler):
server_ids.append(str(server.server_id)) server_ids.append(str(server.server_id))
if server not in page_servers: if server not in page_servers:
page_servers.append( page_servers.append(
ServersController.get_server_data_by_id(server.server_id) DatabaseShortcuts.get_data_obj(server.server_object)
) )
for server_id in user_order[:]: for server_id in user_order[:]: