Revert "Merge pull request #120 from patchkit-net/feature/v3.x.x/1226-dynamic-url-testing"

This reverts commit 843fb48, reversing
changes made to 2b4269d.

Author: genail

Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/BaseHttpDownloader.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Net;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using PatchKit.Logging;
 using PatchKit.Network;
@@ -15,25 +14,26 @@ public sealed class BaseHttpDownloader : IBaseHttpDownloader
     {
         private readonly ILogger _logger;
 
-        private static readonly ulong DefaultBufferSize = 5 * (ulong) Units.MB;
+        private static readonly int BufferSize = 5 * (int) Units.MB;
 
         private readonly string _url;
         private readonly int _timeout;
         private readonly IHttpClient _httpClient;
 
-        private readonly ulong _bufferSize;
         private readonly byte[] _buffer;
 
         private bool _downloadHasBeenCalled;
         private BytesRange? _bytesRange;
 
+        public event DataAvailableHandler DataAvailable;
+
         public BaseHttpDownloader(string url, int timeout) :
-            this(url, timeout, new DefaultHttpClient(), PatcherLogManager.DefaultLogger, DefaultBufferSize)
+            this(url, timeout, new DefaultHttpClient(), PatcherLogManager.DefaultLogger)
         {
         }
 
         public BaseHttpDownloader([NotNull] string url, int timeout, [NotNull] IHttpClient httpClient,
-            [NotNull] ILogger logger, ulong bufferSize)
+            [NotNull] ILogger logger)
         {
             if (string.IsNullOrEmpty(url)) throw new ArgumentException("Value cannot be null or empty.", "url");
             if (timeout <= 0) throw new ArgumentOutOfRangeException("timeout");
@@ -45,8 +45,7 @@ public BaseHttpDownloader([NotNull] string url, int timeout, [NotNull] IHttpClie
             _httpClient = httpClient;
             _logger = logger;
 
-            _bufferSize = bufferSize;
-            _buffer = new byte[_bufferSize];
+            _buffer = new byte[BufferSize];
 
             ServicePointManager.ServerCertificateValidationCallback =
                 (sender, certificate, chain, errors) => true;
@@ -63,26 +62,13 @@ public void SetBytesRange(BytesRange? range)
             }
         }
 
-        public void Download(CancellationToken cancellationToken, [NotNull] DataAvailableHandler onDataAvailable)
-        {
-            if (onDataAvailable == null)
-            {
-                throw new ArgumentNullException("onDataAvailable");
-            }
-
-            foreach (DataPacket packet in ReadPackets(cancellationToken))
-            {
-                onDataAvailable(packet.Data, packet.Length);
-            }
-        }
-
-        public IEnumerable<DataPacket> ReadPackets(CancellationToken cancellationToken)
+        public void Download(CancellationToken cancellationToken)
         {
             try
             {
                 _logger.LogDebug("Downloading...");
                 _logger.LogTrace("url = " + _url);
-                _logger.LogTrace("bufferSize = " + _bufferSize);
+                _logger.LogTrace("bufferSize = " + BufferSize);
                 _logger.LogTrace("bytesRange = " + (_bytesRange.HasValue
                                      ? _bytesRange.Value.Start + "-" + _bytesRange.Value.End
                                      : "(none)"));
@@ -98,7 +84,37 @@ public IEnumerable<DataPacket> ReadPackets(CancellationToken cancellationToken)
                     ReadWriteTimeout = _timeout,
                 };
 
-                return ReadResponseStream(request, cancellationToken);
+                using (var response = _httpClient.Get(request))
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    _logger.LogDebug("Received response from server.");
+                    _logger.LogTrace("statusCode = " + response.StatusCode);
+
+                    if (Is2XXStatus(response.StatusCode))
+                    {
+                        _logger.LogDebug("Successful response. Reading response stream...");
+
+                        //TODO: Could response.ContentStream be null? Need to check it.
+
+                        ReadResponseStream(response.ContentStream, cancellationToken);
+
+                        _logger.LogDebug("Stream has been read.");
+                    }
+                    else if (Is4XXStatus(response.StatusCode))
+                    {
+                        throw new DataNotAvailableException(string.Format(
+                            "Request data for {0} is not available (status: {1})", _url, response.StatusCode));
+                    }
+                    else
+                    {
+                        throw new ServerErrorException(string.Format(
+                            "Server has experienced some issues with request for {0} which resulted in {1} status code.",
+                            _url, response.StatusCode));
+                    }
+                }
+
+                _logger.LogDebug("Downloading finished.");
             }
             catch (WebException webException)
             {
@@ -113,45 +129,14 @@ public IEnumerable<DataPacket> ReadPackets(CancellationToken cancellationToken)
             }
         }
 
-        private IEnumerable<DataPacket> ReadResponseStream(HttpGetRequest request, CancellationToken cancellationToken)
+        private void ReadResponseStream(Stream responseStream, CancellationToken cancellationToken)
         {
-            using (var response = _httpClient.Get(request))
+            int bufferRead;
+            while ((bufferRead = responseStream.Read(_buffer, 0, BufferSize)) > 0)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                _logger.LogDebug("Received response from server.");
-                _logger.LogTrace("statusCode = " + response.StatusCode);
-
-                if (Is2XXStatus(response.StatusCode))
-                {
-                    _logger.LogDebug("Successful response. Reading response stream...");
-
-                    //TODO: Could response.ContentStream be null? Need to check it.
-
-                    var responseStream = response.ContentStream;
-                    int bufferRead;
-                    while ((bufferRead = responseStream.Read(_buffer, 0, (int) _bufferSize)) > 0)
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
-
-                        var dataPacket = new DataPacket { Data = _buffer, Length = bufferRead, };
-
-                        yield return dataPacket;
-                    }
-
-                    _logger.LogDebug("Downloading finished.");
-                }
-                else if (Is4XXStatus(response.StatusCode))
-                {
-                    throw new DataNotAvailableException(string.Format(
-                        "Request data for {0} is not available (status: {1})", _url, response.StatusCode));
-                }
-                else
-                {
-                    throw new ServerErrorException(string.Format(
-                        "Server has experienced some issues with request for {0} which resulted in {1} status code.",
-                        _url, response.StatusCode));
-                }
+                OnDataAvailable(_buffer, bufferRead);
             }
         }
 
@@ -166,5 +151,11 @@ private static bool Is4XXStatus(HttpStatusCode statusCode)
         {
             return (int) statusCode >= 400 && (int) statusCode <= 499;
         }
+
+        private void OnDataAvailable(byte[] data, int length)
+        {
+            var handler = DataAvailable;
+            if (handler != null) handler(data, length);
+        }
     }
 }