Changeset 1739 for trunk/eraser6

Timestamp:

2/3/2010 12:56:25 AM (2 years ago)

Author:

lowjoel

Message:

Forward port from Eraser 6.0: Various filesystem object target searching improvements.

• When listing files that need to be erased, always ensure that the file exists before querying its properties e.g. Length or Attributes.
• When passing reference variables, we don't need to use ref (unless we want to change the reference, but in this case, we aren't)
• Just like for file system objects, when we get a file or directory from the recycle bin, ensure that it exists and that it isn't a reparse point (otherwise, we can just ignore it)
• Split files and directory enumeration in the recycle bin targets to remove casts (which are slow)

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser.Manager/Task.cs (modified) (5 diffs)

trunk/eraser6/Eraser.Manager/Task.cs

@@ -455 +455 @@
                     string adsPath = file + ':' + adsName;
                     list.Add(adsPath);
-                    Util.StreamInfo info = new Util.StreamInfo(adsPath);
+                    StreamInfo info = new StreamInfo(adsPath);
                     totalSize += info.Length;
                 }
@@ -686 +686 @@
                 Regex excludePattern = new Regex(regex, RegexOptions.IgnoreCase);
                 foreach (FileInfo file in files)
-                    if ((file.Attributes & FileAttributes.ReparsePoint) == 0 &&
+                    if (file.Exists &&
+                        (file.Attributes & FileAttributes.ReparsePoint) == 0 &&
                         excludePattern.Matches(file.FullName).Count == 0)
                     {
@@ -697 +698 @@
                 foreach (FileInfo file in files)
                 {
-                    if ((file.Attributes & FileAttributes.ReparsePoint) != 0)
+                    if (!file.Exists || (file.Attributes & FileAttributes.ReparsePoint) != 0)
                         continue;
 
@@ -800 +801 @@
                         continue;
 
-                    GetRecyclerFiles(dir, ref result, ref totalSize);
+                    GetRecyclerFiles(dir, result, ref totalSize);
                 }
             }
@@ -813 +814 @@
         /// <param name="paths">The list of files to store path information in.</param>
         /// <param name="totalSize">Receives the total size of the files.</param>
-        private void GetRecyclerFiles(DirectoryInfo info, ref List<string> paths,
+        private void GetRecyclerFiles(DirectoryInfo info, List<string> paths,
             ref long totalSize)
         {
             try
             {
-                foreach (FileSystemInfo fsInfo in info.GetFileSystemInfos())
+                foreach (FileInfo fileInfo in info.GetFiles())
                 {
-                    FileInfo fileInfo = fsInfo as FileInfo;
-                    if (fileInfo != null)
-                    {
-                        totalSize += fileInfo.Length;
-                        GetPathADSes(paths, out totalSize, fileInfo.FullName);
-                        paths.Add(fileInfo.FullName);
-                    }
-                    else
-                        GetRecyclerFiles((DirectoryInfo)fsInfo, ref paths, ref totalSize);
+                    if (!fileInfo.Exists || (fileInfo.Attributes & FileAttributes.ReparsePoint) != 0)
+                        continue;
+
+                    totalSize += fileInfo.Length;
+                    GetPathADSes(paths, out totalSize, fileInfo.FullName);
+                    paths.Add(fileInfo.FullName);
                 }
+
+                foreach (DirectoryInfo directoryInfo in info.GetDirectories())
+                    if ((directoryInfo.Attributes & FileAttributes.ReparsePoint) == 0)
+                        GetRecyclerFiles(directoryInfo, paths, ref totalSize);
             }
             catch (UnauthorizedAccessException e)