Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-black codebase with new standard

Browse Source
This commit is contained in:
Andrew 2023-02-15 18:01:21 -05:00
parent c434833208
commit 491415c7fa
26 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,6 @@ class ServersController(metaclass=Singleton):
raise Exception(f"Unable to find server object for server id {server_id}") raise Exception(f"Unable to find server object for server id {server_id}")
def init_all_servers(self): def init_all_servers(self):
servers = self.get_all_defined_servers() servers = self.get_all_defined_servers()
self.failed_servers = [] self.failed_servers = []
@ -227,7 +226,6 @@ class ServersController(metaclass=Singleton):
) )
def check_server_loaded(self, server_id_to_check: int): def check_server_loaded(self, server_id_to_check: int):
logger.info(f"Checking to see if we already registered {server_id_to_check}") logger.info(f"Checking to see if we already registered {server_id_to_check}")
for server in self.servers_list: for server in self.servers_list:

1
app/classes/minecraft/mc_ping.py
View File

@ -19,7 +19,6 @@ class Server:
self.description = data.get("description") self.description = data.get("description")
# print(self.description) # print(self.description)
if isinstance(self.description, dict): if isinstance(self.description, dict):
# cat server # cat server
if "translate" in self.description: if "translate" in self.description:
self.description = self.description["translate"] self.description = self.description["translate"]

1
app/classes/minecraft/serverjars.py
View File

@ -104,7 +104,6 @@ class ServerJars:
logger.error(f"Unable to update serverjars.com cache file: {e}") logger.error(f"Unable to update serverjars.com cache file: {e}")
def refresh_cache(self): def refresh_cache(self):
cache_file = self.helper.serverjar_cache cache_file = self.helper.serverjar_cache
cache_old = self.helper.is_file_older_than_x_days(cache_file) cache_old = self.helper.is_file_older_than_x_days(cache_file)

3
app/classes/minecraft/stats.py
View File

@ -211,7 +211,6 @@ class Stats:
@staticmethod @staticmethod
def get_world_size(server_path): def get_world_size(server_path):
total_size = 0 total_size = 0
total_size = Helpers.get_dir_size(server_path) total_size = Helpers.get_dir_size(server_path)
@ -221,7 +220,6 @@ class Stats:
return level_total_size return level_total_size
def get_server_players(self, server_id): def get_server_players(self, server_id):
server = HelperServers.get_server_data_by_id(server_id) server = HelperServers.get_server_data_by_id(server_id)
logger.info(f"Getting players for server {server}") logger.info(f"Getting players for server {server}")
@ -295,7 +293,6 @@ class Stats:
@staticmethod @staticmethod
def parse_server_raknet_ping(ping_obj: object): def parse_server_raknet_ping(ping_obj: object):
try: try:
server_icon = base64.encodebytes(ping_obj["icon"]) server_icon = base64.encodebytes(ping_obj["icon"])
except Exception as e: except Exception as e:

1
app/classes/models/crafty_permissions.py
View File

@ -15,6 +15,7 @@ from app.classes.shared.permission_helper import PermissionHelper
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# ********************************************************************************** # **********************************************************************************
# User_Crafty Class # User_Crafty Class
# ********************************************************************************** # **********************************************************************************

1
app/classes/models/management.py
View File

@ -20,6 +20,7 @@ from app.classes.shared.main_models import DatabaseShortcuts
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# ********************************************************************************** # **********************************************************************************
# Audit_Log Class # Audit_Log Class
# ********************************************************************************** # **********************************************************************************

1
app/classes/models/roles.py
View File

@ -15,6 +15,7 @@ from app.classes.shared.helpers import Helpers
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# ********************************************************************************** # **********************************************************************************
# Roles Class # Roles Class
# ********************************************************************************** # **********************************************************************************

1
app/classes/models/server_permissions.py
View File

@ -16,6 +16,7 @@ from app.classes.shared.permission_helper import PermissionHelper
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# ********************************************************************************** # **********************************************************************************
# Role Servers Class # Role Servers Class
# ********************************************************************************** # **********************************************************************************

1
app/classes/models/server_stats.py
View File

@ -29,6 +29,7 @@ logger = logging.getLogger(__name__)
peewee_logger = logging.getLogger("peewee") peewee_logger = logging.getLogger("peewee")
peewee_logger.setLevel(logging.INFO) peewee_logger.setLevel(logging.INFO)
# ********************************************************************************** # **********************************************************************************
# Servers Stats Class # Servers Stats Class
# ********************************************************************************** # **********************************************************************************

