Changeset 1085 for trunk/eraser6

Timestamp:

6/2/2009 1:57:35 AM (4 years ago)

Author:

lowjoel

Message:

Open handles to files are closed when the file's ADSes are listed for erasure; the file is then sent for erasure anyway but if the file is still locked when it is time to erase, just throw an error message to the log.
fixed #14: Runtime unlocking of files

Location:

trunk/eraser6/Eraser.Manager

Files:

• DirectExecutor.cs (modified) (2 diffs)
• Eraser.Manager.csproj (modified) (2 diffs)
• Strings.en.resx (modified) (1 diff)
• Strings.nl.resx (modified) (1 diff)
• Strings.resx (modified) (1 diff)
• Task.cs (modified) (2 diffs)

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -33 +33 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Security.Permissions;
+using Eraser.Unlocker;
 
 namespace Eraser.Manager
@@ -875 +876 @@
                 catch (FileLoadException)
                 {
-                    task.Log.LastSessionEntries.Add(new LogEntry(S._("The file {0} could not be " +
-                        "erased because the file is currently in use.", info.FullName),
-                        LogLevel.Error));
+                    List<OpenHandle> openHandles = OpenHandle.Items;
+                    List<System.Diagnostics.Process> processes = new List<System.Diagnostics.Process>();
+                    foreach (OpenHandle handle in openHandles)
+                        if (handle.Path == paths[i])
+                            processes.Add(System.Diagnostics.Process.GetProcessById(handle.ProcessId));
+
+                    StringBuilder processStr = new StringBuilder();
+                    foreach (System.Diagnostics.Process process in processes)
+                        processStr.AppendFormat(System.Globalization.CultureInfo.InvariantCulture,
+                            "{0}, ", process.MainModule.FileName);
+
+                    task.Log.LastSessionEntries.Add(new LogEntry(S._(
+                        "Could not force closure of file \"{0}\" (locked by {1})",
+                        paths[i], processStr.ToString().Remove(processStr.Length - 2)), LogLevel.Error));
                 }
                 finally

trunk/eraser6/Eraser.Manager/Eraser.Manager.csproj

@@ -67 +67 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Eraser.Unlocker\Eraser.Unlocker.vcproj">
+      <Project>{BCFE7D20-FC82-4BBE-BFE4-7B635D70D238}</Project>
+      <Name>Eraser.Unlocker</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Eraser.Util\Eraser.Util.csproj">
       <Project>{D083E1A8-3A4C-4683-9B3F-D5FEDE61B9C9}</Project>
@@ -100 +104 @@
   -->
   <PropertyGroup>
-    <PreBuildEvent>csgettext --merge EN,NL "$(ProjectDir)\" Strings
+    <PreBuildEvent>call $(SolutionDir)UpdateVersions.bat "$(SolutionDir)\" "$(SolutionDir)Version.cs.in" "$(SolutionDir)Version.cs"
+csgettext --merge EN,NL "$(ProjectDir)\" Strings
 if ERRORLEVEL 0 exit 0</PreBuildEvent>
   </PropertyGroup>

trunk/eraser6/Eraser.Manager/Strings.en.resx

@@ -178 +178 @@
     <value>The file {0} could not be erased because the file's permissions prevent access to the file.</value>
   </data>
-  <data name="The file {0} could not be erased because the file is currently in use." xml:space="preserve">
-    <value>The file {0} could not be erased because the file is currently in use.</value>
+  <data name="Could not force closure of file \&quot;{0}\&quot; (locked by {1})" xml:space="preserve">
+    <value>Could not force closure of file \"{0}\" (locked by {1})</value>
   </data>
   <data name="Removing folders..." xml:space="preserve">

trunk/eraser6/Eraser.Manager/Strings.nl.resx

@@ -178 +178 @@
     <value>(Untranslated)</value>
   </data>
-  <data name="The file {0} could not be erased because the file is currently in use." xml:space="preserve">
+  <data name="Could not force closure of file \&quot;{0}\&quot; (locked by {1})" xml:space="preserve">
     <value>(Untranslated)</value>
   </data>

trunk/eraser6/Eraser.Manager/Strings.resx

@@ -178 +178 @@
     <value>The file {0} could not be erased because the file's permissions prevent access to the file.</value>
   </data>
-  <data name="The file {0} could not be erased because the file is currently in use." xml:space="preserve">
-    <value>The file {0} could not be erased because the file is currently in use.</value>
+  <data name="Could not force closure of file \&quot;{0}\&quot; (locked by {1})" xml:space="preserve">
+    <value>Could not force closure of file \"{0}\" (locked by {1})</value>
   </data>
   <data name="Removing folders..." xml:space="preserve">

trunk/eraser6/Eraser.Manager/Task.cs

@@ -29 +29 @@
 using Eraser.Util;
 using System.Security.Permissions;
+using Eraser.Unlocker;
 
 namespace Eraser.Manager
@@ -352 +353 @@
                 }
             }
-            catch (IOException e)
-            {
-                //The system cannot open the file, assume no ADSes for lack of
-                //more information.
-                Task.Log.LastSessionEntries.Add(new LogEntry(e.Message, LogLevel.Error));
+            catch (FileLoadException)
+            {
+                //The system cannot open the file, try to force the file handle to close.
+                List<OpenHandle> openHandles = OpenHandle.Items;
+                foreach (OpenHandle handle in openHandles)
+                    if (handle.Path == file && handle.Close())
+                    {
+                        GetPathADSes(list, out totalSize, file);
+                        return;
+                    }
             }
             catch (UnauthorizedAccessException e)