Some minor code cleanups

6 files changed, 63 insertions, 66 deletions

diff --git a/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
index 9d9e2a0e0..3ce85a688 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
@@ -5,7 +5,7 @@ namespace MediaBrowser.Common.Net.Handlers
 {

     public abstract class BaseEmbeddedResourceHandler : BaseHandler

     {

-        public BaseEmbeddedResourceHandler(string resourcePath)

+        protected BaseEmbeddedResourceHandler(string resourcePath)

             : base()

         {

             ResourcePath = resourcePath;

@@ -15,7 +15,7 @@ namespace MediaBrowser.Common.Net.Handlers
 

         public override Task<string> GetContentType()

         {

-            return Task.FromResult<string>(MimeTypes.GetMimeType(ResourcePath));

+            return Task.FromResult(MimeTypes.GetMimeType(ResourcePath));

         }

 

         protected override Task WriteResponseToOutputStream(Stream stream)

diff --git a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
index ecc58b316..7c1815265 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
@@ -25,8 +25,8 @@ namespace MediaBrowser.Common.Net.Handlers
             }

         }

 

-        private bool _TotalContentLengthDiscovered = false;

-        private long? _TotalContentLength = null;

+        private bool _TotalContentLengthDiscovered;

+        private long? _TotalContentLength;

         public long? TotalContentLength

         {

             get

@@ -34,6 +34,7 @@ namespace MediaBrowser.Common.Net.Handlers
                 if (!_TotalContentLengthDiscovered)

                 {

                     _TotalContentLength = GetTotalContentLength();

+                    _TotalContentLengthDiscovered = true;

                 }

 

                 return _TotalContentLength;

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

         }

 

-        protected List<KeyValuePair<long, long?>> _RequestedRanges = null;

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

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

         {

             get

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

             DateTime? value = null;

 

-            return Task.FromResult<DateTime?>(value);

+            return Task.FromResult(value);

         }

 

         private bool IsResponseValid

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

         }

 

-        private Hashtable _FormValues = null;

+        private Hashtable _FormValues;

 

         /// <summary>

         /// Gets a value from form POST data

diff --git a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs
index dd3020e03..1983c408d 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Common.Net.Handlers
 

                 if (string.IsNullOrEmpty(format))

                 {

-                    return Handlers.SerializationFormat.Json;

+                    return SerializationFormat.Json;

                 }

 

                 return (SerializationFormat)Enum.Parse(typeof(SerializationFormat), format, true);

@@ -26,16 +26,16 @@ namespace MediaBrowser.Common.Net.Handlers
         {

             switch (SerializationFormat)

             {

-                case Handlers.SerializationFormat.Jsv:

-                    return Task.FromResult<string>("text/plain");

-                case Handlers.SerializationFormat.Protobuf:

-                    return Task.FromResult<string>("application/x-protobuf");

+                case SerializationFormat.Jsv:

+                    return Task.FromResult("text/plain");

+                case SerializationFormat.Protobuf:

+                    return Task.FromResult("application/x-protobuf");

                 default:

-                    return Task.FromResult<string>(MimeTypes.JsonMimeType);

+                    return Task.FromResult(MimeTypes.JsonMimeType);

             }

         }

 

-        private bool _ObjectToSerializeEnsured = false;

+        private bool _ObjectToSerializeEnsured;

         private T _ObjectToSerialize;

      

         private async Task EnsureObjectToSerialize()

@@ -66,14 +66,14 @@ namespace MediaBrowser.Common.Net.Handlers
 

             switch (SerializationFormat)

             {

-                case Handlers.SerializationFormat.Jsv:

-                    JsvSerializer.SerializeToStream<T>(_ObjectToSerialize, stream);

+                case SerializationFormat.Jsv:

+                    JsvSerializer.SerializeToStream(_ObjectToSerialize, stream);

                     break;

-                case Handlers.SerializationFormat.Protobuf:

-                    ProtobufSerializer.SerializeToStream<T>(_ObjectToSerialize, stream);

+                case SerializationFormat.Protobuf:

+                    ProtobufSerializer.SerializeToStream(_ObjectToSerialize, stream);

                     break;

                 default:

-                    JsonSerializer.SerializeToStream<T>(_ObjectToSerialize, stream);

+                    JsonSerializer.SerializeToStream(_ObjectToSerialize, stream);

                     break;

             }

         }

diff --git a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
index bc367403b..f5c441310 100644
--- a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
@@ -33,8 +33,8 @@ namespace MediaBrowser.Common.Net.Handlers
             }

         }

 

-        private bool _SourceStreamEnsured = false;

-        private Stream _SourceStream = null;

+        private bool _SourceStreamEnsured;

+        private Stream _SourceStream;

         private Stream SourceStream

         {

             get

@@ -116,12 +116,12 @@ namespace MediaBrowser.Common.Net.Handlers
                 value = File.GetLastWriteTimeUtc(Path);

             }

 

-            return Task.FromResult<DateTime?>(value);

+            return Task.FromResult(value);

         }

 

         public override Task<string> GetContentType()

         {

-            return Task.FromResult<string>(MimeTypes.GetMimeType(Path));

+            return Task.FromResult(MimeTypes.GetMimeType(Path));

         }

 

         protected override Task PrepareResponse()

@@ -141,21 +141,17 @@ namespace MediaBrowser.Common.Net.Handlers
                 {

                     return ServeCompleteRangeRequest(requestedRange, stream);

                 }

-                else if (TotalContentLength.HasValue)

+                if (TotalContentLength.HasValue)

                 {

                     // This will have to buffer a portion of the content into memory

                     return ServePartialRangeRequestWithKnownTotalContentLength(requestedRange, stream);

                 }

-                else

