Changeset 2522

Timestamp:

3/14/2012 8:35:27 AM (14 months ago)

Author:

lowjoel

Message:

Improve recycle bin support: on drives not using NTFS, Windows stores recycle bin files directly within the $Recycle.Bin folder. On those drives, we would have to erase the global recycle bin for that drive.

File:

• trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/RecycleBinErasureTarget.cs (modified) (2 diffs)

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/RecycleBinErasureTarget.cs

@@ -78 +78 @@
             string[] rootDirectory = new string[] {
                     "$RECYCLE.BIN",
-                    "RECYCLER"
+                    "RECYCLER",
+                    "RECYCLED"
                 };
             string userSid = System.Security.Principal.WindowsIdentity.GetCurrent().
@@ -87 +88 @@
                 foreach (string rootDir in rootDirectory)
                 {
-                    DirectoryInfo dir = new DirectoryInfo(
-                        System.IO.Path.Combine(
-                            System.IO.Path.Combine(drive.Name, rootDir),
-                            userSid));
-                    if (!dir.Exists)
+                    //First get the global recycle bin for the current drive
+                    string recycleBinPath = System.IO.Path.Combine(drive.Name, rootDir);
+                    if (!Directory.Exists(recycleBinPath))
                         continue;
 
-                    foreach (FileInfo file in GetFiles(dir))
+                    //Try to see if we can get the user's own recycle bin
+                    if (Directory.Exists(System.IO.Path.Combine(recycleBinPath, userSid)))
+                        recycleBinPath = System.IO.Path.Combine(recycleBinPath, userSid);
+
+                    foreach (FileInfo file in GetFiles(new DirectoryInfo(recycleBinPath)))
                     {
                         //Add the ADSes