Updated cleanup.py
This commit is contained in:
parent
6a3e225192
commit
327c5b8a33
GPG key ID:
152FAC923B0E132C
1 changed files with 98 additions and 98 deletions
|
|
@ -3,127 +3,127 @@
|
||||||
from functions.common import *
|
from functions.common import *
|
||||||
|
|
||||||
def cleanup_adwcleaner():
|
def cleanup_adwcleaner():
|
||||||
"""Move AdwCleaner folders into the ClientDir."""
|
"""Move AdwCleaner folders into the ClientDir."""
|
||||||
source_path = r'{SYSTEMDRIVE}\AdwCleaner'.format(**global_vars['Env'])
|
source_path = r'{SYSTEMDRIVE}\AdwCleaner'.format(**global_vars['Env'])
|
||||||
source_quarantine = r'{}\Quarantine'.format(source_path)
|
source_quarantine = r'{}\Quarantine'.format(source_path)
|
||||||
|
|
||||||
# Quarantine
|
# Quarantine
|
||||||
if os.path.exists(source_quarantine):
|
if os.path.exists(source_quarantine):
|
||||||
os.makedirs(global_vars['QuarantineDir'], exist_ok=True)
|
os.makedirs(global_vars['QuarantineDir'], exist_ok=True)
|
||||||
dest_name = r'{QuarantineDir}\AdwCleaner_{Date-Time}'.format(
|
dest_name = r'{QuarantineDir}\AdwCleaner_{Date-Time}'.format(
|
||||||
**global_vars)
|
**global_vars)
|
||||||
dest_name = non_clobber_rename(dest_name)
|
dest_name = non_clobber_rename(dest_name)
|
||||||
shutil.move(source_quarantine, dest_name)
|
shutil.move(source_quarantine, dest_name)
|
||||||
|
|
||||||
# Delete source folder if empty
|
# Delete source folder if empty
|
||||||
delete_empty_folders(source_path)
|
delete_empty_folders(source_path)
|
||||||
|
|
||||||
# Main folder
|
# Main folder
|
||||||
if os.path.exists(source_path):
|
if os.path.exists(source_path):
|
||||||
os.makedirs(global_vars['LogDir'], exist_ok=True)
|
os.makedirs(global_vars['LogDir'], exist_ok=True)
|
||||||
dest_name = r'{LogDir}\Tools\AdwCleaner'.format(
|
dest_name = r'{LogDir}\Tools\AdwCleaner'.format(
|
||||||
**global_vars)
|
**global_vars)
|
||||||
dest_name = non_clobber_rename(dest_name)
|
dest_name = non_clobber_rename(dest_name)
|
||||||
shutil.move(source_path, dest_name)
|
shutil.move(source_path, dest_name)
|
||||||
|
|
||||||
def cleanup_cbs(dest_folder):
|
def cleanup_cbs(dest_folder):
|
||||||
"""Safely cleanup a known CBS archive bug under Windows 7.
|
"""Safely cleanup a known CBS archive bug under Windows 7.
|
||||||
|
|
||||||
If a CbsPersist file is larger than 2 Gb then the auto archive feature
|
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.
|
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,
|
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
|
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.
|
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)
|
backup_folder = r'{dest_folder}\CbsFix'.format(dest_folder=dest_folder)
|
||||||
temp_folder = r'{backup_folder}\Temp'.format(backup_folder=backup_folder)
|
temp_folder = r'{backup_folder}\Temp'.format(backup_folder=backup_folder)
|
||||||
os.makedirs(backup_folder, exist_ok=True)
|
os.makedirs(backup_folder, exist_ok=True)
|
||||||
os.makedirs(temp_folder, exist_ok=True)
|
os.makedirs(temp_folder, exist_ok=True)
|
||||||
|
|
||||||
# Move files into temp folder
|
# Move files into temp folder
|
||||||
cbs_path = r'{SYSTEMROOT}\Logs\CBS'.format(**global_vars['Env'])
|
cbs_path = r'{SYSTEMROOT}\Logs\CBS'.format(**global_vars['Env'])
|
||||||
for entry in os.scandir(cbs_path):
|
for entry in os.scandir(cbs_path):
|
||||||
# CbsPersist files
|
# CbsPersist files
|
||||||
if entry.name.lower().startswith('cbspersist'):
|
if entry.name.lower().startswith('cbspersist'):
|
||||||
dest_name = r'{}\{}'.format(temp_folder, entry.name)
|
dest_name = r'{}\{}'.format(temp_folder, entry.name)
|
||||||
dest_name = non_clobber_rename(dest_name)
|
dest_name = non_clobber_rename(dest_name)
|
||||||
shutil.move(entry.path, dest_name)
|
shutil.move(entry.path, dest_name)
|
||||||
temp_path = r'{SYSTEMROOT}\Temp'.format(**global_vars['Env'])
|
temp_path = r'{SYSTEMROOT}\Temp'.format(**global_vars['Env'])
|
||||||
for entry in os.scandir(temp_path):
|
for entry in os.scandir(temp_path):
|
||||||
# cab_ files
|
# cab_ files
|
||||||
if entry.name.lower().startswith('cab_'):
|
if entry.name.lower().startswith('cab_'):
|
||||||
dest_name = r'{}\{}'.format(temp_folder, entry.name)
|
dest_name = r'{}\{}'.format(temp_folder, entry.name)
|
||||||
dest_name = non_clobber_rename(dest_name)
|
dest_name = non_clobber_rename(dest_name)
|
||||||
shutil.move(entry.path, dest_name)
|
shutil.move(entry.path, dest_name)
|
||||||
|
|
||||||
# Compress CbsPersist files with 7-Zip
|
# Compress CbsPersist files with 7-Zip
|
||||||
cmd = [
|
cmd = [
|
||||||
global_vars['Tools']['SevenZip'],
|
global_vars['Tools']['SevenZip'],
|
||||||
'a', '-t7z', '-mx=3', '-bso0', '-bse0',
|
'a', '-t7z', '-mx=3', '-bso0', '-bse0',
|
||||||
r'{}\CbsPersists.7z'.format(backup_folder),
|
r'{}\CbsPersists.7z'.format(backup_folder),
|
||||||
r'{}\CbsPersist*'.format(temp_folder)]
|
r'{}\CbsPersist*'.format(temp_folder)]
|
||||||
run_program(cmd)
|
run_program(cmd)
|
||||||
|
|
||||||
def cleanup_desktop():
|
def cleanup_desktop():
|
||||||
"""Move known backup files and reports into the ClientDir."""
|
"""Move known backup files and reports into the ClientDir."""
|
||||||
dest_folder = r'{LogDir}\Tools'.format(**global_vars)
|
dest_folder = r'{LogDir}\Tools'.format(**global_vars)
|
||||||
os.makedirs(dest_folder, exist_ok=True)
|
os.makedirs(dest_folder, exist_ok=True)
|
||||||
|
|
||||||
desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
|
desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
|
||||||
for entry in os.scandir(desktop_path):
|
for entry in os.scandir(desktop_path):
|
||||||
# JRT, RKill, Shortcut cleaner
|
# JRT, RKill, Shortcut cleaner
|
||||||
if re.search(r'^(JRT|RKill|sc-cleaner)', entry.name, re.IGNORECASE):
|
if re.search(r'^(JRT|RKill|sc-cleaner)', entry.name, re.IGNORECASE):
|
||||||
dest_name = r'{}\{}'.format(dest_folder, entry.name)
|
dest_name = r'{}\{}'.format(dest_folder, entry.name)
|
||||||
dest_name = non_clobber_rename(dest_name)
|
dest_name = non_clobber_rename(dest_name)
|
||||||
shutil.move(entry.path, dest_name)
|
shutil.move(entry.path, dest_name)
|
||||||
|
|
||||||
# Remove dir if empty
|
# Remove dir if empty
|
||||||
delete_empty_folders(dest_folder)
|
delete_empty_folders(dest_folder)
|
||||||
|
|
||||||
def delete_empty_folders(folder_path):
|
def delete_empty_folders(folder_path):
|
||||||
"""Delete all empty folders in path (depth first)."""
|
"""Delete all empty folders in path (depth first)."""
|
||||||
if not os.path.exists(folder_path) or not os.path.isdir(folder_path):
|
if not os.path.exists(folder_path) or not os.path.isdir(folder_path):
|
||||||
# Bail early (silently)
|
# Bail early (silently)
|
||||||
return
|
return
|
||||||
|
|
||||||
# Delete empty subfolders first
|
# Delete empty subfolders first
|
||||||
for item in os.scandir(folder_path):
|
for item in os.scandir(folder_path):
|
||||||
if item.is_dir():
|
if item.is_dir():
|
||||||
delete_empty_folders(item.path)
|
delete_empty_folders(item.path)
|
||||||
|
|
||||||
# Remove top folder
|
# Remove top folder
|
||||||
try:
|
try:
|
||||||
os.rmdir(folder_path)
|
os.rmdir(folder_path)
|
||||||
except OSError:
|
except OSError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def delete_registry_key(hive, key, recurse=False):
|
def delete_registry_key(hive, key, recurse=False):
|
||||||
"""Delete a registry key and all it's subkeys."""
|
"""Delete a registry key and all it's subkeys."""
|
||||||
access = winreg.KEY_ALL_ACCESS
|
access = winreg.KEY_ALL_ACCESS
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if recurse:
|
if recurse:
|
||||||
# Delete all subkeys first
|
# Delete all subkeys first
|
||||||
with winreg.OpenKeyEx(hive, key, 0, access) as k:
|
with winreg.OpenKeyEx(hive, key, 0, access) as k:
|
||||||
key_info = winreg.QueryInfoKey(k)
|
key_info = winreg.QueryInfoKey(k)
|
||||||
for x in range(key_info[0]):
|
for x in range(key_info[0]):
|
||||||
subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0))
|
subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0))
|
||||||
delete_registry_key(hive, subkey)
|
delete_registry_key(hive, subkey)
|
||||||
|
|
||||||
# Delete key
|
# Delete key
|
||||||
winreg.DeleteKey(hive, key)
|
winreg.DeleteKey(hive, key)
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
# Ignore
|
# Ignore
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def delete_registry_value(hive, key, value):
|
def delete_registry_value(hive, key, value):
|
||||||
"""Delete a registry value."""
|
"""Delete a registry value."""
|
||||||
access = winreg.KEY_ALL_ACCESS
|
access = winreg.KEY_ALL_ACCESS
|
||||||
with winreg.OpenKeyEx(hive, key, 0, access) as k:
|
with winreg.OpenKeyEx(hive, key, 0, access) as k:
|
||||||
winreg.DeleteValue(k, value)
|
winreg.DeleteValue(k, value)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
print("This file is not meant to be called directly.")
|
print("This file is not meant to be called directly.")
|
||||||
|
|
||||||
# vim: sts=4 sw=4 ts=4
|
# vim: sts=2 sw=2 ts=2
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue