From 433254c498d2e43acfd34e5c4fcee2fdcc2e767b Mon Sep 17 00:00:00 2001
From: softworkz <softworkz@hotmail.com>
Date: Fri, 5 Aug 2016 06:08:11 +0200
Subject: Async stream handling: Use interface instead of Func<Stream,Task>

No functional changes
---
 .../HttpServer/HttpResultFactory.cs                              | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs')

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
-- 
cgit v1.2.3


From 7d16988b1b81cc73608c07d61eabb83f8fcbbb05 Mon Sep 17 00:00:00 2001
From: softworkz <softworkz@hotmail.com>
Date: Fri, 5 Aug 2016 19:07:43 +0200
Subject: Remove handling IHttpResult

---
 .../HttpServer/AsyncStreamWriterEx.cs              | 153 ---------------------
 .../HttpServer/HttpResultFactory.cs                |   5 -
 .../MediaBrowser.Server.Implementations.csproj     |   1 -
 3 files changed, 159 deletions(-)
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterEx.cs

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterEx.cs b/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterEx.cs
deleted file mode 100644
index b98addb31..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterEx.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-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 f234674d8..b26cf5b76 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -706,11 +706,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         public object GetAsyncStreamWriter(IAsyncStreamSource streamSource)
         {
-            if (streamSource as IHttpResult != null)
-            {
-                return new AsyncStreamWriterEx(streamSource);
-            }
-
             return new AsyncStreamWriter(streamSource);
         }
     }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 8025e3594..07cb9fa0d 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -156,7 +156,6 @@
     <Compile Include="EntryPoints\ServerEventNotifier.cs" />
     <Compile Include="EntryPoints\UserDataChangeNotifier.cs" />
     <Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
-    <Compile Include="HttpServer\AsyncStreamWriterEx.cs" />
     <Compile Include="HttpServer\AsyncStreamWriter.cs" />
     <Compile Include="HttpServer\IHttpListener.cs" />
     <Compile Include="HttpServer\Security\AuthorizationContext.cs" />
-- 
cgit v1.2.3