From 11cf75d4a6df2fd75acd23e328b458bcf42d8c64 Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Thu, 30 Nov 2017 14:08:12 -0800 Subject: [PATCH] Added clear_screen() --- .bin/Scripts/activate.py | 2 +- .bin/Scripts/cbs_fix.py | 2 +- .bin/Scripts/check_disk.py | 2 +- .bin/Scripts/dism.py | 2 +- .bin/Scripts/functions/common.py | 6 +++++- .bin/Scripts/install_sw_bundle.py | 2 +- .bin/Scripts/install_vcredists.py | 2 +- .bin/Scripts/safemode_enter.py | 2 +- .bin/Scripts/safemode_exit.py | 2 +- .bin/Scripts/sfc_scan.py | 2 +- .bin/Scripts/system_checklist.py | 2 +- .bin/Scripts/system_diagnostics.py | 2 +- .bin/Scripts/transferred_keys.py | 2 +- .bin/Scripts/update_kit.py | 2 +- .bin/Scripts/user_checklist.py | 2 +- .bin/Scripts/user_data_transfer.py | 4 ++-- 16 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.bin/Scripts/activate.py b/.bin/Scripts/activate.py index 3d068df6..3c25b512 100644 --- a/.bin/Scripts/activate.py +++ b/.bin/Scripts/activate.py @@ -13,7 +13,7 @@ os.system('title {}: Windows Activation Tool'.format(KIT_NAME_FULL)) if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: Windows Activation Tool\n'.format(KIT_NAME_FULL)) # Bail early if already activated if windows_is_activated(): diff --git a/.bin/Scripts/cbs_fix.py b/.bin/Scripts/cbs_fix.py index d0ef981e..7c845c34 100644 --- a/.bin/Scripts/cbs_fix.py +++ b/.bin/Scripts/cbs_fix.py @@ -16,7 +16,7 @@ if __name__ == '__main__': try: # Prep stay_awake() - os.system('cls') + clear_screen() folder_path = r'{}\Backups'.format(KIT_NAME_SHORT) dest = select_destination(folder_path=folder_path, prompt='Which disk are we using for temp data and backup?') diff --git a/.bin/Scripts/check_disk.py b/.bin/Scripts/check_disk.py index 10931de9..3091ecb5 100644 --- a/.bin/Scripts/check_disk.py +++ b/.bin/Scripts/check_disk.py @@ -14,7 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\Check Disk.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', diff --git a/.bin/Scripts/dism.py b/.bin/Scripts/dism.py index 4f33f63e..bbf2a74c 100644 --- a/.bin/Scripts/dism.py +++ b/.bin/Scripts/dism.py @@ -14,7 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\DISM helper tool.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py index 5657cf39..fc4ed20e 100644 --- a/.bin/Scripts/functions/common.py +++ b/.bin/Scripts/functions/common.py @@ -81,6 +81,10 @@ def ask(prompt='Kotaero!'): print_log(message=message) return answer +def clear_screen(): + """Simple wrapper for cls.""" + os.system('cls') + def convert_to_bytes(size): """Convert human-readable size str to bytes and return an int.""" size = str(size) @@ -259,7 +263,7 @@ def menu_select(title='~ Untitled Menu ~', answer = '' while (answer.upper() not in valid_answers): - os.system('cls') + clear_screen() print(menu_splash) answer = input('{}: '.format(prompt)) diff --git a/.bin/Scripts/install_sw_bundle.py b/.bin/Scripts/install_sw_bundle.py index a25f20a3..a18925bb 100644 --- a/.bin/Scripts/install_sw_bundle.py +++ b/.bin/Scripts/install_sw_bundle.py @@ -14,7 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\Install SW Bundle.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: SW Bundle Tool\n'.format(KIT_NAME_FULL)) other_results = { 'Error': { diff --git a/.bin/Scripts/install_vcredists.py b/.bin/Scripts/install_vcredists.py index e5a14cb0..4e7af362 100644 --- a/.bin/Scripts/install_vcredists.py +++ b/.bin/Scripts/install_vcredists.py @@ -14,7 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\Install Visual C++ Runtimes.log'.format(**gl if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: Install Visual C++ Runtimes\n'.format(KIT_NAME_FULL)) other_results = { 'Error': { diff --git a/.bin/Scripts/safemode_enter.py b/.bin/Scripts/safemode_enter.py index f0414375..032f626e 100644 --- a/.bin/Scripts/safemode_enter.py +++ b/.bin/Scripts/safemode_enter.py @@ -15,7 +15,7 @@ os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL)) if __name__ == '__main__': try: - os.system('cls') + clear_screen() print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL)) if not ask('Enable booting to SafeMode (with Networking)?'): abort() diff --git a/.bin/Scripts/safemode_exit.py b/.bin/Scripts/safemode_exit.py index a1328430..cbd6c8cb 100644 --- a/.bin/Scripts/safemode_exit.py +++ b/.bin/Scripts/safemode_exit.py @@ -15,7 +15,7 @@ os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL)) if __name__ == '__main__': try: - os.system('cls') + clear_screen() print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL)) if not ask('Disable booting to SafeMode?'): abort() diff --git a/.bin/Scripts/sfc_scan.py b/.bin/Scripts/sfc_scan.py index d99f4cf2..f816cd3b 100644 --- a/.bin/Scripts/sfc_scan.py +++ b/.bin/Scripts/sfc_scan.py @@ -14,7 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\SFC Tool.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: SFC Tool\n'.format(KIT_NAME_FULL)) other_results = { 'Error': { diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py index a5c9896f..889694c7 100644 --- a/.bin/Scripts/system_checklist.py +++ b/.bin/Scripts/system_checklist.py @@ -18,7 +18,7 @@ global_vars['LogFile'] = r'{LogDir}\System Checklist.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: System Checklist Tool\n'.format(KIT_NAME_FULL)) ticket_number = get_ticket_number() other_results = { diff --git a/.bin/Scripts/system_diagnostics.py b/.bin/Scripts/system_diagnostics.py index 62aeb85c..e5521874 100644 --- a/.bin/Scripts/system_diagnostics.py +++ b/.bin/Scripts/system_diagnostics.py @@ -19,7 +19,7 @@ global_vars['LogFile'] = r'{LogDir}\System Diagnostics.log'.format( if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: System Diagnostics Tool\n'.format(KIT_NAME_FULL)) ticket_number = get_ticket_number() other_results = { diff --git a/.bin/Scripts/transferred_keys.py b/.bin/Scripts/transferred_keys.py index 30598857..0634e862 100644 --- a/.bin/Scripts/transferred_keys.py +++ b/.bin/Scripts/transferred_keys.py @@ -14,7 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\Transferred Keys.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: Transferred Key Finder\n'.format(KIT_NAME_FULL)) try_and_print(message='Searching for keys...', function=list_clientdir_keys, print_return=True) diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index c25a782a..e0579346 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -12,7 +12,7 @@ os.system('title {}: Kit Update Tool'.format(KIT_NAME_FULL)) if __name__ == '__main__': try: - os.system('cls') + clear_screen() print_info('{}: Kit Update Tool\n'.format(KIT_NAME_FULL)) other_results = { 'Error': { diff --git a/.bin/Scripts/user_checklist.py b/.bin/Scripts/user_checklist.py index 0154a2e0..93d229a1 100644 --- a/.bin/Scripts/user_checklist.py +++ b/.bin/Scripts/user_checklist.py @@ -17,7 +17,7 @@ global_vars['LogFile'] = r'{LogDir}\User Checklist ({USERNAME}).log'.format( if __name__ == '__main__': try: stay_awake() - os.system('cls') + clear_screen() print_info('{}: User Checklist\n'.format(KIT_NAME_FULL)) other_results = { 'Warning': { diff --git a/.bin/Scripts/user_data_transfer.py b/.bin/Scripts/user_data_transfer.py index d1e4b3a0..20dec730 100644 --- a/.bin/Scripts/user_data_transfer.py +++ b/.bin/Scripts/user_data_transfer.py @@ -16,7 +16,7 @@ if __name__ == '__main__': try: # Prep stay_awake() - os.system('cls') + clear_screen() print_info('{}: User Data Transfer Tool\n'.format(KIT_NAME_FULL)) ticket_number = get_ticket_number() folder_path = r'{}\Transfer'.format(KIT_NAME_SHORT) @@ -26,7 +26,7 @@ if __name__ == '__main__': items = scan_source(source, dest) # Transfer - os.system('cls') + clear_screen() print_info('Transfer Details:\n') show_info('Ticket:', ticket_number) show_info('Source:', source.path)