From c47d88aad8ec68c4361e135af48fa0d455353936 Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Tue, 21 Nov 2017 00:37:18 -0800 Subject: [PATCH] Adjusted formatting for update_kit.py --- .bin/Scripts/update_kit.py | 68 ++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index a07bb727..8febc674 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -24,37 +24,37 @@ if __name__ == '__main__': # Data Recovery print_info(' Data Recovery') - try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results) + try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results, width=40) # Data Transfers print_info(' Data Transfers') - try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results) - try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results) - try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results) + try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results, width=40) + try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results, width=40) + try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results, width=40) # Diagnostics print_info(' Diagnostics') - try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results) - try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results) - try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results) - try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results) - try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results) - try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results) - try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results) - try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results) + try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results, width=40) + try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results, width=40) + try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results, width=40) + try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results, width=40) + try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results, width=40) + try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results, width=40) + try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results, width=40) + try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results, width=40) # Drivers print_info(' Drivers') - try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results) - try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results) - try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results) - try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results) + try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results, width=40) + try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results, width=40) + try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results, width=40) + try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results, width=40) # Installers print_info(' Installers') - try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results) - try_and_print(message='MS Office...', function=update_office, other_results=other_results) - try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results) + try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results, width=40) + try_and_print(message='MS Office...', function=update_office, other_results=other_results, width=40) + try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40) print_info(' Ninite') for section in sorted(NINITE_SOURCES.keys()): print_success(' {}'.format(section)) @@ -62,30 +62,30 @@ if __name__ == '__main__': for name, url in sorted(NINITE_SOURCES[section].items()): url = 'https://ninite.com/{}/ninite.exe'.format(url) try_and_print(message=name, function=download_generic, - other_results=other_results, + other_results=other_results, width=40, out_dir=dest, out_name=name, source_url=url) # Misc print_info(' Misc') - try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results) - try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results) - try_and_print(message='Du...', function=update_du, other_results=other_results) - try_and_print(message='Everything...', function=update_everything, other_results=other_results) - try_and_print(message='PuTTY...', function=update_putty, other_results=other_results) - try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results) - try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results) - try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results) + try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results, width=40) + try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results, width=40) + try_and_print(message='Du...', function=update_du, other_results=other_results, width=40) + try_and_print(message='Everything...', function=update_everything, other_results=other_results, width=40) + try_and_print(message='PuTTY...', function=update_putty, other_results=other_results, width=40) + try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results, width=40) + try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results, width=40) + try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results, width=40) # Repairs print_info(' Repairs') - try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results) - try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results) - try_and_print(message='RKill...', function=update_rkill, other_results=other_results) - try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results) + try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results, width=40) + try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results, width=40) + try_and_print(message='RKill...', function=update_rkill, other_results=other_results, width=40) + try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results, width=40) # Uninstallers print_info(' Uninstallers') - try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results) + try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results, width=40) ## Compress ## print_info('Compressing tools') @@ -95,6 +95,7 @@ if __name__ == '__main__': message='{}...'.format(item.name), function=compress_and_remove_item, other_results = other_results, + width=40, item = item) print_info(' .cbin') for item in os.scandir(global_vars['CBinDir']): @@ -103,6 +104,7 @@ if __name__ == '__main__': message='{}...'.format(item.name), function=compress_and_remove_item, other_results = other_results, + width=40, item = item) ## Generate Launchers