mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2025-01-19 09:45:28 +01:00
Merge branch 'refactor/black-update' into 'dev'
Resolve Updated Lint and Black Errors See merge request crafty-controller/crafty-4!561
This commit is contained in:
Iain Powrie
commit
d3097083a1
@ -163,10 +163,9 @@ class ServersController(metaclass=Singleton):
|
||||
return server["server_obj"]
|
||||
|
||||
logger.warning(f"Unable to find server object for server id {server_id}")
|
||||
raise Exception(f"Unable to find server object for server id {server_id}")
|
||||
raise ValueError(f"Unable to find server object for server id {server_id}")
|
||||
|
||||
def init_all_servers(self):
|
||||
|
||||
servers = self.get_all_defined_servers()
|
||||
self.failed_servers = []
|
||||
|
||||
@ -227,7 +226,6 @@ class ServersController(metaclass=Singleton):
|
||||
)
|
||||
|
||||
def check_server_loaded(self, server_id_to_check: int):
|
||||
|
||||
logger.info(f"Checking to see if we already registered {server_id_to_check}")
|
||||
|
||||
for server in self.servers_list:
|
||||
|
||||
@ -19,7 +19,6 @@ class Server:
|
||||
self.description = data.get("description")
|
||||
# print(self.description)
|
||||
if isinstance(self.description, dict):
|
||||
|
||||
# cat server
|
||||
if "translate" in self.description:
|
||||
self.description = self.description["translate"]
|
||||
@ -124,7 +123,7 @@ def ping(ip, port):
|
||||
try:
|
||||
k = sock.recv(1)
|
||||
if not k:
|
||||
raise Exception()
|
||||
raise ValueError()
|
||||
except:
|
||||
return 0
|
||||
k = k[0]
|
||||
|
||||
@ -104,7 +104,6 @@ class ServerJars:
|
||||
logger.error(f"Unable to update serverjars.com cache file: {e}")
|
||||
|
||||
def refresh_cache(self):
|
||||
|
||||
cache_file = self.helper.serverjar_cache
|
||||
cache_old = self.helper.is_file_older_than_x_days(cache_file)
|
||||
|
||||
|
||||
@ -211,7 +211,6 @@ class Stats:
|
||||
|
||||
@staticmethod
|
||||
def get_world_size(server_path):
|
||||
|
||||
total_size = 0
|
||||
|
||||
total_size = Helpers.get_dir_size(server_path)
|
||||
@ -221,7 +220,6 @@ class Stats:
|
||||
return level_total_size
|
||||
|
||||
def get_server_players(self, server_id):
|
||||
|
||||
server = HelperServers.get_server_data_by_id(server_id)
|
||||
|
||||
logger.info(f"Getting players for server {server}")
|
||||
@ -295,7 +293,6 @@ class Stats:
|
||||
|
||||
@staticmethod
|
||||
def parse_server_raknet_ping(ping_obj: object):
|
||||
|
||||
try:
|
||||
server_icon = base64.encodebytes(ping_obj["icon"])
|
||||
except Exception as e:
|
||||
|
||||
@ -15,6 +15,7 @@ from app.classes.shared.permission_helper import PermissionHelper
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# User_Crafty Class
|
||||
# **********************************************************************************
|
||||
|
||||
@ -20,6 +20,7 @@ from app.classes.shared.main_models import DatabaseShortcuts
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# Audit_Log Class
|
||||
# **********************************************************************************
|
||||
|
||||
@ -15,6 +15,7 @@ from app.classes.shared.helpers import Helpers
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# Roles Class
|
||||
# **********************************************************************************
|
||||
|
||||
@ -16,6 +16,7 @@ from app.classes.shared.permission_helper import PermissionHelper
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# Role Servers Class
|
||||
# **********************************************************************************
|
||||
|
||||
@ -29,6 +29,7 @@ logger = logging.getLogger(__name__)
|
||||
peewee_logger = logging.getLogger("peewee")
|
||||
peewee_logger.setLevel(logging.INFO)
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# Servers Stats Class
|
||||
# **********************************************************************************
|
||||
|
||||
@ -15,6 +15,7 @@ from app.classes.models.base_model import BaseModel
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# Servers Model
|
||||
# **********************************************************************************
|
||||
|
||||
@ -21,6 +21,7 @@ from app.classes.models.roles import Roles, HelperRoles
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# Users Class
|
||||
# **********************************************************************************
|
||||
@ -58,6 +59,7 @@ PUBLIC_USER_ATTRS: t.Final = [
|
||||
"lang", # maybe remove?
|
||||
]
|
||||
|
||||
|
||||
# **********************************************************************************
|
||||
# API Keys Class
|
||||
# **********************************************************************************
|
||||
|
||||
@ -76,7 +76,7 @@ class Authentication:
|
||||
|
||||
output = self.check(token)
|
||||
if output is None:
|
||||
raise Exception("Invalid token")
|
||||
raise ValueError("Invalid token")
|
||||
return output
|
||||
|
||||
def check_bool(self, token) -> bool:
|
||||
|
||||
@ -58,7 +58,6 @@ class MainPrompt(cmd.Cmd):
|
||||
Console.info("Unknown migration command")
|
||||
|
||||
def do_set_passwd(self, line):
|
||||
|
||||
try:
|
||||
username = str(line).lower()
|
||||
# If no user is found it returns None
|
||||
|
||||
@ -94,7 +94,7 @@ class Helpers:
|
||||
try:
|
||||
# Get tags from Gitlab, select the latest and parse the semver
|
||||
response = get(
|
||||
"https://gitlab.com/api/v4/projects/20430749/repository/tags"
|
||||
"https://gitlab.com/api/v4/projects/20430749/repository/tags", timeout=1
|
||||
)
|
||||
if response.status_code == 200:
|
||||
remote_version = pkg_version.parse(json.loads(response.text)[0]["name"])
|
||||
@ -131,7 +131,7 @@ class Helpers:
|
||||
try:
|
||||
# Get minecraft server download page
|
||||
# (hopefully the don't change the structure)
|
||||
download_page = get(url, headers=headers)
|
||||
download_page = get(url, headers=headers, timeout=1)
|
||||
|
||||
# Search for our string targets
|
||||
win_download_url = re.search(target_win, download_page.text).group(0)
|
||||
@ -281,7 +281,7 @@ class Helpers:
|
||||
@staticmethod
|
||||
def check_port(server_port):
|
||||
try:
|
||||
ip = get("https://api.ipify.org").content.decode("utf8")
|
||||
ip = get("https://api.ipify.org", timeout=1).content.decode("utf8")
|
||||
except:
|
||||
ip = "google.com"
|
||||
a_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
@ -596,7 +596,6 @@ class Helpers:
|
||||
|
||||
# open our file
|
||||
with open(file_name, "r", encoding="utf-8") as f:
|
||||
|
||||
# seek
|
||||
f.seek(0, 2)
|
||||
|
||||
@ -752,7 +751,7 @@ class Helpers:
|
||||
use_ssl=True,
|
||||
) # + "?d=404"
|
||||
try:
|
||||
if requests.head(url).status_code != 404:
|
||||
if requests.head(url, timeout=1).status_code != 404:
|
||||
profile_url = url
|
||||
except Exception as e:
|
||||
logger.debug(f"Could not pull resource from Gravatar with error {e}")
|
||||
@ -761,7 +760,6 @@ class Helpers:
|
||||
|
||||
@staticmethod
|
||||
def get_file_contents(path: str, lines=100):
|
||||
|
||||
contents = ""
|
||||
|
||||
if os.path.exists(path) and os.path.isfile(path):
|
||||
@ -782,12 +780,10 @@ class Helpers:
|
||||
return False
|
||||
|
||||
def create_session_file(self, ignore=False):
|
||||
|
||||
if ignore and os.path.exists(self.session_file):
|
||||
os.remove(self.session_file)
|
||||
|
||||
if os.path.exists(self.session_file):
|
||||
|
||||
file_data = self.get_file_contents(self.session_file)
|
||||
try:
|
||||
data = json.loads(file_data)
|
||||
@ -895,7 +891,6 @@ class Helpers:
|
||||
logger.critical(f"Check generated exception due to permssion error: {e}")
|
||||
|
||||
def create_self_signed_cert(self, cert_dir=None):
|
||||
|
||||
if cert_dir is None:
|
||||
cert_dir = os.path.join(self.config_dir, "web", "certs")
|
||||
|
||||
@ -1047,7 +1042,6 @@ class Helpers:
|
||||
return output
|
||||
|
||||
def generate_dir(self, folder, output=""):
|
||||
|
||||
dir_list = []
|
||||
unsorted_files = []
|
||||
file_list = os.listdir(folder)
|
||||
|
||||
@ -226,7 +226,6 @@ class ImportHelpers:
|
||||
download_thread.start()
|
||||
|
||||
def download_threaded_bedrock_server(self, path, new_id):
|
||||
|
||||
# downloads zip from remote url
|
||||
try:
|
||||
bedrock_url = Helpers.get_latest_bedrock_url()
|
||||
|
||||
@ -10,7 +10,6 @@ class Install:
|
||||
)
|
||||
|
||||
def do_install(self):
|
||||
|
||||
# are we in a venv?
|
||||
if not self.is_venv():
|
||||
print("Crafty Requires a venv to install")
|
||||
|
||||
@ -347,7 +347,7 @@ class Controller:
|
||||
elif root_create_data["create_type"] == "import_zip":
|
||||
# TODO: Copy files from the zip file to the new server directory
|
||||
server_file = create_data["jarfile"]
|
||||
raise Exception("Not yet implemented")
|
||||
raise NotImplementedError("Not yet implemented")
|
||||
_create_server_properties_if_needed(
|
||||
create_data["server_properties_port"],
|
||||
)
|
||||
@ -379,7 +379,7 @@ class Controller:
|
||||
logger.error(f"Server import failed with error: {ex}")
|
||||
elif root_create_data["create_type"] == "import_zip":
|
||||
# TODO: Copy files from the zip file to the new server directory
|
||||
raise Exception("Not yet implemented")
|
||||
raise NotImplementedError("Not yet implemented")
|
||||
|
||||
_create_server_properties_if_needed(0, True)
|
||||
|
||||
@ -401,7 +401,7 @@ class Controller:
|
||||
logger.error(f"Server import failed with error: {ex}")
|
||||
elif root_create_data["create_type"] == "import_zip":
|
||||
# TODO: Copy files from the zip file to the new server directory
|
||||
raise Exception("Not yet implemented")
|
||||
raise NotImplementedError("Not yet implemented")
|
||||
|
||||
_create_server_properties_if_needed(0, True)
|
||||
|
||||
@ -941,7 +941,6 @@ class Controller:
|
||||
def remove_server(self, server_id, files):
|
||||
counter = 0
|
||||
for server in self.servers.servers_list:
|
||||
|
||||
# if this is the droid... im mean server we are looking for...
|
||||
if str(server["server_id"]) == str(server_id):
|
||||
server_data = self.servers.get_server_data(server_id)
|
||||
|
||||
@ -590,7 +590,6 @@ class ServerInstance:
|
||||
# We need to grab the exact forge version number.
|
||||
# We know we can find it here in the run.sh/bat script.
|
||||
try:
|
||||
|
||||
# Getting the forge version from the executable command
|
||||
version = re.findall(
|
||||
r"forge-([0-9\.]+)((?:)|(?:-([0-9\.]+)-[a-zA-Z]+)).jar",
|
||||
@ -850,7 +849,6 @@ class ServerInstance:
|
||||
return True
|
||||
|
||||
def crash_detected(self, name):
|
||||
|
||||
# clear the old scheduled watcher task
|
||||
self.server_scheduler.remove_job(f"c_{self.server_id}")
|
||||
# remove the stats polling job since server is stopped
|
||||
@ -912,7 +910,6 @@ class ServerInstance:
|
||||
return self.process.pid if self.process is not None else None
|
||||
|
||||
def detect_crash(self):
|
||||
|
||||
logger.info(f"Detecting possible crash for server: {self.name} ")
|
||||
|
||||
running = self.check_running()
|
||||
@ -935,7 +932,6 @@ class ServerInstance:
|
||||
self.stats_helper.sever_crashed()
|
||||
# if we haven't tried to restart more 3 or more times
|
||||
if self.restart_count <= 3:
|
||||
|
||||
# start the server if needed
|
||||
server_restarted = self.crash_detected(self.name)
|
||||
|
||||
@ -1461,7 +1457,6 @@ class ServerInstance:
|
||||
Console.critical("Can't broadcast server status to websocket")
|
||||
|
||||
def get_servers_stats(self):
|
||||
|
||||
server_stats = {}
|
||||
|
||||
logger.info("Getting Stats for Server " + self.name + " ...")
|
||||
@ -1548,7 +1543,6 @@ class ServerInstance:
|
||||
return server_stats
|
||||
|
||||
def get_server_players(self):
|
||||
|
||||
server = HelperServers.get_server_data_by_id(self.server_id)
|
||||
|
||||
logger.info(f"Getting players for server {server}")
|
||||
@ -1569,7 +1563,6 @@ class ServerInstance:
|
||||
return []
|
||||
|
||||
def get_raw_server_stats(self, server_id):
|
||||
|
||||
try:
|
||||
server = HelperServers.get_server_obj(server_id)
|
||||
except:
|
||||
@ -1718,7 +1711,6 @@ class ServerInstance:
|
||||
return server_stats
|
||||
|
||||
def record_server_stats(self):
|
||||
|
||||
server_stats = self.get_servers_stats()
|
||||
self.stats_helper.insert_server_stats(server_stats)
|
||||
|
||||
|
||||
@ -672,7 +672,6 @@ class TasksManager:
|
||||
host_stats = HelpersManagement.get_latest_hosts_stats()
|
||||
|
||||
while True:
|
||||
|
||||
if host_stats.get(
|
||||
"cpu_usage"
|
||||
) != HelpersManagement.get_latest_hosts_stats().get(
|
||||
|
||||
@ -6,7 +6,6 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class DefaultHandler(BaseHandler):
|
||||
|
||||
# Override prepare() instead of get() to cover all possible HTTP methods.
|
||||
def prepare(self, page=None): # pylint: disable=arguments-differ
|
||||
if page is not None:
|
||||
|
||||
@ -10,7 +10,6 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
class PublicHandler(BaseHandler):
|
||||
def set_current_user(self, user_id: str = None):
|
||||
|
||||
expire_days = self.helper.get_setting("cookie_expire")
|
||||
|
||||
# if helper comes back with false
|
||||
@ -29,7 +28,6 @@ class PublicHandler(BaseHandler):
|
||||
# self.clear_cookie("user_data")
|
||||
|
||||
def get(self, page=None):
|
||||
|
||||
error = bleach.clean(self.get_argument("error", "Invalid Login!"))
|
||||
error_msg = bleach.clean(self.get_argument("error_msg", ""))
|
||||
|
||||
@ -81,7 +79,6 @@ class PublicHandler(BaseHandler):
|
||||
)
|
||||
|
||||
def post(self, page=None):
|
||||
|
||||
error = bleach.clean(self.get_argument("error", "Invalid Login!"))
|
||||
error_msg = bleach.clean(self.get_argument("error_msg", ""))
|
||||
|
||||
@ -96,7 +93,6 @@ class PublicHandler(BaseHandler):
|
||||
page_data["query"] = self.request.query
|
||||
|
||||
if page == "login":
|
||||
|
||||
next_page = "/login"
|
||||
if self.request.query:
|
||||
next_page = "/login?" + self.request.query
|
||||
|
||||
@ -26,7 +26,6 @@ login_schema = {
|
||||
|
||||
class ApiAuthLoginHandler(BaseApiHandler):
|
||||
def post(self):
|
||||
|
||||
try:
|
||||
data = json.loads(self.request.body)
|
||||
except json.decoder.JSONDecodeError as e:
|
||||
|
||||
@ -631,7 +631,6 @@ class ApiServersIndexHandler(BaseApiHandler):
|
||||
self.finish_json(200, {"status": "ok", "data": auth_data[0]})
|
||||
|
||||
def post(self):
|
||||
|
||||
auth_data = self.authenticate_user()
|
||||
if not auth_data:
|
||||
return
|
||||
|
||||
@ -552,7 +552,6 @@ class ServerHandler(BaseHandler):
|
||||
self.get_remote_ip(),
|
||||
)
|
||||
else:
|
||||
|
||||
new_server_id = self.controller.create_bedrock_server(
|
||||
server_name,
|
||||
exec_user["user_id"],
|
||||
|
||||
@ -59,7 +59,6 @@ class Webserver:
|
||||
|
||||
@staticmethod
|
||||
def log_function(handler):
|
||||
|
||||
info = {
|
||||
"Status_Code": handler.get_status(),
|
||||
"Method": handler.request.method,
|
||||
@ -103,7 +102,6 @@ class Webserver:
|
||||
logger.debug("Applied asyncio patch")
|
||||
|
||||
def run_tornado(self):
|
||||
|
||||
# let's verify we have an SSL cert
|
||||
self.helper.create_self_signed_cert()
|
||||
|
||||
|
||||
@ -18,7 +18,6 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
@tornado.web.stream_request_body
|
||||
class UploadHandler(BaseHandler):
|
||||
|
||||
# noinspection PyAttributeOutsideInit
|
||||
def initialize(
|
||||
self,
|
||||
@ -173,7 +172,6 @@ class UploadHandler(BaseHandler):
|
||||
if not self.request.headers.get("X-Content-Type", None).startswith(
|
||||
"image/"
|
||||
):
|
||||
|
||||
return self.finish_json(
|
||||
415,
|
||||
{
|
||||
|
||||
@ -79,7 +79,6 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
|
||||
# pylint: disable=arguments-renamed
|
||||
@staticmethod
|
||||
def on_message(raw_message):
|
||||
|
||||
logger.debug(f"Got message from WebSocket connection {raw_message}")
|
||||
message = json.loads(raw_message)
|
||||
logger.debug(f"Event Type: {message['event']}, Data: {message['data']}")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user