Improved temp file handling. Issue fo-dicom#69

anders9ustafsson · Sep 2, 2015 · 57204f2 · 57204f2
1 parent 34fba79
commit 57204f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/DICOM [Unit Tests]/IO/DesktopFileReferenceTest.cs b/DICOM [Unit Tests]/IO/DesktopFileReferenceTest.cs
@@ -21,6 +21,16 @@ public void Constructor_TempFile_TempFileAttributeSet()
             Assert.True((File.GetAttributes(path) & FileAttributes.Temporary) == FileAttributes.Temporary);
         }
 
+        [Fact]
+        public void Constructor_RegularFile_TempFileAttributeNotSet()
+        {
+            var path = @".\Test Data\tmp.tmp";
+            File.Create(path).Dispose();
+
+            var file = new DesktopFileReference(path, false);
+            Assert.False((File.GetAttributes(path) & FileAttributes.Temporary) == FileAttributes.Temporary);
+        }
+
         #endregion
     }
 }
diff --git a/DICOM/IO/DesktopFileReference.cs b/DICOM/IO/DesktopFileReference.cs
@@ -30,13 +30,7 @@ public DesktopFileReference(string fileName, bool isTempFile = false)
         {
             if (this.IsTempFile)
             {
-                try
-                {
-                    this.Delete();
-                }
-                catch
-                {
-                }
+                TemporaryFileRemover.Delete(this.Name);
             }
         }
 
@@ -66,7 +60,7 @@ public bool IsTempFile
             }
             set
             {
-                if (value)
+                if (value && this.Exists)
                 {
                     try
                     {