From 2b484d5a075df489bd97f917a0c2e8efa7430a85 Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Thu, 26 May 2022 15:20:21 +0200 Subject: [PATCH] fixing download jar --- app/classes/controllers/servers_controller.py | 4 +-- app/classes/shared/main_controller.py | 36 +++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py index f3a85704..d078ecba 100644 --- a/app/classes/controllers/servers_controller.py +++ b/app/classes/controllers/servers_controller.py @@ -103,12 +103,12 @@ class ServersController(metaclass=Singleton): @staticmethod def set_download(server_id): srv: Server = ServersController().get_server_instance_by_id(server_id) - return srv.stats_helper.set_download(server_id) + return srv.stats_helper.set_download() @staticmethod def finish_download(server_id): srv: Server = ServersController().get_server_instance_by_id(server_id) - return srv.stats_helper.finish_download(server_id) + return srv.stats_helper.finish_download() @staticmethod def get_download_status(server_id): diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index cef47ccb..7bdeffcc 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -34,25 +34,33 @@ logger = logging.getLogger(__name__) class Controller: def __init__(self, database, helper): - self.helper = helper - self.server_jars = ServerJars(helper) - self.users_helper = HelperUsers(database, self.helper) - self.roles_helper = HelperRoles(database) - self.servers_helper = HelperServers(database) - self.management_helper = HelpersManagement(database, self.helper) - self.authentication = Authentication(self.helper) - self.crafty_perms = CraftyPermsController() - self.management = ManagementController(self.management_helper) - self.roles = RolesController(self.users_helper, self.roles_helper) - self.server_perms = ServerPermsController() - self.servers = ServersController( + self.helper: Helpers = helper + self.server_jars: ServerJars = ServerJars(helper) + self.users_helper: HelperUsers = HelperUsers(database, self.helper) + self.roles_helper: HelperRoles = HelperRoles(database) + self.servers_helper: HelperServers = HelperServers(database) + self.management_helper: HelpersManagement = HelpersManagement( + database, self.helper + ) + self.authentication: Authentication = Authentication(self.helper) + self.crafty_perms: CraftyPermsController = CraftyPermsController() + self.management: ManagementController = ManagementController( + self.management_helper + ) + self.roles: RolesController = RolesController( + self.users_helper, self.roles_helper + ) + self.server_perms: ServerPermsController = ServerPermsController() + self.servers: ServersController = ServersController( self.helper, self.servers_helper, self.management_helper ) - self.users = UsersController( + self.users: UsersController = UsersController( self.helper, self.users_helper, self.authentication ) tz = get_localzone() - self.support_scheduler = BackgroundScheduler(timezone=str(tz)) + self.support_scheduler: BackgroundScheduler = BackgroundScheduler( + timezone=str(tz) + ) self.support_scheduler.start() @staticmethod