6fc04266d4
## MAJOR refactoring done ##
* All .cmd Command scripts
* Brandind / Settings variables now set via .bin/Scripts/settings/main.py
* Window titles now set using KIT_FULL_NAME
* All .py Python scripts
* All ClientDir paths should now use KIT_SHORT_NAME
* Long lines wrapped to better follow PEP8
* String formatting now more consistant
* Updated run_program() and popen_program() calls to use lists
* (e.g. cmd = ['', '', '']; run_program(cmd))
** Should improve clarity IMO
* Update window titles AFTER init_global_vars() so KIT_FULL_NAME can be used
* Branding / Settings
* Support tech now configurable
* (e.g. "Please let {tech} know and they'll look into it")
* Timezone now configurable
* Upload info can now be disabled/enabled in .bin/Scripts/settings/main.py
* CHKDSK
* Combined read-only and fix scripts and added menu
* DISM
* Combined ScanHealth and RestoreHealth scripts and added menu
* functions/common.py
* BREAKING: run_program() and popen_program() no longer accept 'args' variable
* Misc
* Removed Win7 NVMe launcher
* Never used and Win7 is deprecated
* Removed "DeviceRemover" and "Display Driver Uninstaller" launchers
* Both cut too deep and were not useful
* Removed Nirsoft utilities and Sysinternals Suite launchers
* Too many tools unused.
* Added .url links to the websites in case the tools are needed
* Replaced WinDirStat with TreeSizeFree
* Replaced Q-Dir launcher with XYplorer launcher
* Q-Dir was running into issues on Windows 10
* Removed C.IntRep, ESET, and MBAM launchers from "OSR & VR"
* Removed JRT
* Deprecated and discontinued by MBAM
* Removed unsupported QuickBooks launchers (2014 and older)
* Removed unsupported Office launchers (2010 and 2013\365)
* Removed "Revo Uninstaller" launcher
* Removed infrequently used tools from "Diagnostics"
* Auslogics DiskDefrag
* BatteryInfoView
* BIOSCodes
* GpuTest
* HeavyLoad
* Bugfixes
* major_exception() try-blocks should catch CTL+c again
* Allows for manual script bailing
91 lines
3.5 KiB
Python
91 lines
3.5 KiB
Python
# Wizard Kit: Functions - Cleanup
|
|
|
|
from functions.common import *
|
|
|
|
def cleanup_adwcleaner():
|
|
"""Move AdwCleaner folders into the ClientDir."""
|
|
source_path = r'{SYSTEMDRIVE}\AdwCleaner'.format(**global_vars['Env'])
|
|
source_quarantine = r'{}\Quarantine'.format(source_path)
|
|
|
|
# Quarantine
|
|
if os.path.exists(source_quarantine):
|
|
os.makedirs(global_vars['QuarantineDir'], exist_ok=True)
|
|
dest_name = r'{QuarantineDir}\AdwCleaner_{Date-Time}'.format(
|
|
**global_vars)
|
|
dest_name = non_clobber_rename(dest_name)
|
|
shutil.move(source_quarantine, dest_name)
|
|
|
|
# Delete source folder if empty
|
|
try:
|
|
os.rmdir(source_path)
|
|
except OSError:
|
|
pass
|
|
|
|
# Main folder
|
|
if os.path.exists(source_path):
|
|
os.makedirs(global_vars['ProgBackupDir'], exist_ok=True)
|
|
dest_name = r'{ProgBackupDir}\AdwCleaner_{Date-Time}'.format(
|
|
**global_vars)
|
|
dest_name = non_clobber_rename(dest_name)
|
|
shutil.move(source_path, dest_name)
|
|
|
|
def cleanup_cbs(dest_folder):
|
|
"""Safely cleanup a known CBS archive bug under Windows 7.
|
|
|
|
If a CbsPersist file is larger than 2 Gb then the auto archive feature
|
|
continually fails and will fill up the system drive with temp files.
|
|
|
|
This function moves the temp files and CbsPersist file to a temp folder,
|
|
compresses the CbsPersist files with 7-Zip, and then opens the temp folder
|
|
for the user to manually save the backup files and delete the temp files.
|
|
"""
|
|
backup_folder = r'{dest_folder}\CbsFix'.format(dest_folder=dest_folder)
|
|
temp_folder = r'{backup_folder}\Temp'.format(backup_folder=backup_folder)
|
|
os.makedirs(backup_folder, exist_ok=True)
|
|
os.makedirs(temp_folder, exist_ok=True)
|
|
|
|
# Move files into temp folder
|
|
cbs_path = r'{SYSTEMROOT}\Logs\CBS'.format(**global_vars['Env'])
|
|
for entry in os.scandir(cbs_path):
|
|
# CbsPersist files
|
|
if entry.name.lower().startswith('cbspersist'):
|
|
dest_name = r'{}\{}'.format(temp_folder, entry.name)
|
|
dest_name = non_clobber_rename(dest_name)
|
|
shutil.move(entry.path, dest_name)
|
|
temp_path = r'{SYSTEMROOT}\Temp'.format(**global_vars['Env'])
|
|
for entry in os.scandir(temp_path):
|
|
# cab_ files
|
|
if entry.name.lower().startswith('cab_'):
|
|
dest_name = r'{}\{}'.format(temp_folder, entry.name)
|
|
dest_name = non_clobber_rename(dest_name)
|
|
shutil.move(entry.path, dest_name)
|
|
|
|
# Compress CbsPersist files with 7-Zip
|
|
cmd = [
|
|
global_vars['Tools']['SevenZip'],
|
|
'a', '-t7z', '-mx=3', '-bso0', '-bse0',
|
|
r'{}\CbsPersists.7z'.format(backup_folder),
|
|
r'{}\CbsPersist*'.format(temp_folder)]
|
|
run_program(cmd)
|
|
|
|
def cleanup_desktop():
|
|
"""Move known backup files and reports into the ClientDir."""
|
|
dest_folder = r'{ProgBackupDir}\Desktop_{Date-Time}'.format(**global_vars)
|
|
os.makedirs(dest_folder, exist_ok=True)
|
|
|
|
desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
|
|
for entry in os.scandir(desktop_path):
|
|
# JRT, RKill, Shortcut cleaner
|
|
if re.search(r'^(JRT|RKill|sc-cleaner)', entry.name, re.IGNORECASE):
|
|
dest_name = r'{}\{}'.format(dest_folder, entry.name)
|
|
dest_name = non_clobber_rename(dest_name)
|
|
shutil.move(entry.path, dest_name)
|
|
|
|
# Remove dir if empty
|
|
try:
|
|
os.rmdir(dest_folder)
|
|
except OSError:
|
|
pass
|
|
|
|
if __name__ == '__main__':
|
|
print("This file is not meant to be called directly.")
|