Changeset 894 for branches/eraser6/Manager/DirectExecutor.cs

Timestamp:

4/27/2009 12:46:42 PM (4 years ago)

Author:

lowjoel

Message:

-Handle files which are currently locked by another process - currently the behaviour is to log the file as unerased and flag the task as an error having occurred
-Handle sparse/compressed/encrypted files without throwing an exception because that will cause the rest of the files to remain unerased

File:

• branches/eraser6/Manager/DirectExecutor.cs (modified) (3 diffs)

branches/eraser6/Manager/DirectExecutor.cs

@@ -1026 +1026 @@
                 task.OnProgressChanged(progress.Event);
 
-                //Make sure the file does not have any attributes which may affect
-                //the erasure process
+                
+                //Remove the read-only flag, if it is set.
+                StreamInfo info = new StreamInfo(paths[i]);
                 bool isReadOnly = false;
-                StreamInfo info = new StreamInfo(paths[i]);
-                if ((info.Attributes & FileAttributes.Compressed) != 0 ||
-                    (info.Attributes & FileAttributes.Encrypted) != 0 ||
-                    (info.Attributes & FileAttributes.SparseFile) != 0)
-                {
-                    //Log the error
-                    //TODO: This would leave files after the list unerased. Log this as an error instead
-                    throw new ArgumentException(S._("Compressed, encrypted, or sparse" +
-                        "files cannot be erased with Eraser."));
-                }
-
-                //Remove the read-only flag, if it is set.
                 if (isReadOnly = info.IsReadOnly)
                     info.IsReadOnly = false;
@@ -1046 +1035 @@
                 try
                 {
+                    //Make sure the file does not have any attributes which may affect
+                    //the erasure process
+                    if ((info.Attributes & FileAttributes.Compressed) != 0 || 
+                        (info.Attributes & FileAttributes.Encrypted) != 0 ||
+                        (info.Attributes & FileAttributes.SparseFile) != 0)
+                    {
+                        //Log the error
+                        task.Log.Add(new LogEntry(S._("The file {0} could not be erased " +
+                            "because the file was either compressed, encrypted or a sparse file.",
+                            info.FullName), LogLevel.ERROR));
+                    }
+
                     //Create the file stream, and call the erasure method to write to
                     //the stream.
@@ -1099 +1100 @@
                         LogLevel.ERROR));
                 }
+                catch (FileLoadException)
+                {
+                    task.Log.Add(new LogEntry(S._("The file {0} could not be erased because the " +
+                        "file is currently in use.", info.FullName), LogLevel.ERROR));
+                }
                 finally
                 {