aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-10-31 16:00:26 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-10-31 16:00:26 -0400
commited1f2a8a0c0e2502438aed80369e94150f3bd32d (patch)
tree1b10b1b6fcadacf79259a7c7d61512a0b53bc73a
parent1e238c70bc37dda1711b37ffaa72a55729249429 (diff)
update SubtitleService
-rw-r--r--MediaBrowser.Api/Subtitles/SubtitleService.cs7
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs4
-rw-r--r--MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj5
3 files changed, 5 insertions, 11 deletions
diff --git a/MediaBrowser.Api/Subtitles/SubtitleService.cs b/MediaBrowser.Api/Subtitles/SubtitleService.cs
index ce02cf65e..f7ff3d162 100644
--- a/MediaBrowser.Api/Subtitles/SubtitleService.cs
+++ b/MediaBrowser.Api/Subtitles/SubtitleService.cs
@@ -215,9 +215,9 @@ namespace MediaBrowser.Api.Subtitles
return await ResultFactory.GetStaticFileResult(Request, subtitleStream.Path).ConfigureAwait(false);
}
- using (var stream = await GetSubtitles(request).ConfigureAwait(false))
+ if (string.Equals(request.Format, "vtt", StringComparison.OrdinalIgnoreCase) && request.AddVttTimeMap)
{
- if (string.Equals(request.Format, "vtt", StringComparison.OrdinalIgnoreCase) && request.AddVttTimeMap)
+ using (var stream = await GetSubtitles(request).ConfigureAwait(false))
{
using (var reader = new StreamReader(stream))
{
@@ -228,8 +228,9 @@ namespace MediaBrowser.Api.Subtitles
return ResultFactory.GetResult(text, MimeTypes.GetMimeType("file." + request.Format));
}
}
- return ResultFactory.GetResult(stream, MimeTypes.GetMimeType("file." + request.Format));
}
+
+ return ResultFactory.GetResult(await GetSubtitles(request).ConfigureAwait(false), MimeTypes.GetMimeType("file." + request.Format));
}
private Task<Stream> GetSubtitles(GetSubtitle request)
diff --git a/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
index 60d0d7c41..7b88f12df 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
@@ -88,8 +88,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
Headers["Content-Length"] = source.Length.ToString(UsCulture);
}
- private const int BufferSize = 81920;
-
public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
{
try
@@ -102,7 +100,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{
using (var src = SourceStream)
{
- await src.CopyToAsync(responseStream, BufferSize).ConfigureAwait(false);
+ await src.CopyToAsync(responseStream).ConfigureAwait(false);
}
}
}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index f3224127a..e6f203120 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -79,7 +79,6 @@
<Private>True</Private>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
@@ -87,16 +86,12 @@
<Reference Include="System.Net" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
- <Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="ServiceStack">
<HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.Common">
- <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Common.dll</HintPath>
- </Reference>
<Reference Include="ServiceStack.Interfaces">
<HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>
</Reference>