Updated cleanup.py

.bin/Scripts/functions/cleanup.py

@@ -16,15 +16,12 @@ def cleanup_adwcleaner():
         shutil.move(source_quarantine, dest_name)
 
     # Delete source folder if empty
-    try:
-        os.rmdir(source_path)
-    except OSError:
-        pass
+    delete_empty_folders(source_path)
 
     # Main folder
     if os.path.exists(source_path):
-        os.makedirs(global_vars['ProgBackupDir'], exist_ok=True)
-        dest_name = r'{ProgBackupDir}\AdwCleaner_{Date-Time}'.format(
+        os.makedirs(global_vars['LogDir'], exist_ok=True)
+        dest_name = r'{LogDir}\Tools\AdwCleaner'.format(
             **global_vars)
         dest_name = non_clobber_rename(dest_name)
         shutil.move(source_path, dest_name)
@@ -70,7 +67,7 @@ def cleanup_cbs(dest_folder):
 
 def cleanup_desktop():
     """Move known backup files and reports into the ClientDir."""
-    dest_folder = r'{ProgBackupDir}\Desktop_{Date-Time}'.format(**global_vars)
+    dest_folder = r'{LogDir}\Tools'.format(**global_vars)
     os.makedirs(dest_folder, exist_ok=True)
 
     desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
@@ -82,10 +79,51 @@ def cleanup_desktop():
             shutil.move(entry.path, dest_name)
 
     # Remove dir if empty
+    delete_empty_folders(dest_folder)
+
+def delete_empty_folders(folder_path):
+    """Delete all empty folders in path (depth first)."""
+    if not os.path.exists(folder_path) or not os.path.isdir(folder_path):
+        # Bail early (silently)
+        return
+
+    # Delete empty subfolders first
+    for item in os.scandir(folder_path):
+        if item.is_dir():
+            delete_empty_folders(item.path)
+
+    # Remove top folder
     try:
-        os.rmdir(dest_folder)
+        os.rmdir(folder_path)
     except OSError:
         pass
 
+def delete_registry_key(hive, key, recurse=False):
+    """Delete a registry key and all it's subkeys."""
+    access = winreg.KEY_ALL_ACCESS
+
+    try:
+        if recurse:
+            # Delete all subkeys first
+            with winreg.OpenKeyEx(hive, key, 0, access) as k:
+                key_info = winreg.QueryInfoKey(k)
+                for x in range(key_info[0]):
+                    subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0))
+                    delete_registry_key(hive, subkey)
+
+        # Delete key
+        winreg.DeleteKey(hive, key)
+    except FileNotFoundError:
+        # Ignore
+        pass
+
+def delete_registry_value(hive, key, value):
+    """Delete a registry value."""
+    access = winreg.KEY_ALL_ACCESS
+    with winreg.OpenKeyEx(hive, key, 0, access) as k:
+        winreg.DeleteValue(k, value)
+
 if __name__ == '__main__':
     print("This file is not meant to be called directly.")
+
+# vim: sts=4 sw=4 ts=4