CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-27 04:16:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

replace channel tabs

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-18 14:07:03 -04:00
parent 1279c6d8b5
commit b3de0249d8
6 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
View file

@ -459,7 +459,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (!string.IsNullOrEmpty(rangeHeader))
{
return new RangeRequestWriter(rangeHeader, stream, contentType, isHeadRequest)
return new RangeRequestWriter(rangeHeader, stream, contentType, isHeadRequest, _logger)
{
OnComplete = options.OnComplete
};

18
MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
View file

@ -1,4 +1,5 @@
using ServiceStack.Web;
using MediaBrowser.Model.Logging;
using ServiceStack.Web;
using System;
using System.Collections.Generic;
using System.Globalization;
@ -25,6 +26,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
private long TotalContentLength { get; set; }
public Action OnComplete { get; set; }
private readonly ILogger _logger;
/// <summary>
/// The _options
@ -61,7 +63,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// <param name="source">The source.</param>
/// <param name="contentType">Type of the content.</param>
/// <param name="isHeadRequest">if set to <c>true</c> [is head request].</param>
public RangeRequestWriter(string rangeHeader, Stream source, string contentType, bool isHeadRequest)
public RangeRequestWriter(string rangeHeader, Stream source, string contentType, bool isHeadRequest, ILogger logger)
{
if (string.IsNullOrEmpty(contentType))
{
@ -71,6 +73,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
RangeHeader = rangeHeader;
SourceStream = source;
IsHeadRequest = isHeadRequest;
this._logger = logger;
ContentType = contentType;
Options["Content-Type"] = contentType;
@ -188,10 +191,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer
}
else
{
CopyToInternal(source, responseStream, Convert.ToInt32(RangeLength));
CopyToInternal(source, responseStream, RangeLength);
}
}
}
catch (Exception ex)
{
_logger.ErrorException("Error in range request writer", ex);
throw;
}
finally
{
if (OnComplete != null)
@ -201,7 +209,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
}
}
private void CopyToInternal(Stream source, Stream destination, int copyLength)
private void CopyToInternal(Stream source, Stream destination, long copyLength)
{
const int bufferSize = 81920;
var array = new byte[bufferSize];
@ -210,7 +218,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{
var bytesToCopy = Math.Min(count, copyLength);
destination.Write(array, 0, bytesToCopy);
destination.Write(array, 0, Convert.ToInt32(bytesToCopy));
copyLength -= bytesToCopy;