More code cleanups

3 files changed, 42 insertions, 41 deletions

diff --git a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
index 7c18152655..1a014395ae 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
@@ -25,19 +25,19 @@ namespace MediaBrowser.Common.Net.Handlers
             }

         }

 

-        private bool _TotalContentLengthDiscovered;

-        private long? _TotalContentLength;

+        private bool _totalContentLengthDiscovered;

+        private long? _totalContentLength;

         public long? TotalContentLength

         {

             get

             {

-                if (!_TotalContentLengthDiscovered)

+                if (!_totalContentLengthDiscovered)

                 {

-                    _TotalContentLength = GetTotalContentLength();

-                    _TotalContentLengthDiscovered = true;

+                    _totalContentLength = GetTotalContentLength();

+                    _totalContentLengthDiscovered = true;

                 }

 

-                return _TotalContentLength;

+                return _totalContentLength;

             }

         }

 

@@ -65,14 +65,14 @@ namespace MediaBrowser.Common.Net.Handlers
             }

         }

 

-        private List<KeyValuePair<long, long?>> _RequestedRanges;

+        private List<KeyValuePair<long, long?>> _requestedRanges;

         protected IEnumerable<KeyValuePair<long, long?>> RequestedRanges

         {

             get

             {

-                if (_RequestedRanges == null)

+                if (_requestedRanges == null)

                 {

-                    _RequestedRanges = new List<KeyValuePair<long, long?>>();

+                    _requestedRanges = new List<KeyValuePair<long, long?>>();

 

                     if (IsRangeRequest)

                     {

@@ -95,12 +95,12 @@ namespace MediaBrowser.Common.Net.Handlers
                                 end = long.Parse(vals[1]);

                             }

 

-                            _RequestedRanges.Add(new KeyValuePair<long, long?>(start, end));

+                            _requestedRanges.Add(new KeyValuePair<long, long?>(start, end));

                         }

                     }

                 }

 

-                return _RequestedRanges;

+                return _requestedRanges;

             }

         }

 

@@ -379,21 +379,21 @@ namespace MediaBrowser.Common.Net.Handlers
             }

         }

 

-        private Hashtable _FormValues;

