Changeset 2161

Timestamp:

6/13/2010 3:30:16 AM (2 years ago)

Author:

lowjoel

Message:

Since we are just simply deleting all temporary files when filling up the drive with junk files, we must reset all file times to invalid.

Location:

trunk/eraser

Files:

• Eraser.DefaultPlugins/ErasureTargets/UnusedSpaceErasureTarget.cs (modified) (2 diffs)
• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (2 diffs)
• Eraser.Manager/FileSystem.cs (modified) (1 diff)

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

@@ -231 +231 @@
                 Shell.LowDiskSpaceNotificationsEnabled = false;
 
-                ProgressManager mainProgress = new ProgressManager();
-                Progress.Steps.Add(new SteppedProgressManagerStep(mainProgress,
-                    EraseClusterTips ? 0.8f : 0.9f, S._("Erasing unused space...")));
-
-                //Continue creating files while there is free space.
-                while (volInfo.AvailableFreeSpace > 0)
-                {
-                    //Generate a non-existant file name
-                    string currFile = FileSystem.GenerateRandomFileName(info, 18);
-
-                    //Create the stream
-                    using (FileStream stream = new FileStream(currFile, FileMode.CreateNew,
-                        FileAccess.Write, FileShare.None, 8, FileOptions.WriteThrough))
-                    {
-                        //Set the length of the file to be the amount of free space left
-                        //or the maximum size of one of these dumps.
-                        mainProgress.Total = mainProgress.Completed +
-                            method.CalculateEraseDataSize(null, volInfo.AvailableFreeSpace);
-                        long streamLength = Math.Min(ErasureMethod.FreeSpaceFileUnit,
-                            volInfo.AvailableFreeSpace);
-
-                        //Handle IO exceptions gracefully, because the filesystem
-                        //may require more space than demanded by us for file allocation.
-                        while (true)
-                            try
-                            {
-                                stream.SetLength(streamLength);
-                                break;
-                            }
-                            catch (IOException)
-                            {
-                                if (streamLength > volInfo.ClusterSize)
-                                    streamLength -= volInfo.ClusterSize;
-                                else
-                                    throw;
-                            }
-
-                        //Then run the erase task
-                        method.Erase(stream, long.MaxValue,
-                            ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng],
-                            delegate(long lastWritten, long totalData, int currentPass)
-                            {
-                                mainProgress.Completed += lastWritten;
-                                OnProgressChanged(this, new ProgressChangedEventArgs(mainProgress,
-                                    new TaskProgressChangedEventArgs(Drive, currentPass, method.Passes)));
-
-                                if (Task.Canceled)
-                                    throw new OperationCanceledException(S._("The task was cancelled."));
-                            }
-                        );
-                    }
-                }
-
-                //Mark the main bulk of the progress as complete
-                mainProgress.MarkComplete();
+                //Fill the disk
+                EraseUnusedSpace(volInfo, info, fsManager, method);
 
                 //Erase old resident file system table files
@@ -344 +291 @@
             Progress = null;
         }
+
+        private void EraseUnusedSpace(VolumeInfo volInfo, DirectoryInfo info, FileSystem fsInfo,
+            ErasureMethod method)
+        {
+            ProgressManager mainProgress = new ProgressManager();
+            Progress.Steps.Add(new SteppedProgressManagerStep(mainProgress,
+                EraseClusterTips ? 0.8f : 0.9f, S._("Erasing unused space...")));
+
+            //Continue creating files while there is free space.
+            while (volInfo.AvailableFreeSpace > 0)
+            {
+                //Generate a non-existant file name
+                string currFile = FileSystem.GenerateRandomFileName(info, 18);
+
+                //Create the stream
+                FileStream stream = new FileStream(currFile, FileMode.CreateNew,
+                    FileAccess.Write, FileShare.None, 8, FileOptions.WriteThrough);
+                try
+                {
+                    //Set the length of the file to be the amount of free space left
+                    //or the maximum size of one of these dumps.
+                    mainProgress.Total = mainProgress.Completed +
+                        method.CalculateEraseDataSize(null, volInfo.AvailableFreeSpace);
+                    long streamLength = Math.Min(ErasureMethod.FreeSpaceFileUnit,
+                        volInfo.AvailableFreeSpace);
+
+                    //Handle IO exceptions gracefully, because the filesystem
+                    //may require more space than demanded by us for file allocation.
+                    while (true)
+                        try
+                        {
+                            stream.SetLength(streamLength);
+                            break;
+                        }
+                        catch (IOException)
+                        {
+                            if (streamLength > volInfo.ClusterSize)
+                                streamLength -= volInfo.ClusterSize;
+                            else
+                                throw;
+                        }
+
+                    //Then run the erase task
+                    method.Erase(stream, long.MaxValue,
+                        ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng],
+                        delegate(long lastWritten, long totalData, int currentPass)
+                        {
+                            mainProgress.Completed += lastWritten;
+                            OnProgressChanged(this, new ProgressChangedEventArgs(mainProgress,
+                                new TaskProgressChangedEventArgs(Drive, currentPass, method.Passes)));
+
+                            if (Task.Canceled)
+                                throw new OperationCanceledException(S._("The task was cancelled."));
+                        }
+                    );
+                }
+                finally
+                {
+                    stream.Close();
+                    fsInfo.ResetFileTimes(new FileInfo(currFile));
+                }
+            }
+
+            //Mark the main bulk of the progress as complete
+            mainProgress.MarkComplete();
+        }
     }
 }

trunk/eraser/Eraser.DefaultPlugins/FileSystems/Windows.cs

@@ -38 +38 @@
     public abstract class WindowsFileSystem : FileSystem
     {
+        public override void ResetFileTimes(FileSystemInfo info)
+        {
+            //Reset the file access times: after every rename the file times may change.
+            info.SetTimes(MinTimestamp, MinTimestamp, MinTimestamp, MinTimestamp);
+        }
+
         public override void DeleteFile(FileInfo info)
         {
@@ -100 +106 @@
                 try
                 {
-                    //Reset the file access times: after every rename the file times may change.
-                    info.SetTimes(MinTimestamp, MinTimestamp, MinTimestamp, MinTimestamp);
+                    ResetFileTimes(info);
 
                     //Try to rename the file. If it fails, it is probably due to another

trunk/eraser/Eraser.Manager/FileSystem.cs

@@ -205 +205 @@
 
         /// <summary>
+        /// Resets the created, modified, accessed and last update times for the given
+        /// <paramref name="info"/>.
+        /// </summary>
+        /// <param name="info">The file to reset times.</param>
+        public abstract void ResetFileTimes(FileSystemInfo info);
+
+        /// <summary>
         /// Securely deletes the file reference from the directory structures
         /// as well as resetting the Date Created, Date Accessed and Date Modified