diff --git a/scripts/auto_repairs.py b/scripts/auto_repairs.py index 381ea729..d5ce4297 100644 --- a/scripts/auto_repairs.py +++ b/scripts/auto_repairs.py @@ -81,7 +81,7 @@ BASE_MENUS = { MenuEntry('Reboot', 'auto_reboot'), ), 'Manual Steps': ( - MenuEntry('AdwCleaner', placeholder_function), + MenuEntry('AdwCleaner', 'auto_adwcleaner'), MenuEntry('IO Bit Uninstaller', placeholder_function), MenuEntry('Enable Windows Updates', 'auto_windows_updates_enable'), ), diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py index b054eb85..c5a1930b 100644 --- a/scripts/wk/repairs/win.py +++ b/scripts/wk/repairs/win.py @@ -535,6 +535,18 @@ def update_main_menu(menus): # Auto Repairs: Wrapper Functions +def auto_adwcleaner(group, name): + """Run AdwCleaner scan. + + save_settings() is called first since AdwCleaner may kill this script. + """ + save_settings(group, name, done=True, failed=False, message='DONE') + result = TRY_PRINT.run('AdwCleaner...', run_adwcleaner, msg_good='DONE') + + # Update with actual results (assuming this script wasn't killed) + save_settings(group, name, result=result) + + def auto_backup_power_plans(group, name): """Backup power plans.""" result = TRY_PRINT.run('Backup Power Plans...', export_power_plans) @@ -758,6 +770,11 @@ def delete_registry_null_keys(): run_tool('RegDelNull', 'RegDelNull', '-s', '-y', cbin=True) +def run_adwcleaner(): + """Run AdwCleaner.""" + run_tool('AdwCleaner', 'AdwCleaner', download=True) + + def run_bleachbit(cleaners, preview=True): """Run BleachBit to either clean or preview files.""" cmd_args = (