Удалил неиспользуемый метод, отформатировал файл

Author: EvilBeaver

src/OneScript.StandardLibrary/Http/HttpResponseBody.cs

@@ -1,7 +1,7 @@
 /*----------------------------------------------------------
-This Source Code Form is subject to the terms of the 
-Mozilla Public License, v.2.0. If a copy of the MPL 
-was not distributed with this file, You can obtain one 
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v.2.0. If a copy of the MPL
+was not distributed with this file, You can obtain one
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
@@ -23,7 +23,7 @@ class HttpResponseBody : IDisposable
         bool _backFileIsTemp = false;
         byte[] _inMemBody;
 
-        private readonly bool _autoDecompress; 
+        private readonly bool _autoDecompress;
         private long _contentSize = 0;
         private Stream _rawStream;
 
@@ -41,25 +41,25 @@ public HttpResponseBody(HttpWebResponse response, string dumpToFile)
 
             if (!String.IsNullOrEmpty(dumpToFile))
             {
-                 InitFileBackedResponse(response, dumpToFile);
+                InitFileBackedResponse(response, dumpToFile);
             }
-            else if(_autoDecompress)
+            else if (_autoDecompress)
             {
                 InitInMemoryResponse(response);
             }
         }
 
         private void InitInMemoryResponse(HttpWebResponse response)
         {
-            if(_contentSize > INMEMORY_BODY_LIMIT)
+            if (_contentSize > INMEMORY_BODY_LIMIT)
             {
                 var filename = Path.GetTempFileName();
                 _backFileIsTemp = true;
                 InitFileBackedResponse(response, filename);
             }
             else
             {
-                if(_contentSize == UNDEFINED_LENGTH)
+                if (_contentSize == UNDEFINED_LENGTH)
                 {
                     ReadToStream(response);
                 }
@@ -80,10 +80,10 @@ public Stream OpenReadStream()
             {
                 return new FileStream(_backingFileName, FileMode.Open, FileAccess.Read);
             }
-           else if (_inMemBody != null)
-           {
-               return new MemoryStream(_inMemBody);
-           }
+            else if (_inMemBody != null)
+            {
+                return new MemoryStream(_inMemBody);
+            }
             else
                 return _rawStream;
         }
@@ -94,11 +94,11 @@ private Stream GetResponseStream(HttpWebResponse response)
                 return new GZipStream(response.GetResponseStream(), CompressionMode.Decompress);
             return response.GetResponseStream();
         }
-        
+
         private void ReadToStream(HttpWebResponse response)
         {
             using (var responseStream = GetResponseStream(response))
-            using(var ms = new MemoryStream())
+            using (var ms = new MemoryStream())
             {
                 bool memStreamIsAlive = true;
 
@@ -114,12 +114,12 @@ private void ReadToStream(HttpWebResponse response)
 
                     readTotal += bytesRead;
 
-                    if(readTotal > INMEMORY_BODY_LIMIT)
+                    if (readTotal > INMEMORY_BODY_LIMIT)
                     {
                         var filename = Path.GetTempFileName();
                         _backFileIsTemp = true;
                         _backingFileName = filename;
-                        
+
                         ms.Position = 0;
                         using (var file = new FileStream(filename, FileMode.Create))
                         {
@@ -130,11 +130,10 @@ private void ReadToStream(HttpWebResponse response)
                         }
 
                         break;
-
                     }
                 }
 
-                if(memStreamIsAlive)
+                if (memStreamIsAlive)
                 {
                     _inMemBody = new byte[ms.Length];
                     ms.Position = 0;
@@ -149,7 +148,7 @@ private void ReadToStream(HttpWebResponse response)
         private void ReadToArray(HttpWebResponse response)
         {
             System.Diagnostics.Debug.Assert(_contentSize <= INMEMORY_BODY_LIMIT);
-            
+
             using var stream = GetResponseStream(response);
             var mustRead = (int)_contentSize;
             _inMemBody = new byte[mustRead];
@@ -171,9 +170,9 @@ private void ReadToArray(HttpWebResponse response)
         private void InitFileBackedResponse(HttpWebResponse response, string backingFileName)
         {
             _backingFileName = backingFileName;
-            using(var responseStream = GetResponseStream(response))
+            using (var responseStream = GetResponseStream(response))
             {
-                using(var file = new FileStream(backingFileName, FileMode.Create))
+                using (var file = new FileStream(backingFileName, FileMode.Create))
                 {
                     StreamToStreamCopy(responseStream, file);
                 }
@@ -195,7 +194,7 @@ private static void StreamToStreamCopy(Stream responseStream, Stream acceptor)
 
         private void Dispose(bool manualDispose)
         {
-            if(manualDispose)
+            if (manualDispose)
             {
                 GC.SuppressFinalize(this);
                 _inMemBody = null;
@@ -206,9 +205,9 @@ private void Dispose(bool manualDispose)
 
         private void KillTemporaryFile()
         {
-            if(_backFileIsTemp && _backingFileName != null)
+            if (_backFileIsTemp && _backingFileName != null)
             {
-                if(File.Exists(_backingFileName))
+                if (File.Exists(_backingFileName))
                 {
                     try
                     {
@@ -232,4 +231,4 @@ public void Dispose()
             Dispose(false);
         }
     }
-}
+}

src/OneScript.StandardLibrary/Http/HttpResponseContext.cs

@@ -49,23 +49,6 @@ public HttpResponseContext(HttpWebResponse response, string dumpToFile)
             }
         }
 
-        private void RetrieveResponseData(HttpWebResponse response, string dumpToFile)
-        {
-            using(response)
-            {
-                StatusCode = (int)response.StatusCode;
-                _defaultCharset = response.CharacterSet;
-
-                ProcessHeaders(response.Headers);
-                ProcessResponseBody(response, dumpToFile);
-                if (_body != null && _body.AutoDecompress)
-                {
-                    _headers.Delete(ValueFactory.Create("Content-Encoding"));
-                    _headers.SetIndexedValue(ValueFactory.Create("Content-Length"), ValueFactory.Create(_body.ContentSize));
-                }
-            }
-        }
-
         private void ProcessHeaders(WebHeaderCollection webHeaderCollection)
         {
             foreach (var item in webHeaderCollection.AllKeys)
@@ -90,13 +73,7 @@ private void ProcessResponseBody(HttpWebResponse response, string dumpToFile)
         /// Соответствие. Заголовки ответа сервера.
         /// </summary>
         [ContextProperty("Заголовки", "Headers")]
-        public MapImpl Headers
-        {
-            get
-            {
-                return _headers;
-            }
-        }
+        public MapImpl Headers => _headers;
 
         /// <summary>
         /// Код состояния HTTP ответа. Число.