Merge pull request #88 from tapmantwo/Clean_temp_files

Cleaning up temp files
openrasta · Oct 23, 2015 · 0bdeac3 · 0bdeac3
2 parents 15e2034 + 6d93a65
commit 0bdeac3
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 32 deletions.
diff --git a/src/OpenRasta/IO/IFile.cs b/src/OpenRasta/IO/IFile.cs
@@ -15,7 +15,7 @@
 
 namespace OpenRasta.IO
 {
-    public interface IFile
+    public interface IFile : IDisposable
     {
         MediaType ContentType { get; }
         string FileName { get; }
@@ -51,6 +51,7 @@ public InMemoryFile(Stream stream)
         }
 
         readonly Stream _stream;
+        bool _disposed;
         public MediaType ContentType { get; set; }
         public string FileName { get; set; }
         public long Length { get; set; }
@@ -64,6 +65,26 @@ string IReceivedFile.OriginalName
         {
             get { return FileName; }
         }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed) return;
+
+            if (disposing)
+            {
+                if (_stream != null)
+                {
+                    _stream.Dispose();
+                }
+            }
+            _disposed = true;
+        }
     }
 #pragma warning restore 0618
     public class InMemoryDownloadableFile : InMemoryFile, IDownloadableFile

diff --git a/src/OpenRasta/Pipeline/PipelineRunner.cs b/src/OpenRasta/Pipeline/PipelineRunner.cs
@@ -212,6 +212,16 @@ protected virtual PipelineContinuation ExecuteContributor(ICommunicationContext
 
         protected virtual void FinishPipeline(ICommunicationContext context)
         {
+            if (context.Request.Entity != null)
+            {
+                context.Request.Entity.Dispose();
+            }
+
+            if (context.Response.Entity != null)
+            {
+                context.Response.Entity.Dispose();
+            }
+
             PipelineLog.WriteInfo("Pipeline finished.");
         }
 

diff --git a/src/OpenRasta/Web/HttpEntity.cs b/src/OpenRasta/Web/HttpEntity.cs
@@ -52,6 +52,28 @@ public MediaType ContentType
 
         public Stream Stream { get; private set; }
         public IList<Error> Errors { get; set; }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool _disposed;
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed) return;
+
+            if (disposing)
+            {
+                if (Stream != null)
+                {
+                    Stream.Dispose();
+                }
+            }
+            _disposed = true;
+        }
     }
 }
 

diff --git a/src/OpenRasta/Web/HttpEntityFile.cs b/src/OpenRasta/Web/HttpEntityFile.cs
@@ -1,11 +1,14 @@
+using System;
 using System.IO;
 using OpenRasta.IO;
 
 namespace OpenRasta.Web
 {
     public class HttpEntityFile : IFile
     {
-        readonly IHttpEntity _entity;
+        private bool _disposed;
+
+        private IHttpEntity _entity;
 
         public HttpEntityFile(IHttpEntity entity)
         {
@@ -31,5 +34,26 @@ public Stream OpenStream()
         {
             return _entity.Stream;
         }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed) return;
+
+            if (disposing)
+            {
+                if (_entity != null)
+                {
+                    _entity.Dispose();
+                    _entity = null;
+                }
+            }
+            _disposed = true;
+        }
     }
 }
diff --git a/src/OpenRasta/Web/IHttpEntity.cs b/src/OpenRasta/Web/IHttpEntity.cs
@@ -15,7 +15,7 @@
 
 namespace OpenRasta.Web
 {
-    public interface IHttpEntity
+    public interface IHttpEntity : IDisposable
     {
         ICodec Codec { get; set; }
         object Instance { get; set; }

diff --git a/src/OpenRasta/Web/MultipartHttpEntity.cs b/src/OpenRasta/Web/MultipartHttpEntity.cs
@@ -9,7 +9,6 @@
 #endregion
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using OpenRasta.Codecs;
 using OpenRasta.Diagnostics;
@@ -22,7 +21,7 @@ public interface IMultipartHttpEntity : IHttpEntity
         void SwapStream(Stream stream);
     }
 
-    public class MultipartHttpEntity : IMultipartHttpEntity, IDisposable
+    public class MultipartHttpEntity : IMultipartHttpEntity
     {
         ILogger Log { get; set; }
 
@@ -54,6 +53,7 @@ public Stream Stream
             }
             set
             {
+                CleanUpFile();
                 _stream = value;
                 _filePath = null;
             }
@@ -67,10 +67,12 @@ public Stream Stream
         private string _filePath = null;
         public void SwapStream(Stream stream)
         {
+            CleanUpFile();
             Stream = stream;
         }
         public void SwapStream(string filepath)
         {
+            CleanUpFile();
             _filePath = filepath;
             _stream = null;
         }
@@ -80,45 +82,50 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
         private bool _disposed = false;
+
         protected virtual void Dispose(bool disposing)
         {
-            if (!_disposed)
+            if (_disposed) return;
+
+            if (disposing)
             {
-                if (disposing)
+                if (_stream != null)
                 {
-                    if (_stream != null)
+                    try
                     {
-                        try
-                        {
-                            _stream.Dispose();
-                        }
-                        catch (ObjectDisposedException) { }
-                        finally
-                        {
-                            _stream = null;
-                        }
+                        _stream.Dispose();
                     }
-                    if (_filePath != null && File.Exists(_filePath))
+                    finally
                     {
-                        try
-                        {
-                            File.Delete(_filePath);
-                        }
-                        catch (Exception e)
-                        {
-                            Log.Safe().WriteError("Could not delete file {0} after use. See exception for details.", _filePath);
-                            Log.Safe().WriteException(e);
-                        }
-                        finally
-                        {
-                            _filePath = null;
-                        }
+                        _stream = null;
                     }
                 }
 
-                _disposed = true;
+                CleanUpFile();
+            }
+            _disposed = true;
+        }
+
+        private void CleanUpFile()
+        {
+            if (_filePath == null || !File.Exists(_filePath)) return;
+
+            try
+            {
+                File.Delete(_filePath);
+            }
+            catch (Exception e)
+            {
+                Log.Safe()
+                    .WriteError("Could not delete file {0} after use. See exception for details.", _filePath);
+                Log.Safe().WriteException(e);
+            }
+            finally
+            {
+                _filePath = null;
             }
         }
+
         ~MultipartHttpEntity()
         {
             Dispose(false);