1
app/classes/models/servers.py
View File

@ -15,6 +15,7 @@ from app.classes.models.base_model import BaseModel
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# ********************************************************************************** # **********************************************************************************
# Servers Model # Servers Model
# ********************************************************************************** # **********************************************************************************

2
app/classes/models/users.py
View File

@ -21,6 +21,7 @@ from app.classes.models.roles import Roles, HelperRoles
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# ********************************************************************************** # **********************************************************************************
# Users Class # Users Class
# ********************************************************************************** # **********************************************************************************
@ -58,6 +59,7 @@ PUBLIC_USER_ATTRS: t.Final = [
"lang", # maybe remove? "lang", # maybe remove?
] ]
# ********************************************************************************** # **********************************************************************************
# API Keys Class # API Keys Class
# ********************************************************************************** # **********************************************************************************

1
app/classes/shared/command.py
View File

@ -58,7 +58,6 @@ class MainPrompt(cmd.Cmd):
Console.info("Unknown migration command") Console.info("Unknown migration command")
def do_set_passwd(self, line): def do_set_passwd(self, line):
try: try:
username = str(line).lower() username = str(line).lower()
# If no user is found it returns None # If no user is found it returns None

6
app/classes/shared/helpers.py
View File

@ -596,7 +596,6 @@ class Helpers:
# open our file # open our file
with open(file_name, "r", encoding="utf-8") as f: with open(file_name, "r", encoding="utf-8") as f:
# seek # seek
f.seek(0, 2) f.seek(0, 2)
@ -761,7 +760,6 @@ class Helpers:
@staticmethod @staticmethod
def get_file_contents(path: str, lines=100): def get_file_contents(path: str, lines=100):
contents = "" contents = ""
if os.path.exists(path) and os.path.isfile(path): if os.path.exists(path) and os.path.isfile(path):
@ -782,12 +780,10 @@ class Helpers:
return False return False
def create_session_file(self, ignore=False): def create_session_file(self, ignore=False):
if ignore and os.path.exists(self.session_file): if ignore and os.path.exists(self.session_file):
os.remove(self.session_file) os.remove(self.session_file)
if os.path.exists(self.session_file): if os.path.exists(self.session_file):
file_data = self.get_file_contents(self.session_file) file_data = self.get_file_contents(self.session_file)
try: try:
data = json.loads(file_data) data = json.loads(file_data)
@ -895,7 +891,6 @@ class Helpers:
logger.critical(f"Check generated exception due to permssion error: {e}") logger.critical(f"Check generated exception due to permssion error: {e}")
def create_self_signed_cert(self, cert_dir=None): def create_self_signed_cert(self, cert_dir=None):
if cert_dir is None: if cert_dir is None:
cert_dir = os.path.join(self.config_dir, "web", "certs") cert_dir = os.path.join(self.config_dir, "web", "certs")
@ -1047,7 +1042,6 @@ class Helpers:
return output return output
def generate_dir(self, folder, output=""): def generate_dir(self, folder, output=""):
dir_list = [] dir_list = []
unsorted_files = [] unsorted_files = []
file_list = os.listdir(folder) file_list = os.listdir(folder)

1
app/classes/shared/import_helper.py
View File

@ -226,7 +226,6 @@ class ImportHelpers:
download_thread.start() download_thread.start()
def download_threaded_bedrock_server(self, path, new_id): def download_threaded_bedrock_server(self, path, new_id):
# downloads zip from remote url # downloads zip from remote url
try: try:
bedrock_url = Helpers.get_latest_bedrock_url() bedrock_url = Helpers.get_latest_bedrock_url()

1
app/classes/shared/installer.py
View File

@ -10,7 +10,6 @@ class Install:
) )
def do_install(self): def do_install(self):
# are we in a venv? # are we in a venv?
if not self.is_venv(): if not self.is_venv():
print("Crafty Requires a venv to install") print("Crafty Requires a venv to install")

1
app/classes/shared/main_controller.py
View File

@ -941,7 +941,6 @@ class Controller:
def remove_server(self, server_id, files): def remove_server(self, server_id, files):
counter = 0 counter = 0
for server in self.servers.servers_list: for server in self.servers.servers_list:
# if this is the droid... im mean server we are looking for... # if this is the droid... im mean server we are looking for...
if str(server["server_id"]) == str(server_id): if str(server["server_id"]) == str(server_id):
server_data = self.servers.get_server_data(server_id) server_data = self.servers.get_server_data(server_id)

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

