alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-20 03:22:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2025 from softworkz/AsyncStreamInterface

Browse Source 
Async stream handling: Use interface instead of Func<Stream,Task>
This commit is contained in:
Luke
2016-08-15 17:59:28 -04:00
committed by GitHub
parent 6186e3a4ff 7d16988b1b
commit 02a4b90f65
8 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterFunc.cs → MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriter.cs
View File

@@ -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);
}
}
}

4
MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@@ -704,9 +704,9 @@ 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);
return new AsyncStreamWriter(streamSource);
}
}
}