From 3c14d0f2ee5eae2cce47708a6be97f5dd224f888 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 27 Aug 2022 10:44:34 -0400 Subject: [PATCH] Appease the linter --- app/classes/shared/import_helper.py | 4 ++-- app/classes/shared/main_controller.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py index 446683c1..769ebc3a 100644 --- a/app/classes/shared/import_helper.py +++ b/app/classes/shared/import_helper.py @@ -115,9 +115,9 @@ class ImportHelpers: self, server_path, new_server_dir, port, full_jar_path, new_id ): import_thread = threading.Thread( - target=self.import_threaded_java_zip_server, + target=self.import_threaded_bedrock_server, daemon=True, - args=(server_path, new_server_dir, port, new_id), + args=(server_path, new_server_dir, port, full_jar_path, new_id), name=f"{new_id}_bedrock_import", ) import_thread.start() diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index 6aaf8cb1..748062ba 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -5,7 +5,6 @@ import platform import shutil import time import logging -import threading from peewee import DoesNotExist # TZLocal is set as a hidden import on win pipeline @@ -17,7 +16,6 @@ from app.classes.models.server_permissions import EnumPermissionsServer from app.classes.shared.main_models import DatabaseShortcuts from app.classes.models.users import HelperUsers from app.classes.models.roles import HelperRoles -from app.classes.models.server_permissions import PermissionsServers from app.classes.models.management import HelpersManagement from app.classes.models.servers import HelperServers from app.classes.controllers.crafty_perms_controller import CraftyPermsController