Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

3 files changed, 208 insertions, 6 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
index cdb6adbe7..0445cd863 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using System.Net;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
@@ -257,7 +258,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
                 var stream = await factoryFn().ConfigureAwait(false);
 
-                return new StreamWriter(stream);
+                var httpListenerResponse = (HttpListenerResponse) Response.OriginalResponse;
+                httpListenerResponse.SendChunked = false;
+
+                if (IsRangeRequest)
+                {
+                    return new RangeRequestWriter(Request.Headers, httpListenerResponse, stream);
+                }
+
+                httpListenerResponse.ContentLength64 = stream.Length;
+                return new StreamWriter(stream, Logger);
             }
 
             string content;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
new file mode 100644
index 000000000..e5c4c9796
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
@@ -0,0 +1,177 @@
+using ServiceStack.Service;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.HttpServer
+{
+    public class RangeRequestWriter : IStreamWriter
+    {
+        /// <summary>
+        /// Gets or sets the source stream.
+        /// </summary>
+        /// <value>The source stream.</value>
+        public Stream SourceStream { get; set; }
+        public HttpListenerResponse Response { get; set; }
+        public NameValueCollection RequestHeaders { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamWriter" /> class.
+        /// </summary>
+        /// <param name="requestHeaders">The request headers.</param>
+        /// <param name="response">The response.</param>
+        /// <param name="source">The source.</param>
+        public RangeRequestWriter(NameValueCollection requestHeaders, HttpListenerResponse response, Stream source)
+        {
+            RequestHeaders = requestHeaders;
+            Response = response;
+            SourceStream = source;
+        }
+
+        /// <summary>
+        /// The _requested ranges
+        /// </summary>
+        private List<KeyValuePair<long, long?>> _requestedRanges;
+        /// <summary>
+        /// Gets the requested ranges.
+        /// </summary>
+        /// <value>The requested ranges.</value>
+        protected IEnumerable<KeyValuePair<long, long?>> RequestedRanges
+        {
+            get
+            {
+                if (_requestedRanges == null)
+                {
+                    _requestedRanges = new List<KeyValuePair<long, long?>>();
+
+                    // Example: bytes=0-,32-63
+                    var ranges = RequestHeaders["Range"].Split('=')[1].Split(',');
+
+                    foreach (var range in ranges)
+                    {
+                        var vals = range.Split('-');
+
+                        long start = 0;
+                        long? end = null;
+
+                        if (!string.IsNullOrEmpty(vals[0]))
+                        {
+                            start = long.Parse(vals[0]);
+                        }
+                        if (!string.IsNullOrEmpty(vals[1]))
+                        {
+                            end = long.Parse(vals[1]);
+                        }
+
+                        _requestedRanges.Add(new KeyValuePair<long, long?>(start, end));
+                    }
+                }
+
+                return _requestedRanges;
+            }
+        }
+
+        /// <summary>
+        /// Writes to.
+        /// </summary>
+        /// <param name="responseStream">The response stream.</param>
+        public void WriteTo(Stream responseStream)
+        {
+            Response.Headers["Accept-Ranges"] = "bytes";
+            Response.StatusCode = 206;
+            
+            var task = WriteToAsync(responseStream);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Writes to async.
+        /// </summary>
+        /// <param name="responseStream">The response stream.</param>
+        /// <returns>Task.</returns>
+        private async Task WriteToAsync(Stream responseStream)
+        {
+            using (var source = SourceStream)
+            {
+                var requestedRange = RequestedRanges.First();
+
+                var totalLength = SourceStream.Length;
+
+                // If the requested range is "0-", we can optimize by just doing a stream copy
+                if (!requestedRange.Value.HasValue)
+                {
+                    await ServeCompleteRangeRequest(source, requestedRange, responseStream, totalLength).ConfigureAwait(false);
+                }
+
+                // This will have to buffer a portion of the content into memory
+                await ServePartialRangeRequest(source, requestedRange.Key, requestedRange.Value.Value, responseStream, totalLength).ConfigureAwait(false);
+            }
+        }
+
+        /// <summary>
+        /// Handles a range request of "bytes=0-"
+        /// This will serve the complete content and add the content-range header
+        /// </summary>
+        /// <param name="sourceStream">The source stream.</param>
+        /// <param name="requestedRange">The requested range.</param>
+        /// <param name="responseStream">The response stream.</param>
+        /// <param name="totalContentLength">Total length of the content.</param>
+        /// <returns>Task.</returns>
+        private Task ServeCompleteRangeRequest(Stream sourceStream, KeyValuePair<long, long?> requestedRange, Stream responseStream, long totalContentLength)
+        {
+            var rangeStart = requestedRange.Key;
+            var rangeEnd = totalContentLength - 1;
+            var rangeLength = 1 + rangeEnd - rangeStart;
+
+            // Content-Length is the length of what we're serving, not the original content
+            Response.ContentLength64 = rangeLength;
+            Response.Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", rangeStart, rangeEnd, totalContentLength);
+
+            if (rangeStart > 0)
+            {
+                sourceStream.Position = rangeStart;
+            }
+
+            return sourceStream.CopyToAsync(responseStream);
+        }
+
+        /// <summary>
+        /// Serves a partial range request
+        /// </summary>
+        /// <param name="sourceStream">The source stream.</param>
+        /// <param name="rangeStart">The range start.</param>
+        /// <param name="rangeEnd">The range end.</param>
+        /// <param name="responseStream">The response stream.</param>
+        /// <param name="totalContentLength">Total length of the content.</param>
+        /// <returns>Task.</returns>
+        private async Task ServePartialRangeRequest(Stream sourceStream, long rangeStart, long rangeEnd, Stream responseStream, long totalContentLength)
+        {
+            var rangeLength = 1 + rangeEnd - rangeStart;
+
+            // Content-Length is the length of what we're serving, not the original content
+            Response.ContentLength64 = rangeLength;
+            Response.Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", rangeStart, rangeEnd, totalContentLength);
+
+            sourceStream.Position = rangeStart;
+
+            // Fast track to just copy the stream to the end
+            if (rangeEnd == totalContentLength - 1)
+            {
+                await sourceStream.CopyToAsync(responseStream).ConfigureAwait(false);
+            }
+            else
+            {
+                // Read the bytes we need
+                var buffer = new byte[Convert.ToInt32(rangeLength)];
+                await sourceStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
+
+                await responseStream.WriteAsync(buffer, 0, Convert.ToInt32(rangeLength)).ConfigureAwait(false);
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
index ab178b6ea..6f5d6e25f 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
@@ -1,4 +1,6 @@
-using ServiceStack.Service;
+using MediaBrowser.Model.Logging;
+using ServiceStack.Service;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -9,6 +11,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
     /// </summary>
     public class StreamWriter : IStreamWriter
     {
+        private ILogger Logger { get; set; }
+        
         /// <summary>
         /// Gets or sets the source stream.
         /// </summary>
@@ -19,9 +23,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// Initializes a new instance of the <see cref="StreamWriter" /> class.
         /// </summary>
         /// <param name="source">The source.</param>
-        public StreamWriter(Stream source)
+        /// <param name="logger">The logger.</param>
+        public StreamWriter(Stream source, ILogger logger)
         {
             SourceStream = source;
+            Logger = logger;
         }
 
         /// <summary>
@@ -42,9 +48,18 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// <returns>Task.</returns>
         private async Task WriteToAsync(Stream responseStream)
         {
-            using (var src = SourceStream)
+            try
             {
-                await src.CopyToAsync(responseStream).ConfigureAwait(false);
+                using (var src = SourceStream)
+                {
+                    await src.CopyToAsync(responseStream).ConfigureAwait(false);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error streaming media", ex);
+
+                throw;
             }
         }
     }