+        private Hashtable _formValues;

 

         /// <summary>

         /// Gets a value from form POST data

         /// </summary>

         protected async Task<string> GetFormValue(string name)

         {

-            if (_FormValues == null)

+            if (_formValues == null)

             {

-                _FormValues = await GetFormValues(HttpListenerContext.Request).ConfigureAwait(false);

+                _formValues = await GetFormValues(HttpListenerContext.Request).ConfigureAwait(false);

             }

 

-            if (_FormValues.ContainsKey(name))

+            if (_formValues.ContainsKey(name))

             {

-                return _FormValues[name].ToString();

+                return _formValues[name].ToString();

             }

 

             return null;

@@ -404,7 +404,7 @@ namespace MediaBrowser.Common.Net.Handlers
         /// </summary>

         private async Task<Hashtable> GetFormValues(HttpListenerRequest request)

         {

-            Hashtable formVars = new Hashtable();

+            var formVars = new Hashtable();

 

             if (request.HasEntityBody)

             {

@@ -412,7 +412,7 @@ namespace MediaBrowser.Common.Net.Handlers
                 {

                     using (Stream requestBody = request.InputStream)

                     {

-                        using (StreamReader reader = new StreamReader(requestBody, request.ContentEncoding))

+                        using (var reader = new StreamReader(requestBody, request.ContentEncoding))

                         {

                             string s = await reader.ReadToEndAsync().ConfigureAwait(false);

 

diff --git a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs
index 1983c408de..d60a9ae1f2 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs
@@ -6,6 +6,7 @@ using MediaBrowser.Common.Serialization;
 namespace MediaBrowser.Common.Net.Handlers

 {

     public abstract class BaseSerializationHandler<T> : BaseHandler

+        where T : class 

     {

         public SerializationFormat SerializationFormat

         {

@@ -35,21 +36,21 @@ namespace MediaBrowser.Common.Net.Handlers
             }

         }

 

-        private bool _ObjectToSerializeEnsured;

-        private T _ObjectToSerialize;

+        private bool _objectToSerializeEnsured;

+        private T _objectToSerialize;

      

         private async Task EnsureObjectToSerialize()

         {

-            if (!_ObjectToSerializeEnsured)

+            if (!_objectToSerializeEnsured)

             {

-                _ObjectToSerialize = await GetObjectToSerialize().ConfigureAwait(false);

+                _objectToSerialize = await GetObjectToSerialize().ConfigureAwait(false);

 

-                if (_ObjectToSerialize == null)

+                if (_objectToSerialize == null)

                 {

                     StatusCode = 404;

                 }

 

-                _ObjectToSerializeEnsured = true;

+                _objectToSerializeEnsured = true;

             }

         }

 

@@ -67,13 +68,13 @@ namespace MediaBrowser.Common.Net.Handlers
             switch (SerializationFormat)

             {

                 case SerializationFormat.Jsv:

-                    JsvSerializer.SerializeToStream(_ObjectToSerialize, stream);

+                    JsvSerializer.SerializeToStream(_objectToSerialize, stream);

                     break;

                 case SerializationFormat.Protobuf:

-                    ProtobufSerializer.SerializeToStream(_ObjectToSerialize, stream);

+                    ProtobufSerializer.SerializeToStream(_objectToSerialize, stream);

                     break;

                 default:

-                    JsonSerializer.SerializeToStream(_ObjectToSerialize, stream);

+                    JsonSerializer.SerializeToStream(_objectToSerialize, stream);

                     break;

             }

         }

diff --git a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
index f5c4413102..741d2d6c17 100644
--- a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
@@ -15,42 +15,42 @@ namespace MediaBrowser.Common.Net.Handlers
             return false;

         }

 

-        private string _Path;

+        private string _path;

         public virtual string Path

         {

             get

             {

-                if (!string.IsNullOrWhiteSpace(_Path))

+                if (!string.IsNullOrWhiteSpace(_path))

                 {

-                    return _Path;

+                    return _path;

                 }

 

                 return QueryString["path"];

             }

             set

             {

-                _Path = value;

+                _path = value;

             }

         }

 

-        private bool _SourceStreamEnsured;

-        private Stream _SourceStream;

+        private bool _sourceStreamEnsured;

+        private Stream _sourceStream;

         private Stream SourceStream

         {

             get

             {

                 EnsureSourceStream();

-                return _SourceStream;

+                return _sourceStream;

             }

         }

 

         private void EnsureSourceStream()

         {

-            if (!_SourceStreamEnsured)

+            if (!_sourceStreamEnsured)

             {

                 try

                 {

-                    _SourceStream = File.OpenRead(Path);

+                    _sourceStream = File.OpenRead(Path);

                 }

                 catch (FileNotFoundException ex)

                 {

@@ -69,7 +69,7 @@ namespace MediaBrowser.Common.Net.Handlers
                 }

                 finally

                 {

-                    _SourceStreamEnsured = true;

+                    _sourceStreamEnsured = true;

                 }

             }

         }

@@ -245,9 +245,9 @@ namespace MediaBrowser.Common.Net.Handlers
 

             if (count == null)

             {

-                byte[] buffer = new byte[16 * 1024];

+                var buffer = new byte[16 * 1024];

 

-                using (MemoryStream ms = new MemoryStream())

+                using (var ms = new MemoryStream())

                 {

                     int read;

                     while ((read = await input.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)

@@ -259,9 +259,9 @@ namespace MediaBrowser.Common.Net.Handlers
             }

             else

             {

-                byte[] buffer = new byte[count.Value];

+                var buffer = new byte[count.Value];

 

-                using (MemoryStream ms = new MemoryStream())

+                using (var ms = new MemoryStream())

                 {

                     int read = await input.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);