-                {

-                    // This will have to buffer the entire content into memory

-                    return ServePartialRangeRequestWithUnknownTotalContentLength(requestedRange, stream);

-                }

-            }

-            else

-            {

-                return SourceStream.CopyToAsync(stream);

+

+                // This will have to buffer the entire content into memory

+                return ServePartialRangeRequestWithUnknownTotalContentLength(requestedRange, stream);

             }

+

+            return SourceStream.CopyToAsync(stream);

         }

 

         protected override void DisposeResponseStream()

diff --git a/MediaBrowser.Common/Net/HttpServer.cs b/MediaBrowser.Common/Net/HttpServer.cs
index 69ded6f81..1b3a272f1 100644
--- a/MediaBrowser.Common/Net/HttpServer.cs
+++ b/MediaBrowser.Common/Net/HttpServer.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Common.Net
         private IObservable<HttpListenerContext> ObservableHttpContext()

         {

             return Observable.Create<HttpListenerContext>(obs =>

-                                Observable.FromAsync<HttpListenerContext>(() => listener.GetContextAsync())

+                                Observable.FromAsync(() => listener.GetContextAsync())

                                           .Subscribe(obs))

                              .Repeat()

                              .Retry()

diff --git a/MediaBrowser.Common/Net/MimeTypes.cs b/MediaBrowser.Common/Net/MimeTypes.cs
index 3ec13ce83..fb85b0f2a 100644
--- a/MediaBrowser.Common/Net/MimeTypes.cs
+++ b/MediaBrowser.Common/Net/MimeTypes.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Common.Net
 

         public static string GetMimeType(string path)

         {

-            string ext = Path.GetExtension(path);

+            var ext = Path.GetExtension(path);

 

             // http://en.wikipedia.org/wiki/Internet_media_type

             // Add more as needed

@@ -19,137 +19,137 @@ namespace MediaBrowser.Common.Net
             {

                 return "video/mpeg";

             }

-            else if (ext.EndsWith("mp4", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("mp4", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/mp4";

             }

-            else if (ext.EndsWith("ogv", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("ogv", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/ogg";

             }

-            else if (ext.EndsWith("mov", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("mov", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/quicktime";

             }

-            else if (ext.EndsWith("webm", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("webm", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/webm";

             }

-            else if (ext.EndsWith("mkv", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("mkv", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/x-matroska";

             }

-            else if (ext.EndsWith("wmv", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("wmv", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/x-ms-wmv";

             }

-            else if (ext.EndsWith("flv", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("flv", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/x-flv";

             }

-            else if (ext.EndsWith("avi", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("avi", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/avi";

             }

-            else if (ext.EndsWith("m4v", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("m4v", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/x-m4v";

             }

-            else if (ext.EndsWith("asf", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("asf", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/x-ms-asf";

             }

-            else if (ext.EndsWith("3gp", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("3gp", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/3gpp";

             }

-            else if (ext.EndsWith("3g2", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("3g2", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/3gpp2";

             }

-            else if (ext.EndsWith("ts", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("ts", StringComparison.OrdinalIgnoreCase))

             {

                 return "video/mp2t";

             }

 

             // Type text

-            else if (ext.EndsWith("css", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("css", StringComparison.OrdinalIgnoreCase))

             {

                 return "text/css";

             }

-            else if (ext.EndsWith("csv", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("csv", StringComparison.OrdinalIgnoreCase))

             {

                 return "text/csv";

             }

-            else if (ext.EndsWith("html", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("html", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("html", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("html", StringComparison.OrdinalIgnoreCase))

             {

                 return "text/html";

             }

-            else if (ext.EndsWith("txt", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("txt", StringComparison.OrdinalIgnoreCase))

             {

                 return "text/plain";

             }

 

             // Type image

-            else if (ext.EndsWith("gif", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("gif", StringComparison.OrdinalIgnoreCase))

             {

                 return "image/gif";

             }

-            else if (ext.EndsWith("jpg", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("jpeg", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("jpg", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("jpeg", StringComparison.OrdinalIgnoreCase))

             {

                 return "image/jpeg";

             }

-            else if (ext.EndsWith("png", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("png", StringComparison.OrdinalIgnoreCase))

             {

                 return "image/png";

             }

-            else if (ext.EndsWith("ico", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("ico", StringComparison.OrdinalIgnoreCase))

             {

                 return "image/vnd.microsoft.icon";

             }

 

              // Type audio

-            else if (ext.EndsWith("mp3", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("mp3", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/mpeg";

             }

-            else if (ext.EndsWith("m4a", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("aac", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("m4a", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("aac", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/mp4";

             }

-            else if (ext.EndsWith("webma", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("webma", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/webm";

             }

-            else if (ext.EndsWith("wav", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("wav", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/wav";

             }

-            else if (ext.EndsWith("wma", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("wma", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/x-ms-wma";

             }

-            else if (ext.EndsWith("flac", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("flac", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/flac";

             }

-            else if (ext.EndsWith("aac", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("aac", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/x-aac";

             }

-            else if (ext.EndsWith("ogg", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("oga", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("ogg", StringComparison.OrdinalIgnoreCase) || ext.EndsWith("oga", StringComparison.OrdinalIgnoreCase))

             {

                 return "audio/ogg";

             }

 

             // Playlists

-            else if (ext.EndsWith("m3u8", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("m3u8", StringComparison.OrdinalIgnoreCase))

             {

                 return "application/x-mpegURL";

             }

 

             // Misc

-            else if (ext.EndsWith("dll", StringComparison.OrdinalIgnoreCase))

+            if (ext.EndsWith("dll", StringComparison.OrdinalIgnoreCase))

             {

                 return "application/x-msdownload";

             }