diff --git a/AirlockTools_Client.py b/AirlockTools_Client.py index 53e3f04..c80d29a 100644 --- a/AirlockTools_Client.py +++ b/AirlockTools_Client.py @@ -31,15 +31,15 @@ import utils.menus as menus from services.API import AirlockAPIWrapper from services.security import getAPI from utils.setup import get_base_directory, setup - +from utils.utils import irtang urllib3.disable_warnings( urllib3.exceptions.InsecureRequestWarning ) def main(): - + irtang() #Determine working directory, setup directory, configure logging, sent env, get API and URL if not already stored - + setup() base_dir = get_base_directory() logger = logging.getLogger(__name__) diff --git a/utils/menus.py b/utils/menus.py index 6a2daa7..d7ed3bf 100644 --- a/utils/menus.py +++ b/utils/menus.py @@ -41,6 +41,7 @@ from utils.utils import ( locked, open_directory, printEnforceChecklist, + clear_screen ) logger = logging.getLogger(__name__) @@ -51,6 +52,7 @@ def menu_main(api: AirlockAPIWrapper): working_dir = load_env("WORKING_DIR") extras = load_env("EXTRAS") while True: + clear_screen() displayIntro() # Add Settings, and give option to change working dir print(colorText("1. ✅ - Move Device(s) to local approval", "yellow")) diff --git a/utils/utils.py b/utils/utils.py index 61a6541..de52cf1 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -121,9 +121,8 @@ def regulator(paths, case_insensitive=True): pattern = "(?i)" + pattern # Add inline case-insensitive flag print(f"Regulator is providing: {pattern}") return pattern - -def displayIntro(): - print( +def irtang(): + print( colorText( r""" ███ @@ -152,6 +151,8 @@ def displayIntro(): "yellow", ) ) +def displayIntro(): + print( colorText( r""" @@ -618,4 +619,8 @@ def open_directory(path): def print_x_wide(items: list, width: int): for i in range(0, len(items), width): row = items[i:i+width] - print(" | ".join(row)) \ No newline at end of file + print(" | ".join(row)) + + +def clear_screen(): + os.system('cls' if os.name == 'nt' else 'clear')