Async stream handling: Use interface instead of Func<Stream,Task>

No functional changes

3 files changed, 179 insertions, 18 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterFunc.cs b/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriter.cs
index 5aa01c706..e44b0c6af 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterFunc.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriter.cs
@@ -4,38 +4,41 @@ using System.IO;
 using System.Threading.Tasks;
 using ServiceStack;
 using ServiceStack.Web;
+using MediaBrowser.Controller.Net;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
 {
-    public class AsyncStreamWriterFunc : IStreamWriter, IAsyncStreamWriter, IHasOptions
+    public class AsyncStreamWriter : IStreamWriter, IAsyncStreamWriter, IHasOptions
     {
         /// <summary>
         /// Gets or sets the source stream.
         /// </summary>
         /// <value>The source stream.</value>
-        private Func<Stream, Task> Writer { get; set; }
-
-        /// <summary>
-        /// Gets the options.
-        /// </summary>
-        /// <value>The options.</value>
-        public IDictionary<string, string> Options { get; private set; }
+        private IAsyncStreamSource _source;
 
         public Action OnComplete { get; set; }
         public Action OnError { get; set; }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="StreamWriter" /> class.
+        /// Initializes a new instance of the <see cref="AsyncStreamWriter" /> class.
         /// </summary>
-        public AsyncStreamWriterFunc(Func<Stream, Task> writer, IDictionary<string, string> headers)
+        public AsyncStreamWriter(IAsyncStreamSource source)
         {
-            Writer = writer;
+            _source = source;
+        }
 
-            if (headers == null)
+        public IDictionary<string, string> Options
+        {
+            get
             {
-                headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                var hasOptions = _source as IHasOptions;
+                if (hasOptions != null)
+                {
+                    return hasOptions.Options;
+                }
+
+                return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             }
-            Options = headers;
         }
 
         /// <summary>
@@ -44,13 +47,13 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// <param name="responseStream">The response stream.</param>
         public void WriteTo(Stream responseStream)
         {
-            var task = Writer(responseStream);
+            var task = _source.WriteToAsync(responseStream);
             Task.WaitAll(task);
         }
 
         public async Task WriteToAsync(Stream responseStream)
         {
-            await Writer(responseStream).ConfigureAwait(false);
+            await _source.WriteToAsync(responseStream).ConfigureAwait(false);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterEx.cs b/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterEx.cs
new file mode 100644
index 000000000..b98addb31
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterEx.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using ServiceStack;
+using ServiceStack.Web;
+using MediaBrowser.Controller.Net;
+
+namespace MediaBrowser.Server.Implementations.HttpServer
+{
+    public class AsyncStreamWriterEx : AsyncStreamWriter, IHttpResult
+    {
+        /// <summary>
+        /// Gets or sets the source stream.
+        /// </summary>
+        /// <value>The source stream.</value>
+        private IAsyncStreamSource _source;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncStreamWriter" /> class.
+        /// </summary>
+        public AsyncStreamWriterEx(IAsyncStreamSource source) : base(source)
+        {
+            _source = source;
+        }
+
+        public string ContentType
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public List<System.Net.Cookie> Cookies
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public Dictionary<string, string> Headers
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public int PaddingLength
+        {
+            get
+            {
+                return Result.PaddingLength;
+            }
+            set
+            {
+                Result.PaddingLength = value;
+            }
+        }
+
+        public IRequest RequestContext
+        {
+            get
+            {
+                return Result.RequestContext;
+            }
+            set
+            {
+                Result.RequestContext = value;
+            }
+        }
+
+        public object Response
+        {
+            get
+            {
+                return Result.Response;
+            }
+            set
+            {
+                Result.Response = value;
+            }
+        }
+
+        public IContentTypeWriter ResponseFilter
+        {
+            get
+            {
+                return Result.ResponseFilter;
+            }
+            set
+            {
+                Result.ResponseFilter = value;
+            }
+        }
+
+        public Func<IDisposable> ResultScope
+        {
+            get
+            {
+                return Result.ResultScope;
+            }
+            set
+            {
+                Result.ResultScope = value;
+            }
+        }
+
+        public int Status
+        {
+            get
+            {
+                return Result.Status;
+            }
+            set
+            {
+                Result.Status = value;
+            }
+        }
+
+        public System.Net.HttpStatusCode StatusCode
+        {
+            get
+            {
+                return Result.StatusCode;
+            }
+            set
+            {
+                Result.StatusCode = value;
+            }
+        }
+
+        public string StatusDescription
+        {
+            get
+            {
+                return Result.StatusDescription;
+            }
+            set
+            {
+                Result.StatusDescription = value;
+            }
+        }
+
+        private IHttpResult Result
+        {
+            get
+            {
+                return _source as IHttpResult;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index c0a2a5eb3..f234674d8 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -704,9 +704,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             throw error;
         }
 
-        public object GetAsyncStreamWriter(Func<Stream, Task> streamWriter, IDictionary<string, string> responseHeaders = null)
+        public object GetAsyncStreamWriter(IAsyncStreamSource streamSource)
         {
-            return new AsyncStreamWriterFunc(streamWriter, responseHeaders);
+            if (streamSource as IHttpResult != null)
+            {
+                return new AsyncStreamWriterEx(streamSource);
+            }
+
+            return new AsyncStreamWriter(streamSource);
         }
     }
 }
\ No newline at end of file