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

fix fstrings, refactored console to static

Browse Source
This commit is contained in:
computergeek125 2022-04-11 20:34:46 -05:00
parent b5cac0e385
commit d417950eae
17 changed files with 190 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,13 +9,13 @@ import uuid
import random
from app.classes.minecraft.bedrock_ping import BedrockPing
from app.classes.shared.console import Console
logger = logging.getLogger(__name__)
class Server:
def __init__(self, console, data):
self.console = console
def __init__(self, data):
self.description = data.get("description")
# print(self.description)
if isinstance(self.description, dict):
@ -32,19 +32,19 @@ class Server:
if "extra" in description.keys():
for e in description["extra"]:
# Conversion format code needed only for Java Version
lines.append(get_code_format(self.console, "reset"))
lines.append(get_code_format("reset"))
if "bold" in e.keys():
lines.append(get_code_format(self.console, "bold"))
lines.append(get_code_format("bold"))
if "italic" in e.keys():
lines.append(get_code_format(self.console, "italic"))
lines.append(get_code_format("italic"))
if "underlined" in e.keys():
lines.append(get_code_format(self.console, "underlined"))
lines.append(get_code_format("underlined"))
if "strikethrough" in e.keys():
lines.append(get_code_format(self.console, "strikethrough"))
lines.append(get_code_format("strikethrough"))
if "obfuscated" in e.keys():
lines.append(get_code_format(self.console, "obfuscated"))
lines.append(get_code_format("obfuscated"))
if "color" in e.keys():
lines.append(get_code_format(self.console, e["color"]))
lines.append(get_code_format(e["color"]))
# Then append the text
if "text" in e.keys():
if e["text"] == "\n":
@ -95,7 +95,7 @@ class Player:
return self.name
def get_code_format(console, format_name):
def get_code_format(format_name):
root_dir = os.path.abspath(os.path.curdir)
format_file = os.path.join(root_dir, "app", "config", "motd_format.json")
try:
@ -106,14 +106,14 @@ def get_code_format(console, format_name):
return data.get(format_name)
else:
logger.error(f"Format MOTD Error: format name {format_name} does not exist")
console.error(
Console.error(
f"Format MOTD Error: format name {format_name} does not exist"
)
return ""
except Exception as e:
logger.critical(f"Config File Error: Unable to read {format_file} due to {e}")
console.critical(f"Config File Error: Unable to read {format_file} due to {e}")
Console.critical(f"Config File Error: Unable to read {format_file} due to {e}")
return ""

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

@ -133,7 +133,7 @@ class Stats:
internal_ip = server["server_ip"]
server_port = server["server_port"]
logger.debug("Pinging {internal_ip} on port {server_port}")
logger.debug(f"Pinging {internal_ip} on port {server_port}")
if helper_servers.get_server_type_by_id(server_id) != "minecraft-bedrock":
int_mc_ping = ping(internal_ip, int(server_port))

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

@ -3,6 +3,7 @@ import cmd
import time
import threading
import logging
from app.classes.shared.console import Console
from app.classes.shared.import3 import import3
@ -13,7 +14,6 @@ class MainPrompt(cmd.Cmd):
def __init__(self, helper, tasks_manager, migration_manager):
super().__init__()
self.helper = helper
self.console = self.helper.console
self.tasks_manager = tasks_manager
self.migration_manager = migration_manager
# overrides the default Prompt
@ -34,20 +34,20 @@ class MainPrompt(cmd.Cmd):
elif line == "down":
self.migration_manager.down()
elif line == "done":
self.console.info(self.migration_manager.done)
Console.info(self.migration_manager.done)
elif line == "todo":
self.console.info(self.migration_manager.todo)
Console.info(self.migration_manager.todo)
elif line == "diff":
self.console.info(self.migration_manager.diff)
Console.info(self.migration_manager.diff)
elif line == "info":
self.console.info(f"Done: {self.migration_manager.done}")
self.console.info(f"FS: {self.migration_manager.todo}")
self.console.info(f"Todo: {self.migration_manager.diff}")
Console.info(f"Done: {self.migration_manager.done}")
Console.info(f"FS: {self.migration_manager.todo}")
Console.info(f"Todo: {self.migration_manager.diff}")
elif line.startswith("add "):
migration_name = line[len("add ") :]
self.migration_manager.create(migration_name, False)
else:
self.console.info("Unknown migration command")
Console.info("Unknown migration command")
@staticmethod
def do_threads(_line):
@ -65,21 +65,21 @@ class MainPrompt(cmd.Cmd):
def universal_exit(self):
logger.info("Stopping all server daemons / threads")
self.console.info(
Console.info(
"Stopping all server daemons / threads - This may take a few seconds"
)
self.helper.websocket_helper.disconnect_all()
self.console.info("Waiting for main thread to stop")
Console.info("Waiting for main thread to stop")
while True:
if self.tasks_manager.get_main_thread_run_status():
sys.exit(0)
time.sleep(1)
def help_exit(self):
self.console.help("Stops the server if running, Exits the program")
Console.help("Stops the server if running, Exits the program")
def help_migrations(self):
self.console.help("Only for advanced users. Use with caution")
Console.help("Only for advanced users. Use with caution")
def help_import3(self):
self.console.help("Import users and servers from Crafty 3")
Console.help("Import users and servers from Crafty 3")

60
app/classes/shared/console.py
View File

@ -28,44 +28,56 @@ class Console:
else:
print(message)
def magenta(self, message):
self.do_print(message, "magenta")
@staticmethod
def magenta(message):
Console.do_print(message, "magenta")
def cyan(self, message):
self.do_print(message, "cyan")
@staticmethod
def cyan(message):
Console.do_print(message, "cyan")
def yellow(self, message):
self.do_print(message, "yellow")
@staticmethod
def yellow(message):
Console.do_print(message, "yellow")
def red(self, message):
self.do_print(message, "red")
@staticmethod
def red(message):
Console.do_print(message, "red")
def green(self, message):
self.do_print(message, "green")
@staticmethod
def green(message):
Console.do_print(message, "green")
def white(self, message):
self.do_print(message, "white")
@staticmethod
def white(message):
Console.do_print(message, "white")
def debug(self, message):
@staticmethod
def debug(message):
dt = datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
self.magenta(f"[+] Crafty: {dt} - DEBUG:\t{message}")
Console.magenta(f"[+] Crafty: {dt} - DEBUG:\t{message}")
def info(self, message):
@staticmethod
def info(message):
dt = datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
self.white(f"[+] Crafty: {dt} - INFO:\t{message}")
Console.white(f"[+] Crafty: {dt} - INFO:\t{message}")
def warning(self, message):
@staticmethod
def warning(message):
dt = datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
self.cyan(f"[+] Crafty: {dt} - WARNING:\t{message}")
Console.cyan(f"[+] Crafty: {dt} - WARNING:\t{message}")
def error(self, message):
@staticmethod
def error(message):
dt = datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
self.yellow(f"[+] Crafty: {dt} - ERROR:\t{message}")
Console.yellow(f"[+] Crafty: {dt} - ERROR:\t{message}")
def critical(self, message):
@staticmethod
def critical(message):
dt = datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
self.red(f"[+] Crafty: {dt} - CRITICAL:\t{message}")
Console.red(f"[+] Crafty: {dt} - CRITICAL:\t{message}")
def help(self, message):
@staticmethod
def help(message):
dt = datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
self.green(f"[+] Crafty: {dt} - HELP:\t{message}")
Console.green(f"[+] Crafty: {dt} - HELP:\t{message}")

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

@ -19,6 +19,7 @@ from socket import gethostname
from contextlib import suppress
import psutil
from app.classes.shared.console import Console
from app.classes.shared.installer import installer
from app.classes.shared.file_helpers import FileHelpers
from app.classes.shared.translation import Translation
@ -41,8 +42,7 @@ except ModuleNotFoundError as err:
class Helpers:
allowed_quotes = ['"', "'", "`"]
def __init__(self, console):
self.console = console
def __init__(self):
self.root_dir = os.path.abspath(os.path.curdir)
self.config_dir = os.path.join(self.root_dir, "app", "config")
self.webroot = os.path.join(self.root_dir, "app", "frontend")
@ -200,14 +200,14 @@ class Helpers:
else:
logger.error(f"Config File Error: setting {key} does not exist")
self.console.error(f"Config File Error: setting {key} does not exist")
Console.error(f"Config File Error: setting {key} does not exist")
return default_return
except Exception as e:
logger.critical(
f"Config File Error: Unable to read {self.settings_file} due to {e}"
)
self.console.critical(
Console.critical(
f"Config File Error: Unable to read {self.settings_file} due to {e}"
)
@ -224,7 +224,7 @@ class Helpers:
else:
logger.error(f"Config File Error: setting {key} does not exist")
self.console.error(f"Config File Error: setting {key} does not exist")
Console.error(f"Config File Error: setting {key} does not exist")
return default_return
with open(self.settings_file, "w", encoding="utf-8") as f:
@ -234,7 +234,7 @@ class Helpers:
logger.critical(
f"Config File Error: Unable to read {self.settings_file} due to {e}"
)
self.console.critical(
Console.critical(
f"Config File Error: Unable to read {self.settings_file} due to {e}"
)
@ -260,7 +260,7 @@ class Helpers:
version_data = json.load(f)
except Exception as e:
self.console.critical(f"Unable to get version data! \n{e}")
Console.critical(f"Unable to get version data! \n{e}")
return version_data
@ -470,13 +470,13 @@ class Helpers:
with suppress(FileExistsError):
os.makedirs(os.path.join(self.root_dir, "logs"))
except Exception as e:
self.console.error(f"Failed to make logs directory with error: {e} ")
Console.error(f"Failed to make logs directory with error: {e} ")
# ensure the log file is there
try:
open(log_file, "a", encoding="utf-8").close()
except Exception as e:
self.console.critical(f"Unable to open log file! {e}")
Console.critical(f"Unable to open log file! {e}")
sys.exit(1)
# del any old session.lock file as this is a new session
@ -576,7 +576,7 @@ class Helpers:
pid = data.get("pid")
started = data.get("started")
if psutil.pid_exists(pid):
self.console.critical(
Console.critical(
f"Another Crafty Controller agent seems to be running..."
f"\npid: {pid} \nstarted on: {started}"
)
@ -591,7 +591,7 @@ class Helpers:
except Exception as e:
logger.error(f"Failed to locate existing session.lock with error: {e} ")
self.console.error(
Console.error(
f"Failed to locate existing session.lock with error: {e} "
)
@ -693,12 +693,12 @@ class Helpers:
logger.info("Cert and Key files already exists, not creating them.")
return True
self.console.info("Generating a self signed SSL")
Console.info("Generating a self signed SSL")
logger.info("Generating a self signed SSL")
# create a key pair
logger.info("Generating a key pair. This might take a moment.")
self.console.info("Generating a key pair. This might take a moment.")
Console.info("Generating a key pair. This might take a moment.")
k = crypto.PKey()
k.generate_key(crypto.TYPE_RSA, 4096)

16
app/classes/shared/import3.py
View File

@ -3,6 +3,7 @@ import os
import logging
from app.classes.controllers.users_controller import helper_users
from app.classes.shared.console import Console
logger = logging.getLogger(__name__)
@ -10,7 +11,6 @@ logger = logging.getLogger(__name__)
class import3:
def __init__(self, helper, controller):
self.helper = helper
self.console = self.helper.console
self.controller = controller
def start_import(self):
@ -21,13 +21,11 @@ class import3:
)
)
if not os.path.exists(folder):
self.console.info(
Console.info(
"Crafty cannot find the path you entered. "
"Does Crafty's user have permission to access it?"
)
self.console.info(
"Please run the import3 command again and enter a valid path."
)
Console.info("Please run the import3 command again and enter a valid path.")
else:
with open(os.path.join(folder, "users.json"), encoding="utf-8") as f:
user_json = json.loads(f.read())
@ -41,10 +39,10 @@ class import3:
if isinstance(json_data, list):
for user in json_data:
helper_users.add_rawpass_user(user["username"], user["password"])
self.console.info(f"Imported user {user['username']} from Crafty 3")
Console.info(f"Imported user {user['username']} from Crafty 3")
logger.info(f"Imported user {user['username']} from Crafty 3")
else:
self.console.info(
Console.info(
"There is only one user detected. "
"Cannot create duplicate Admin account."
)
@ -65,7 +63,7 @@ class import3:
max_mem=(int(server["memory_max"]) / 1000),
port=server["server_port"],
)
self.console.info(
Console.info(
f"Imported server {server['server_name']}[{server['id']}] "
f"from Crafty 3 to new server id {new_server_id}"
)
@ -82,7 +80,7 @@ class import3:
max_mem=(int(json_data["memory_max"]) / 1000),
port=json_data["server_port"],
)
self.console.info(
Console.info(
f"Imported server {json_data['server_name']}[{json_data['id']}] "
f"from Crafty 3 to new server id {new_server_id}"
)

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

@ -23,6 +23,7 @@ from app.classes.models.users import helper_users
from app.classes.models.management import helpers_management
from app.classes.models.servers import helper_servers
from app.classes.shared.authentication import Authentication
from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
from app.classes.shared.server import Server
from app.classes.shared.file_helpers import FileHelpers
@ -36,7 +37,6 @@ logger = logging.getLogger(__name__)
class Controller:
def __init__(self, database, helper):
self.helper = helper
self.console = self.helper.console
self.server_jars = ServerJars(helper)
self.users_helper = helper_users(database, self.helper)
self.servers_helper = helper_servers(database)
@ -94,7 +94,7 @@ class Controller:
f"Skipping this server"
)
self.console.warning(
Console.warning(
f"Unable to find server {s['server_name']} at path {s['path']}. "
f"Skipping this server"
)
@ -107,9 +107,7 @@ class Controller:
# if the properties file isn't there, let's warn
if not Helpers.check_file_exists(settings_file):
logger.error(f"Unable to find {settings_file}. Skipping this server.")
self.console.error(
f"Unable to find {settings_file}. Skipping this server."
)
Console.error(f"Unable to find {settings_file}. Skipping this server.")
continue
settings = ServerProps(settings_file)
@ -132,7 +130,7 @@ class Controller:
self.refresh_server_settings(s["server_id"])
self.console.info(
Console.info(
f"Loaded Server: ID {s['server_id']}"
+ f" | Name: {s['server_name']}"
+ f" | Autostart: {s['auto_start']}"
@ -314,14 +312,14 @@ class Controller:
def stop_all_servers(self):
servers = self.list_running_servers()
logger.info(f"Found {len(servers)} running server(s)")
self.console.info(f"Found {len(servers)} running server(s)")
Console.info(f"Found {len(servers)} running server(s)")
logger.info("Stopping All Servers")
self.console.info("Stopping All Servers")
Console.info("Stopping All Servers")
for s in servers:
logger.info(f"Stopping Server ID {s['id']} - {s['name']}")
self.console.info(f"Stopping Server ID {s['id']} - {s['name']}")
Console.info(f"Stopping Server ID {s['id']} - {s['name']}")
self.stop_server(s["id"])
@ -329,7 +327,7 @@ class Controller:
time.sleep(2)
logger.info("All Servers Stopped")
self.console.info("All Servers Stopped")
Console.info("All Servers Stopped")
def stop_server(self, server_id):
# issue the stop command
@ -807,9 +805,7 @@ class Controller:
server_name = server_data["server_name"]
logger.info(f"Deleting Server: ID {server_id} | Name: {server_name} ")
self.console.info(
f"Deleting Server: ID {server_id} | Name: {server_name} "
)
Console.info(f"Deleting Server: ID {server_id} | Name: {server_name} ")
srv_obj = s["server_obj"]
running = srv_obj.check_running()

5
app/classes/shared/migration.py
View File

@ -16,6 +16,7 @@ from playhouse.migrate import (
make_index_name,
)
from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
logger = logging.getLogger(__name__)
@ -398,13 +399,13 @@ class MigrationManager(object):
Runs all unapplied migrations.
"""
logger.info("Starting migrations")
self.helper.console.info("Starting migrations")
Console.info("Starting migrations")
done = []
diff = self.diff
if not diff:
logger.info("There is nothing to migrate")
self.helper.console.info("There is nothing to migrate")
Console.info("There is nothing to migrate")
return done
migrator = self.migrator

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

@ -20,6 +20,7 @@ from app.classes.models.servers import Server_Stats, helper_servers
from app.classes.models.management import helpers_management
from app.classes.models.users import helper_users
from app.classes.models.server_permissions import Permissions_Servers
from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
from app.classes.shared.file_helpers import FileHelpers
@ -93,7 +94,6 @@ class Server:
def __init__(self, helper, management_helper, stats):
self.helper = helper
self.management_helper = management_helper
self.console = self.helper.console
# holders for our process
self.process = None
self.line = False
@ -149,9 +149,7 @@ class Server:
delay = int(self.settings["auto_start_delay"])
logger.info(f"Scheduling server {self.name} to start in {delay} seconds")
self.console.info(
f"Scheduling server {self.name} to start in {delay} seconds"
)
Console.info(f"Scheduling server {self.name} to start in {delay} seconds")
self.server_scheduler.add_job(
self.run_scheduled_server,
@ -161,7 +159,7 @@ class Server:
)
def run_scheduled_server(self):
self.console.info(f"Starting server ID: {self.server_id} - {self.name}")
Console.info(f"Starting server ID: {self.server_id} - {self.name}")
logger.info(f"Starting server ID: {self.server_id} - {self.name}")
# Sets waiting start to false since we're attempting to start the server.
helper_servers.set_waiting_start(self.server_id, False)
@ -182,7 +180,7 @@ class Server:
# Register an shedule for polling server stats when running
logger.info(f"Polling server statistics {self.name} every {5} seconds")
self.console.info(f"Polling server statistics {self.name} every {5} seconds")
Console.info(f"Polling server statistics {self.name} every {5} seconds")
try:
self.server_scheduler.add_job(
self.realtime_stats,
@ -213,19 +211,17 @@ class Server:
logger.critical(
f"Server executable path: {full_path} does not seem to exist"
)
self.console.critical(
Console.critical(
f"Server executable path: {full_path} does not seem to exist"
)
if not Helpers.check_path_exists(self.server_path):
logger.critical(f"Server path: {self.server_path} does not seem to exits")
self.console.critical(
f"Server path: {self.server_path} does not seem to exits"
)
Console.critical(f"Server path: {self.server_path} does not seem to exits")
if not Helpers.check_writeable(self.server_path):
logger.critical(f"Unable to write/access {self.server_path}")
self.console.critical(f"Unable to write/access {self.server_path}")
Console.critical(f"Unable to write/access {self.server_path}")
def start_server(self, user_id):
if not user_id:
@ -253,16 +249,14 @@ class Server:
# fail safe in case we try to start something already running
if self.check_running():
logger.error("Server is already running - Cancelling Startup")
self.console.error("Server is already running - Cancelling Startup")
Console.error("Server is already running - Cancelling Startup")
return False
if self.check_update():
logger.error("Server is updating. Terminating startup.")
return False
logger.info(f"Launching Server {self.name} with command {self.server_command}")
self.console.info(
f"Launching Server {self.name} with command {self.server_command}"
)
Console.info(f"Launching Server {self.name} with command {self.server_command}")
# Checks for eula. Creates one if none detected.
# If EULA is detected and not set to true we offer to set it true.
@ -424,7 +418,7 @@ class Server:
if self.process.poll() is None:
logger.info(f"Server {self.name} running with PID {self.process.pid}")
self.console.info(f"Server {self.name} running with PID {self.process.pid}")
Console.info(f"Server {self.name} running with PID {self.process.pid}")
self.is_crashed = False
helper_servers.server_crash_reset(self.server_id)
self.record_server_stats()
@ -471,7 +465,7 @@ class Server:
f"Server PID {self.process.pid} died right after starting "
f"- is this a server config issue?"
)
self.console.critical(
Console.critical(
f"Server PID {self.process.pid} died right after starting "
f"- is this a server config issue?"
)
@ -481,7 +475,7 @@ class Server:
f"Server {self.name} has crash detection enabled "
f"- starting watcher task"
)
self.console.info(
Console.info(
f"Server {self.name} has crash detection enabled "
f"- starting watcher task"
)
@ -524,7 +518,7 @@ class Server:
f"Server {self.name} has crash detection enabled "
f"- starting watcher task"
)
self.console.info(
Console.info(
f"Server {self.name} has crash detection enabled "
"- starting watcher task"
)
@ -557,7 +551,7 @@ class Server:
running = self.check_running()
if not running:
logger.info(f"Can't stop server {self.name} if it's not running")
self.console.info(f"Can't stop server {self.name} if it's not running")
Console.info(f"Can't stop server {self.name} if it's not running")
return
x = 0
@ -573,7 +567,7 @@ class Server:
f"seconds until force close)"
)
logger.info(logstr)
self.console.info(logstr)
Console.info(logstr)
running = self.check_running()
time.sleep(2)
@ -582,13 +576,13 @@ class Server:
logger.info(
f"Server {server_name} is still running - Forcing the process down"
)
self.console.info(
Console.info(
f"Server {server_name} is still running - Forcing the process down"
)
self.kill()
logger.info(f"Stopped Server {server_name} with PID {server_pid}")
self.console.info(f"Stopped Server {server_name} with PID {server_pid}")
Console.info(f"Stopped Server {server_name} with PID {server_pid}")
# massive resetting of variables
self.cleanup_server_object()
@ -633,7 +627,7 @@ class Server:
if not self.check_running() and command.lower() != "start":
logger.warning(f'Server not running, unable to send command "{command}"')
return False
self.console.info(f"COMMAND TIME: {command}")
Console.info(f"COMMAND TIME: {command}")
logger.debug(f"Sending command {command} to server")
# send it
@ -657,7 +651,7 @@ class Server:
f"The server {name} has crashed and will be restarted. "
f"Restarting server"
)
self.console.critical(
Console.critical(
f"The server {name} has crashed and will be restarted. "
f"Restarting server"
)
@ -668,7 +662,7 @@ class Server:
f"The server {name} has crashed, "
f"crash detection is disabled and it will not be restarted"
)
self.console.critical(
Console.critical(
f"The server {name} has crashed, "
f"crash detection is disabled and it will not be restarted"
)
@ -737,7 +731,7 @@ class Server:
f"Server {self.name} has been restarted {self.restart_count}"
f" times. It has crashed, not restarting."
)
self.console.critical(
Console.critical(
f"Server {self.name} has been restarted {self.restart_count}"
f" times. It has crashed, not restarting."
)
@ -751,7 +745,7 @@ class Server:
def remove_watcher_thread(self):
logger.info("Removing old crash detection watcher thread")
self.console.info("Removing old crash detection watcher thread")
Console.info("Removing old crash detection watcher thread")
self.server_scheduler.remove_job("c_" + str(self.server_id))
def agree_eula(self, user_id):
@ -1184,7 +1178,7 @@ class Server:
"/status", "update_server_status", servers_ping
)
except:
self.console.critical("Can't broadcast server status to websocket")
Console.critical("Can't broadcast server status to websocket")
def get_servers_stats(self):
@ -1211,7 +1205,7 @@ class Server:
server_port = server["server_port"]
server_name = server.get("server_name", f"ID#{server_id}")
logger.debug("Pinging server '{server}' on {internal_ip}:{server_port}")
logger.debug(f"Pinging server '{server}' on {internal_ip}:{server_port}")
if helper_servers.get_server_type_by_id(server_id) == "minecraft-bedrock":
int_mc_ping = ping_bedrock(internal_ip, int(server_port))
else:
@ -1285,7 +1279,7 @@ class Server:
internal_ip = server["server_ip"]
server_port = server["server_port"]
logger.debug("Pinging {internal_ip} on port {server_port}")
logger.debug(f"Pinging {internal_ip} on port {server_port}")
if helper_servers.get_server_type_by_id(self.server_id) != "minecraft-bedrock":
int_mc_ping = ping(internal_ip, int(server_port))

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

@ -11,6 +11,7 @@ from apscheduler.triggers.cron import CronTrigger
from app.classes.models.management import helpers_management
from app.classes.models.users import helper_users
from app.classes.shared.console import Console
from app.classes.web.tornado_handler import Webserver
logger = logging.getLogger("apscheduler")
@ -119,7 +120,7 @@ class TasksManager:
logger.info("Caught error during shutdown", exc_info=True)
logger.info("***** Crafty Shutting Down *****\n\n")
self.helper.console.info("***** Crafty Shutting Down *****\n\n")
Console.info("***** Crafty Shutting Down *****\n\n")
self.main_thread_exiting = True
def start_webserver(self):
@ -127,7 +128,7 @@ class TasksManager:
def reload_webserver(self):
self.tornado.stop_web_server()
self.helper.console.info("Waiting 3 seconds")
Console.info("Waiting 3 seconds")
time.sleep(3)
self.webserver_thread = threading.Thread(
target=self.tornado.run_tornado, daemon=True, name="tornado_thread"
@ -139,16 +140,16 @@ class TasksManager:
def start_scheduler(self):
logger.info("Launching Scheduler Thread...")
self.helper.console.info("Launching Scheduler Thread...")
Console.info("Launching Scheduler Thread...")
self.schedule_thread.start()
logger.info("Launching command thread...")
self.helper.console.info("Launching command thread...")
Console.info("Launching command thread...")
self.command_thread.start()
logger.info("Launching log watcher...")
self.helper.console.info("Launching log watcher...")
Console.info("Launching log watcher...")
self.log_watcher_thread.start()
logger.info("Launching realtime thread...")
self.helper.console.info("Launching realtime thread...")
Console.info("Launching realtime thread...")
self.realtime_thread.start()
def scheduler_thread(self):
@ -177,10 +178,8 @@ class TasksManager:
],
)
except Exception as e:
self.helper.console.error(
f"Failed to schedule task with error: {e}."
)
self.helper.console.warning("Removing failed task from DB.")
Console.error(f"Failed to schedule task with error: {e}.")
Console.warning("Removing failed task from DB.")
logger.error(f"Failed to schedule task with error: {e}.")
logger.warning("Removing failed task from DB.")
# remove items from DB if task fails to add to apscheduler
@ -274,10 +273,8 @@ class TasksManager:
],
)
except Exception as e:
self.helper.console.error(
f"Failed to schedule task with error: {e}."
)
self.helper.console.warning("Removing failed task from DB.")
Console.error(f"Failed to schedule task with error: {e}.")
Console.warning("Removing failed task from DB.")
logger.error(f"Failed to schedule task with error: {e}.")
logger.warning("Removing failed task from DB.")
# remove items from DB if task fails to add to apscheduler
@ -387,10 +384,8 @@ class TasksManager:
],
)
except Exception as e:
self.helper.console.error(
f"Failed to schedule task with error: {e}."
)
self.helper.console.info("Removing failed task from DB.")
Console.error(f"Failed to schedule task with error: {e}.")
Console.info("Removing failed task from DB.")
self.controller.management_helper.delete_scheduled_task(sch_id)
else:
if job_data["interval_type"] == "hours":
@ -499,7 +494,7 @@ class TasksManager:
logger.info(
f"Stats collection frequency set to {stats_update_frequency} seconds"
)
self.helper.console.info(
Console.info(
f"Stats collection frequency set to {stats_update_frequency} seconds"
)

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

@ -3,6 +3,8 @@ import logging
import os
import typing as t
from app.classes.shared.console import Console
logger = logging.getLogger(__name__)
@ -59,7 +61,7 @@ class Translation:
f"Translation File Error: page {page} "
f"does not exist for lang {language}"
)
self.helper.console.error(
Console.error(
f"Translation File Error: page {page} "
f"does not exist for lang {language}"
)
@ -73,7 +75,7 @@ class Translation:
f"Translation File Error: word {word} does not exist on page "
f"{page} for lang {language}"
)
self.helper.console.error(
Console.error(
f"Translation File Error: word {word} does not exist on page "
f"{page} for lang {language}"
)
@ -83,7 +85,7 @@ class Translation:
logger.critical(
f"Translation File Error: Unable to read {language_file} due to {e}"
)
self.helper.console.critical(
Console.critical(
f"Translation File Error: Unable to read {language_file} due to {e}"
)
return None

15
app/classes/web/ajax_handler.py
View File

@ -8,6 +8,7 @@ import tornado.web
import tornado.escape
from app.classes.models.server_permissions import Enum_Permissions_Server
from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
from app.classes.shared.server import ServerOutBuf
from app.classes.web.base_handler import BaseHandler
@ -283,9 +284,7 @@ class AjaxHandler(BaseHandler):
if server_id is None:
logger.warning("Server ID not found in send_command ajax call")
self.helper.console.warning(
"Server ID not found in send_command ajax call"
)
Console.warning("Server ID not found in send_command ajax call")
srv_obj = self.controller.get_server_obj(server_id)
@ -484,7 +483,7 @@ class AjaxHandler(BaseHandler):
)
server_id = self.get_argument("id", None)
self.helper.console.warning(f"Delete {file_path} for server {server_id}")
Console.warning(f"Delete {file_path} for server {server_id}")
if not self.check_server_id(server_id, "del_backup"):
return
@ -502,9 +501,7 @@ class AjaxHandler(BaseHandler):
)
) or not Helpers.check_file_exists(os.path.abspath(file_path)):
logger.warning(f"Invalid path in del_backup ajax call ({file_path})")
self.helper.console.warning(
f"Invalid path in del_backup ajax call ({file_path})"
)
Console.warning(f"Invalid path in del_backup ajax call ({file_path})")
return
# Delete the file
@ -567,7 +564,7 @@ class AjaxHandler(BaseHandler):
logger.warning(
f"Server ID not defined in {page_name} ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Server ID not defined in {page_name} ajax call ({server_id})"
)
return
@ -579,7 +576,7 @@ class AjaxHandler(BaseHandler):
logger.warning(
f"Server ID not found in {page_name} ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Server ID not found in {page_name} ajax call ({server_id})"
)
return

41
app/classes/web/file_handler.py
View File

@ -5,6 +5,7 @@ import tornado.web
import tornado.escape
from app.classes.models.server_permissions import Enum_Permissions_Server
from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
from app.classes.shared.file_helpers import FileHelpers
from app.classes.web.base_handler import BaseHandler
@ -66,7 +67,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid path in get_file file file ajax call ({file_path})"
)
self.helper.self.helper.console.warning(
Console.warning(
f"Invalid path in get_file file file ajax call ({file_path})"
)
return
@ -175,7 +176,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid path in create_file file ajax call ({file_path})"
)
self.helper.self.helper.console.warning(
Console.warning(
f"Invalid path in create_file file ajax call ({file_path})"
)
return
@ -209,7 +210,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid path in create_dir file ajax call ({dir_path})"
)
self.helper.self.helper.console.warning(
Console.warning(
f"Invalid path in create_dir file ajax call ({dir_path})"
)
return
@ -257,9 +258,7 @@ class FileHandler(BaseHandler):
self.get_body_argument("file_path", default=None, strip=True)
)
self.helper.self.helper.console.warning(
f"Delete {file_path} for server {server_id}"
)
Console.warning(f"Delete {file_path} for server {server_id}")
if not self.check_server_id(server_id, "del_file"):
return
@ -277,7 +276,7 @@ class FileHandler(BaseHandler):
)
) or not Helpers.check_file_exists(os.path.abspath(file_path)):
logger.warning(f"Invalid path in del_file file ajax call ({file_path})")
self.helper.console.warning(
Console.warning(
f"Invalid path in del_file file ajax call ({file_path})"
)
return
@ -294,7 +293,7 @@ class FileHandler(BaseHandler):
self.get_body_argument("dir_path", default=None, strip=True)
)
self.helper.console.warning(f"Delete {dir_path} for server {server_id}")
Console.warning(f"Delete {dir_path} for server {server_id}")
if not self.check_server_id(server_id, "del_dir"):
return
@ -306,9 +305,7 @@ class FileHandler(BaseHandler):
Helpers.get_os_understandable_path(server_info["path"]), dir_path
) or not Helpers.check_path_exists(os.path.abspath(dir_path)):
logger.warning(f"Invalid path in del_file file ajax call ({dir_path})")
self.helper.console.warning(
f"Invalid path in del_file file ajax call ({dir_path})"
)
Console.warning(f"Invalid path in del_file file ajax call ({dir_path})")
return
# Delete the directory
@ -366,7 +363,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid path in save_file file ajax call ({file_path})"
)
self.helper.console.warning(
Console.warning(
f"Invalid path in save_file file ajax call ({file_path})"
)
return
@ -394,9 +391,7 @@ class FileHandler(BaseHandler):
if item_path is None or new_item_name is None:
logger.warning("Invalid path(s) in rename_file file ajax call")
self.helper.console.warning(
"Invalid path(s) in rename_file file ajax call"
)
Console.warning("Invalid path(s) in rename_file file ajax call")
return
if not Helpers.in_path(
@ -408,7 +403,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid old name path in rename_file file ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Invalid old name path in rename_file file ajax call ({server_id})"
)
return
@ -424,7 +419,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid new name path in rename_file file ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Invalid new name path in rename_file file ajax call ({server_id})"
)
return
@ -472,9 +467,7 @@ class FileHandler(BaseHandler):
if item_path is None or new_item_name is None:
logger.warning("Invalid path(s) in rename_file file ajax call")
self.helper.console.warning(
"Invalid path(s) in rename_file file ajax call"
)
Console.warning("Invalid path(s) in rename_file file ajax call")
return
if not Helpers.in_path(
@ -486,7 +479,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid old name path in rename_file file ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Invalid old name path in rename_file file ajax call ({server_id})"
)
return
@ -502,7 +495,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Invalid new name path in rename_file file ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Invalid new name path in rename_file file ajax call ({server_id})"
)
return
@ -515,7 +508,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Server ID not defined in {page_name} file ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Server ID not defined in {page_name} file ajax call ({server_id})"
)
return
@ -527,7 +520,7 @@ class FileHandler(BaseHandler):
logger.warning(
f"Server ID not found in {page_name} file ajax call ({server_id})"
)
self.helper.console.warning(
Console.warning(
f"Server ID not found in {page_name} file ajax call ({server_id})"
)
return

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

@ -11,6 +11,7 @@ import tornado.escape
import tornado.locale
import tornado.httpserver
from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
from app.classes.web.file_handler import FileHandler
from app.classes.web.public_handler import PublicHandler
@ -211,21 +212,21 @@ class Webserver:
f"https://{Helpers.get_local_ip()}:{https_port} "
f"is up and ready for connections."
)
self.helper.console.info(
Console.info(
f"https://{Helpers.get_local_ip()}:{https_port} "
f"is up and ready for connections."
)
self.helper.console.info("Server Init Complete: Listening For Connections:")
Console.info("Server Init Complete: Listening For Connections:")
self.ioloop = tornado.ioloop.IOLoop.current()
self.ioloop.start()
def stop_web_server(self):
logger.info("Shutting Down Web Server")
self.helper.console.info("Shutting Down Web Server")
Console.info("Shutting Down Web Server")
self.ioloop.stop()
self.HTTP_Server.stop()
self.HTTPS_Server.stop()
logger.info("Web Server Stopped")
self.helper.console.info("Web Server Stopped")
Console.info("Web Server Stopped")

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

@ -6,6 +6,7 @@ import tornado.options
import tornado.httpserver
from app.classes.models.server_permissions import Enum_Permissions_Server
from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
from app.classes.shared.main_controller import Controller
from app.classes.web.base_handler import BaseHandler
@ -82,12 +83,12 @@ class UploadHandler(BaseHandler):
if user_id is None:
logger.warning("User ID not found in upload handler call")
self.helper.console.warning("User ID not found in upload handler call")
Console.warning("User ID not found in upload handler call")
self.do_upload = False
if server_id is None:
logger.warning("Server ID not found in upload handler call")
self.helper.console.warning("Server ID not found in upload handler call")
Console.warning("Server ID not found in upload handler call")
self.do_upload = False
if Enum_Permissions_Server.Files not in exec_user_server_permissions:
@ -95,7 +96,7 @@ class UploadHandler(BaseHandler):
f"User {user_id} tried to upload a file to "
f"{server_id} without permissions!"
)
self.helper.console.warning(
Console.warning(
f"User {user_id} tried to upload a file to "
f"{server_id} without permissions!"
)
@ -123,7 +124,7 @@ class UploadHandler(BaseHandler):
f"User {user_id} tried to upload a file to {server_id} "
f"but the path is not inside of the server!"
)
self.helper.console.warning(
Console.warning(
f"User {user_id} tried to upload a file to {server_id} "
f"but the path is not inside of the server!"
)

6
app/classes/web/websocket_helper.py
View File

@ -1,6 +1,8 @@
import json
import logging
from app.classes.shared.console import Console
logger = logging.getLogger(__name__)
@ -100,7 +102,7 @@ class WebSocketHelper:
)
def disconnect_all(self):
self.helper.console.info("Disconnecting WebSocket clients")
Console.info("Disconnecting WebSocket clients")
for client in self.clients:
client.close()
self.helper.console.info("Disconnected WebSocket clients")
Console.info("Disconnected WebSocket clients")

30
main.py
View File

@ -11,14 +11,14 @@ from app.classes.shared.console import Console
from app.classes.shared.helpers import Helpers
console = Console()
helper = Helpers(console)
helper = Helpers()
if helper.checkRoot():
console.critical(
Console.critical(
"Root detected. Root/Admin access denied. "
"Run Crafty again with non-elevated permissions."
)
time.sleep(5)
console.critical("Crafty shutting down. Root/Admin access denied.")
Console.critical("Crafty shutting down. Root/Admin access denied.")
sys.exit(0)
# pylint: disable=wrong-import-position
try:
@ -46,7 +46,7 @@ def do_intro():
{'/' * 75}
"""
console.magenta(intro)
Console.magenta(intro)
def setup_logging(debug=True):
@ -64,7 +64,7 @@ def setup_logging(debug=True):
else:
logging.basicConfig(level=logging.DEBUG)
logging.warning(f"Unable to read logging config from {logging_config_file}")
console.critical(f"Unable to read logging config from {logging_config_file}")
Console.critical(f"Unable to read logging config from {logging_config_file}")
# Our Main Starter
@ -94,7 +94,7 @@ if __name__ == "__main__":
# setting up the logger object
logger = logging.getLogger(__name__)
console.cyan(f"Logging set to: {logger.level}")
Console.cyan(f"Logging set to: {logger.level}")
peewee_logger = logging.getLogger("peewee")
peewee_logger.setLevel(logging.INFO)
@ -119,8 +119,8 @@ if __name__ == "__main__":
fresh_install = installer.is_fresh_install()
if fresh_install:
console.debug("Fresh install detected")
console.warning(
Console.debug("Fresh install detected")
Console.warning(
f"We have detected a fresh install. Please be sure to forward "
f"Crafty's port, {helper.get_setting('https_port')}, "
f"through your router/firewall if you would like to be able "
@ -128,7 +128,7 @@ if __name__ == "__main__":
)
installer.default_settings()
else:
console.debug("Existing install detected")
Console.debug("Existing install detected")
# now the tables are created, we can load the tasks_manger and server controller
controller = Controller(database, helper)
@ -140,7 +140,7 @@ if __name__ == "__main__":
# init servers
logger.info("Initializing all servers defined")
console.info("Initializing all servers defined")
Console.info("Initializing all servers defined")
controller.init_all_servers()
servers = controller.list_defined_servers()
@ -156,10 +156,10 @@ if __name__ == "__main__":
tasks_manager.serverjar_cache_refresher()
logger.info("Checking Internet. This may take a minute.")
console.info("Checking Internet. This may take a minute.")
Console.info("Checking Internet. This may take a minute.")
if not helper.check_internet():
console.warning(
Console.warning(
"We have detected the machine running Crafty has no "
"connection to the internet. Client connections to "
"the server may be limited."
@ -180,7 +180,7 @@ if __name__ == "__main__":
logger.info(
f"Recieved {signal.Signals(sig[0]).name} [{sig[0]}], stopping Crafty..."
)
console.info(
Console.info(
f"Recieved {signal.Signals(sig[0]).name} [{sig[0]}], stopping Crafty..."
)
tasks_manager._main_graceful_exit()
@ -194,7 +194,7 @@ if __name__ == "__main__":
except KeyboardInterrupt:
print() # for newline
logger.info("Recieved SIGINT, stopping Crafty...")
console.info("Recieved SIGINT, stopping Crafty...")
Console.info("Recieved SIGINT, stopping Crafty...")
tasks_manager._main_graceful_exit()
Crafty.universal_exit()
else:
@ -206,7 +206,7 @@ if __name__ == "__main__":
time.sleep(1)
except KeyboardInterrupt:
logger.info("Recieved SIGINT, stopping Crafty...")
console.info("Recieved SIGINT, stopping Crafty...")
Console.info("Recieved SIGINT, stopping Crafty...")
break
tasks_manager._main_graceful_exit()
Crafty.universal_exit()