@ -590,7 +590,6 @@ class ServerInstance:
# We need to grab the exact forge version number. # We need to grab the exact forge version number.
# We know we can find it here in the run.sh/bat script. # We know we can find it here in the run.sh/bat script.
try: try:
# Getting the forge version from the executable command # Getting the forge version from the executable command
version = re.findall( version = re.findall(
r"forge-([0-9\.]+)((?:)|(?:-([0-9\.]+)-[a-zA-Z]+)).jar", r"forge-([0-9\.]+)((?:)|(?:-([0-9\.]+)-[a-zA-Z]+)).jar",
@ -850,7 +849,6 @@ class ServerInstance:
return True return True
def crash_detected(self, name): def crash_detected(self, name):
# clear the old scheduled watcher task # clear the old scheduled watcher task
self.server_scheduler.remove_job(f"c_{self.server_id}") self.server_scheduler.remove_job(f"c_{self.server_id}")
# remove the stats polling job since server is stopped # 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 return self.process.pid if self.process is not None else None
def detect_crash(self): def detect_crash(self):
logger.info(f"Detecting possible crash for server: {self.name} ") logger.info(f"Detecting possible crash for server: {self.name} ")
running = self.check_running() running = self.check_running()
@ -935,7 +932,6 @@ class ServerInstance:
self.stats_helper.sever_crashed() self.stats_helper.sever_crashed()
# if we haven't tried to restart more 3 or more times # if we haven't tried to restart more 3 or more times
if self.restart_count <= 3: if self.restart_count <= 3:
# start the server if needed # start the server if needed
server_restarted = self.crash_detected(self.name) server_restarted = self.crash_detected(self.name)
@ -1461,7 +1457,6 @@ class ServerInstance:
Console.critical("Can't broadcast server status to websocket") Console.critical("Can't broadcast server status to websocket")
def get_servers_stats(self): def get_servers_stats(self):
server_stats = {} server_stats = {}
logger.info("Getting Stats for Server " + self.name + " ...") logger.info("Getting Stats for Server " + self.name + " ...")
@ -1548,7 +1543,6 @@ class ServerInstance:
return server_stats return server_stats
def get_server_players(self): def get_server_players(self):
server = HelperServers.get_server_data_by_id(self.server_id) server = HelperServers.get_server_data_by_id(self.server_id)
logger.info(f"Getting players for server {server}") logger.info(f"Getting players for server {server}")
@ -1569,7 +1563,6 @@ class ServerInstance:
return [] return []
def get_raw_server_stats(self, server_id): def get_raw_server_stats(self, server_id):
try: try:
server = HelperServers.get_server_obj(server_id) server = HelperServers.get_server_obj(server_id)
except: except:
@ -1718,7 +1711,6 @@ class ServerInstance:
return server_stats return server_stats
def record_server_stats(self): def record_server_stats(self):
server_stats = self.get_servers_stats() server_stats = self.get_servers_stats()
self.stats_helper.insert_server_stats(server_stats) self.stats_helper.insert_server_stats(server_stats)

1
app/classes/shared/tasks.py
View File

@ -672,7 +672,6 @@ class TasksManager:
host_stats = HelpersManagement.get_latest_hosts_stats() host_stats = HelpersManagement.get_latest_hosts_stats()
while True: while True:
if host_stats.get( if host_stats.get(
"cpu_usage" "cpu_usage"
) != HelpersManagement.get_latest_hosts_stats().get( ) != HelpersManagement.get_latest_hosts_stats().get(

1
app/classes/web/default_handler.py
View File

@ -6,7 +6,6 @@ logger = logging.getLogger(__name__)
class DefaultHandler(BaseHandler): class DefaultHandler(BaseHandler):
# Override prepare() instead of get() to cover all possible HTTP methods. # Override prepare() instead of get() to cover all possible HTTP methods.
def prepare(self, page=None): # pylint: disable=arguments-differ def prepare(self, page=None): # pylint: disable=arguments-differ
if page is not None: if page is not None:

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

@ -10,7 +10,6 @@ logger = logging.getLogger(__name__)
class PublicHandler(BaseHandler): class PublicHandler(BaseHandler):
def set_current_user(self, user_id: str = None): def set_current_user(self, user_id: str = None):
expire_days = self.helper.get_setting("cookie_expire") expire_days = self.helper.get_setting("cookie_expire")
# if helper comes back with false # if helper comes back with false
@ -29,7 +28,6 @@ class PublicHandler(BaseHandler):
# self.clear_cookie("user_data") # self.clear_cookie("user_data")
def get(self, page=None): def get(self, page=None):
error = bleach.clean(self.get_argument("error", "Invalid Login!")) error = bleach.clean(self.get_argument("error", "Invalid Login!"))
error_msg = bleach.clean(self.get_argument("error_msg", "")) error_msg = bleach.clean(self.get_argument("error_msg", ""))
@ -81,7 +79,6 @@ class PublicHandler(BaseHandler):
) )
def post(self, page=None): def post(self, page=None):
error = bleach.clean(self.get_argument("error", "Invalid Login!")) error = bleach.clean(self.get_argument("error", "Invalid Login!"))
error_msg = bleach.clean(self.get_argument("error_msg", "")) error_msg = bleach.clean(self.get_argument("error_msg", ""))
@ -96,7 +93,6 @@ class PublicHandler(BaseHandler):
page_data["query"] = self.request.query page_data["query"] = self.request.query
if page == "login": if page == "login":
next_page = "/login" next_page = "/login"
if self.request.query: if self.request.query:
next_page = "/login?" + self.request.query next_page = "/login?" + self.request.query

1
app/classes/web/routes/api/auth/login.py
View File

@ -26,7 +26,6 @@ login_schema = {
class ApiAuthLoginHandler(BaseApiHandler): class ApiAuthLoginHandler(BaseApiHandler):
def post(self): def post(self):
try: try:
data = json.loads(self.request.body) data = json.loads(self.request.body)
except json.decoder.JSONDecodeError as e: except json.decoder.JSONDecodeError as e:

1
app/classes/web/routes/api/servers/index.py
View File

@ -631,7 +631,6 @@ class ApiServersIndexHandler(BaseApiHandler):
self.finish_json(200, {"status": "ok", "data": auth_data[0]}) self.finish_json(200, {"status": "ok", "data": auth_data[0]})
def post(self): def post(self):
auth_data = self.authenticate_user() auth_data = self.authenticate_user()
if not auth_data: if not auth_data:
return return

1
app/classes/web/server_handler.py
View File

@ -552,7 +552,6 @@ class ServerHandler(BaseHandler):
self.get_remote_ip(), self.get_remote_ip(),
) )
else: else:
new_server_id = self.controller.create_bedrock_server( new_server_id = self.controller.create_bedrock_server(
server_name, server_name,
exec_user["user_id"], exec_user["user_id"],

2
app/classes/web/tornado_handler.py
View File

@ -59,7 +59,6 @@ class Webserver:
@staticmethod @staticmethod
def log_function(handler): def log_function(handler):
info = { info = {
"Status_Code": handler.get_status(), "Status_Code": handler.get_status(),
"Method": handler.request.method, "Method": handler.request.method,
@ -103,7 +102,6 @@ class Webserver:
logger.debug("Applied asyncio patch") logger.debug("Applied asyncio patch")
def run_tornado(self): def run_tornado(self):
# let's verify we have an SSL cert # let's verify we have an SSL cert
self.helper.create_self_signed_cert() self.helper.create_self_signed_cert()

2
app/classes/web/upload_handler.py
View File

@ -18,7 +18,6 @@ logger = logging.getLogger(__name__)
@tornado.web.stream_request_body @tornado.web.stream_request_body
class UploadHandler(BaseHandler): class UploadHandler(BaseHandler):
# noinspection PyAttributeOutsideInit # noinspection PyAttributeOutsideInit
def initialize( def initialize(
self, self,
@ -173,7 +172,6 @@ class UploadHandler(BaseHandler):
if not self.request.headers.get("X-Content-Type", None).startswith( if not self.request.headers.get("X-Content-Type", None).startswith(
"image/" "image/"
): ):
return self.finish_json( return self.finish_json(
415, 415,
{ {

1
app/classes/web/websocket_handler.py
View File

@ -79,7 +79,6 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
# pylint: disable=arguments-renamed # pylint: disable=arguments-renamed
@staticmethod @staticmethod
def on_message(raw_message): def on_message(raw_message):
logger.debug(f"Got message from WebSocket connection {raw_message}") logger.debug(f"Got message from WebSocket connection {raw_message}")
message = json.loads(raw_message) message = json.loads(raw_message)
logger.debug(f"Event Type: {message['event']}, Data: {message['data']}") logger.debug(f"Event Type: {message['event']}, Data: {message['data']}")