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

Use constant variables for run mode and app path

Browse Source
This commit is contained in:
amcmanu3 2023-11-29 21:04:02 -05:00
parent 151f77589b
commit c13ebeaf51
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
main.py
View File

@ -20,6 +20,18 @@ from app.classes.shared.websocket_manager import WebSocketManager
console = Console() console = Console()
helper = Helpers() helper = Helpers()
# Get the path our application is running on.
if getattr(sys, "frozen", False):
APPLICATION_PATH = os.path.dirname(sys.executable)
RUNNING_MODE = "Frozen/executable"
else:
try:
app_full_path = os.path.realpath(__file__)
APPLICATION_PATH = os.path.dirname(app_full_path)
RUNNING_MODE = "Non-interactive (e.g. 'python main.py')"
except NameError:
APPLICATION_PATH = os.getcwd()
RUNNING_MODE = "Interactive"
if helper.check_root(): if helper.check_root():
Console.critical( Console.critical(
"Root detected. Root/Admin access denied. " "Root detected. Root/Admin access denied. "
@ -84,19 +96,7 @@ def controller_setup():
if not controller.check_system_user(): if not controller.check_system_user():
controller.add_system_user() controller.add_system_user()
if getattr(sys, "frozen", False): controller.set_project_root(APPLICATION_PATH)
application_path = os.path.dirname(sys.executable)
running_mode = "Frozen/executable"
else:
try:
app_full_path = os.path.realpath(__file__)
application_path = os.path.dirname(app_full_path)
running_mode = "Non-interactive (e.g. 'python main.py')"
except NameError:
application_path = os.getcwd()
running_mode = "Interactive"
controller.set_project_root(application_path)
master_server_dir = controller.management.get_master_server_dir() master_server_dir = controller.management.get_master_server_dir()
if master_server_dir == "": if master_server_dir == "":
logger.debug("Could not find master server path. Setting default") logger.debug("Could not find master server path. Setting default")
@ -106,8 +106,8 @@ def controller_setup():
else: else:
helper.servers_dir = master_server_dir helper.servers_dir = master_server_dir
Console.debug(f"Execution Mode: {running_mode}") Console.debug(f"Execution Mode: {RUNNING_MODE}")
Console.debug(f"Application path : '{application_path}'") Console.debug(f"Application path : '{APPLICATION_PATH}'")
controller.clear_support_status() controller.clear_support_status()