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

Renaming Server in shared to ServerInstance

Browse Source
This commit is contained in:
Silversthorn 2022-05-30 22:40:34 +02:00
parent f89f94c44a
commit 150e8e5794
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/classes/controllers/server_perms_controller.py
View File

@ -8,7 +8,6 @@ from app.classes.models.server_permissions import (
from app.classes.models.users import HelperUsers, ApiKeys from app.classes.models.users import HelperUsers, ApiKeys
from app.classes.models.roles import HelperRoles from app.classes.models.roles import HelperRoles
from app.classes.models.servers import HelperServers from app.classes.models.servers import HelperServers
from app.classes.shared.server import Server
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

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

@ -7,7 +7,7 @@ import typing as t
from app.classes.controllers.roles_controller import RolesController from app.classes.controllers.roles_controller import RolesController
from app.classes.shared.singleton import Singleton from app.classes.shared.singleton import Singleton
from app.classes.shared.server import Server from app.classes.shared.server import ServerInstance
from app.classes.shared.console import Console from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers from app.classes.shared.helpers import Helpers
from app.classes.shared.main_models import DatabaseShortcuts from app.classes.shared.main_models import DatabaseShortcuts
@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
class ServersController(metaclass=Singleton): class ServersController(metaclass=Singleton):
servers_list: Server servers_list: ServerInstance
def __init__(self, helper, servers_helper, management_helper): def __init__(self, helper, servers_helper, management_helper):
self.helper: Helpers = helper self.helper: Helpers = helper
@ -97,17 +97,17 @@ class ServersController(metaclass=Singleton):
@staticmethod @staticmethod
def set_download(server_id): def set_download(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.set_download() return srv.stats_helper.set_download()
@staticmethod @staticmethod
def finish_download(server_id): def finish_download(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.finish_download() return srv.stats_helper.finish_download()
@staticmethod @staticmethod
def get_download_status(server_id): def get_download_status(server_id):
server: Server = ServersController().get_server_instance_by_id(server_id) server = ServersController().get_server_instance_by_id(server_id)
return server.stats_helper.get_download_status() return server.stats_helper.get_download_status()
def remove_server(self, server_id): def remove_server(self, server_id):
@ -128,7 +128,7 @@ class ServersController(metaclass=Singleton):
# Servers Methods # Servers Methods
# ********************************************************************************** # **********************************************************************************
def get_server_instance_by_id(self, server_id: t.Union[str, int]) -> Server: def get_server_instance_by_id(self, server_id: t.Union[str, int]) -> ServerInstance:
for server in self.servers_list: for server in self.servers_list:
if int(server["server_id"]) == int(server_id): if int(server["server_id"]) == int(server_id):
return server["server_obj"] return server["server_obj"]
@ -179,7 +179,7 @@ class ServersController(metaclass=Singleton):
temp_server_dict = { temp_server_dict = {
"server_id": server.get("server_id"), "server_id": server.get("server_id"),
"server_data_obj": server, "server_data_obj": server,
"server_obj": Server( "server_obj": ServerInstance(
server.get("server_id"), server.get("server_id"),
self.helper, self.helper,
self.management_helper, self.management_helper,
@ -267,7 +267,7 @@ class ServersController(metaclass=Singleton):
server_data = [] server_data = []
try: try:
for server in self.servers_list: for server in self.servers_list:
srv: Server = ServersController().get_server_instance_by_id( srv = 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()
@ -292,7 +292,7 @@ class ServersController(metaclass=Singleton):
) )
for server in authorized_servers: for server in authorized_servers:
srv: Server = server srv: ServerInstance = server
latest = srv.stats_helper.get_latest_server_stats() latest = srv.stats_helper.get_latest_server_stats()
key_permissions = PermissionsServers.get_api_key_permissions_list( key_permissions = PermissionsServers.get_api_key_permissions_list(
api_key, server.server_id api_key, server.server_id
@ -316,7 +316,7 @@ class ServersController(metaclass=Singleton):
authorized_servers = ServersController.get_authorized_servers(user_id) authorized_servers = ServersController.get_authorized_servers(user_id)
for server in authorized_servers: for server in authorized_servers:
srv: Server = server srv: ServerInstance = server
latest = srv.stats_helper.get_latest_server_stats() latest = srv.stats_helper.get_latest_server_stats()
# TODO # TODO
user_permissions = PermissionsServers.get_user_id_permissions_list( user_permissions = PermissionsServers.get_user_id_permissions_list(
@ -360,7 +360,7 @@ class ServersController(metaclass=Singleton):
def get_server_obj_optional( def get_server_obj_optional(
self, server_id: t.Union[str, int] self, server_id: t.Union[str, int]
) -> t.Optional[Server]: ) -> t.Optional[ServerInstance]:
for server in self.servers_list: for server in self.servers_list:
if str(server["server_id"]) == str(server_id): if str(server["server_id"]) == str(server_id):
return server["server_obj"] return server["server_obj"]
@ -394,7 +394,7 @@ class ServersController(metaclass=Singleton):
# for each server # for each server
for server in self.servers_list: for server in self.servers_list:
# is the server running? # is the server running?
srv_obj: Server = server["server_obj"] srv_obj: ServerInstance = server["server_obj"]
running = srv_obj.check_running() running = srv_obj.check_running()
# if so, let's add a dictionary to the list of running servers # if so, let's add a dictionary to the list of running servers
if running: if running:
@ -432,12 +432,12 @@ class ServersController(metaclass=Singleton):
# ********************************************************************************** # **********************************************************************************
@staticmethod @staticmethod
def get_server_stats_by_id(server_id): def get_server_stats_by_id(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.get_latest_server_stats() return srv.stats_helper.get_latest_server_stats()
@staticmethod @staticmethod
def server_id_exists(server_id): def server_id_exists(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.server_id_exists() return srv.stats_helper.server_id_exists()
@staticmethod @staticmethod
@ -457,7 +457,7 @@ class ServersController(metaclass=Singleton):
@staticmethod @staticmethod
def is_crashed(server_id): def is_crashed(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.is_crashed() return srv.stats_helper.is_crashed()
@staticmethod @staticmethod
@ -469,32 +469,32 @@ class ServersController(metaclass=Singleton):
@staticmethod @staticmethod
def set_update(server_id, value): def set_update(server_id, value):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.set_update(value) return srv.stats_helper.set_update(value)
@staticmethod @staticmethod
def get_ttl_without_player(server_id): def get_ttl_without_player(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.get_ttl_without_player() return srv.stats_helper.get_ttl_without_player()
@staticmethod @staticmethod
def can_stop_no_players(server_id, time_limit): def can_stop_no_players(server_id, time_limit):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.can_stop_no_players(time_limit) return srv.stats_helper.can_stop_no_players(time_limit)
@staticmethod @staticmethod
def set_waiting_start(server_id, value): def set_waiting_start(server_id, value):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
srv.stats_helper.set_waiting_start(value) srv.stats_helper.set_waiting_start(value)
@staticmethod @staticmethod
def get_waiting_start(server_id): def get_waiting_start(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.get_waiting_start() return srv.stats_helper.get_waiting_start()
@staticmethod @staticmethod
def get_update_status(server_id): def get_update_status(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
return srv.stats_helper.get_update_status() return srv.stats_helper.get_update_status()
# ********************************************************************************** # **********************************************************************************
@ -502,7 +502,7 @@ class ServersController(metaclass=Singleton):
# ********************************************************************************** # **********************************************************************************
@staticmethod @staticmethod
def get_banned_players(server_id): def get_banned_players(server_id):
srv: Server = ServersController().get_server_instance_by_id(server_id) srv = ServersController().get_server_instance_by_id(server_id)
stats = srv.stats_helper.get_server_stats() stats = srv.stats_helper.get_server_stats()
server_path = stats["server_id"]["path"] server_path = stats["server_id"]["path"]
path = os.path.join(server_path, "banned-players.json") path = os.path.join(server_path, "banned-players.json")

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

@ -92,7 +92,7 @@ class ServerOutBuf:
# ********************************************************************************** # **********************************************************************************
# Minecraft Server Class # Minecraft Server Class
# ********************************************************************************** # **********************************************************************************
class Server: class ServerInstance:
server_object: Servers server_object: Servers
helper: Helpers helper: Helpers
management_helper: HelpersManagement management_helper: HelpersManagement