From ec1f5dc317182582ebff843c9e8a4d5277405469 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 6 Jan 2019 21:50:43 +0100
Subject: Mayor code cleanup

Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
---
 .../LiveTv/EmbyTV/EmbyTV.cs                        | 41 +++++---------
 .../LiveTv/EmbyTV/EncodedRecorder.cs               | 16 ++----
 .../LiveTv/EmbyTV/ItemDataProvider.cs              |  6 +--
 .../LiveTv/EmbyTV/TimerManager.cs                  |  4 +-
 .../LiveTv/Listings/SchedulesDirect.cs             | 35 +++++-------
 .../LiveTv/Listings/XmlTvListingsProvider.cs       | 26 ++++-----
 .../LiveTv/LiveTvDtoService.cs                     | 11 ++--
 .../LiveTv/LiveTvManager.cs                        | 24 +++------
 .../LiveTv/RefreshChannelsScheduledTask.cs         | 35 +++---------
 .../LiveTv/TunerHosts/BaseTunerHost.cs             | 23 +++-----
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs   | 31 +++--------
 .../TunerHosts/HdHomerun/HdHomerunManager.cs       | 28 +++++-----
 .../TunerHosts/HdHomerun/HdHomerunUdpStream.cs     | 62 ++++++----------------
 .../LiveTv/TunerHosts/LiveStream.cs                |  8 +--
 .../LiveTv/TunerHosts/M3UTunerHost.cs              | 10 +---
 .../LiveTv/TunerHosts/M3uParser.cs                 |  8 +--
 16 files changed, 118 insertions(+), 250 deletions(-)

(limited to 'Emby.Server.Implementations/LiveTv')

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 81a47bfea1..ba2aee08db 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
@@ -254,27 +254,15 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (requiresRefresh)
             {
-                await _libraryManager.ValidateMediaLibrary(new SimpleProgress<Double>(), CancellationToken.None);
+                await _libraryManager.ValidateMediaLibrary(new SimpleProgress<double>(), CancellationToken.None);
             }
         }
 
-        public string Name
-        {
-            get { return "Emby"; }
-        }
+        public string Name => "Emby";
 
-        public string DataPath
-        {
-            get { return Path.Combine(_config.CommonApplicationPaths.DataPath, "livetv"); }
-        }
+        public string DataPath => Path.Combine(_config.CommonApplicationPaths.DataPath, "livetv");
 
-        private string DefaultRecordingPath
-        {
-            get
-            {
-                return Path.Combine(DataPath, "recordings");
-            }
-        }
+        private string DefaultRecordingPath => Path.Combine(DataPath, "recordings");
 
         private string RecordingPath
         {
@@ -288,10 +276,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public string HomePageUrl
-        {
-            get { return "https://github.com/jellyfin/jellyfin"; }
-        }
+        public string HomePageUrl => "https://github.com/jellyfin/jellyfin";
 
         public async Task RefreshSeriesTimers(CancellationToken cancellationToken, IProgress<double> progress)
         {
@@ -491,7 +476,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return GetEpgChannelFromTunerChannel(info, tunerChannel, epgChannels);
         }
 
-        private string GetMappedChannel(string channelId, NameValuePair[] mappings)
+        private static string GetMappedChannel(string channelId, NameValuePair[] mappings)
         {
             foreach (NameValuePair mapping in mappings)
             {
@@ -850,7 +835,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return Task.CompletedTask;
         }
 
-        private void UpdateExistingTimerWithNewMetadata(TimerInfo existingTimer, TimerInfo updatedTimer)
+        private static void UpdateExistingTimerWithNewMetadata(TimerInfo existingTimer, TimerInfo updatedTimer)
         {
             // Update the program info but retain the status
             existingTimer.ChannelId = updatedTimer.ChannelId;
@@ -980,7 +965,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (string.IsNullOrWhiteSpace(tunerHostId))
             {
-                throw new ArgumentNullException("tunerHostId");
+                throw new ArgumentNullException(nameof(tunerHostId));
             }
 
             return info.EnabledTuners.Contains(tunerHostId, StringComparer.OrdinalIgnoreCase);
@@ -1114,7 +1099,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if (string.IsNullOrWhiteSpace(channelId))
             {
-                throw new ArgumentNullException("channelId");
+                throw new ArgumentNullException(nameof(channelId));
             }
 
             foreach (var hostInstance in _liveTvManager.TunerHosts)
@@ -1342,7 +1327,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if (timer == null)
             {
-                throw new ArgumentNullException("timer");
+                throw new ArgumentNullException(nameof(timer));
             }
 
             LiveTvProgram programInfo = null;
@@ -1795,7 +1780,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private string GetPostProcessArguments(string path, string arguments)
+        private static string GetPostProcessArguments(string path, string arguments)
         {
             return arguments.Replace("{path}", path, StringComparison.OrdinalIgnoreCase);
         }
@@ -2501,7 +2486,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if (seriesTimer == null)
             {
-                throw new ArgumentNullException("seriesTimer");
+                throw new ArgumentNullException(nameof(seriesTimer));
             }
 
             var query = new InternalItemsQuery
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index 4ea83b7acd..5463f78c22 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -55,14 +55,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             _assemblyInfo = assemblyInfo;
         }
 
-        private bool CopySubtitles
-        {
-            get
-            {
-                return false;
-                //return string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase);
-            }
-        }
+        private static bool CopySubtitles => false;
 
         public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile)
         {
@@ -226,7 +219,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return inputModifier + " " + commandLineArgs;
         }
 
-        private string GetAudioArgs(MediaSourceInfo mediaSource)
+        private static string GetAudioArgs(MediaSourceInfo mediaSource)
         {
             var mediaStreams = mediaSource.MediaStreams ?? new List<MediaStream>();
             var inputAudioCodec = mediaStreams.Where(i => i.Type == MediaStreamType.Audio).Select(i => i.Codec).FirstOrDefault() ?? string.Empty;
@@ -242,7 +235,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             //return "-codec:a:0 aac -strict experimental -ab 320000";
         }
 
-        private bool EncodeVideo(MediaSourceInfo mediaSource)
+        private static bool EncodeVideo(MediaSourceInfo mediaSource)
         {
             return false;
         }
@@ -383,6 +376,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (ObjectDisposedException)
             {
+                // TODO Investigate and properly fix.
                 // Don't spam the log. This doesn't seem to throw in windows, but sometimes under linux
             }
             catch (Exception ex)
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index 9f179dc2ce..593f98881a 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -68,7 +68,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if (newList == null)
             {
-                throw new ArgumentNullException("newList");
+                throw new ArgumentNullException(nameof(newList));
             }
 
             var file = _dataPath + ".json";
@@ -85,7 +85,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
 
             var list = GetAll().ToList();
@@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
 
             var list = GetAll().ToList();
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
index e4ab347704..bdc6ae0093 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Globalization;
 using System.Linq;
@@ -90,7 +90,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             AddOrUpdateSystemTimer(item);
         }
 
-        private bool ShouldStartTimer(TimerInfo item)
+        private static bool ShouldStartTimer(TimerInfo item)
         {
             if (item.Status == RecordingStatus.Completed ||
                 item.Status == RecordingStatus.Cancelled)
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index e8ffd0caaf..0ba8c8b42b 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.LiveTv;
@@ -38,12 +38,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             _appHost = appHost;
         }
 
-        private string UserAgent
-        {
-            get { return "Emby/" + _appHost.ApplicationVersion; }
-        }
+        private string UserAgent => "Emby/" + _appHost.ApplicationVersion;
 
-        private List<string> GetScheduleRequestDates(DateTime startDateUtc, DateTime endDateUtc)
+        private static List<string> GetScheduleRequestDates(DateTime startDateUtc, DateTime endDateUtc)
         {
             List<string> dates = new List<string>();
 
@@ -63,7 +60,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         {
             if (string.IsNullOrEmpty(channelId))
             {
-                throw new ArgumentNullException("channelId");
+                throw new ArgumentNullException(nameof(channelId));
             }
 
             // Normalize incoming input
@@ -189,7 +186,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             }
         }
 
-        private int GetSizeOrder(ScheduleDirect.ImageData image)
+        private static int GetSizeOrder(ScheduleDirect.ImageData image)
         {
             if (!string.IsNullOrWhiteSpace(image.height))
             {
@@ -202,7 +199,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return 0;
         }
 
-        private string GetChannelNumber(ScheduleDirect.Map map)
+        private static string GetChannelNumber(ScheduleDirect.Map map)
         {
             var channelNumber = map.logicalChannelNumber;
 
@@ -218,7 +215,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return channelNumber.TrimStart('0');
         }
 
-        private bool IsMovie(ScheduleDirect.ProgramDetails programInfo)
+        private static bool IsMovie(ScheduleDirect.ProgramDetails programInfo)
         {
             return string.Equals(programInfo.entityType, "movie", StringComparison.OrdinalIgnoreCase);
         }
@@ -390,7 +387,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return info;
         }
 
-        private DateTime GetDate(string value)
+        private static DateTime GetDate(string value)
         {
             var date = DateTime.ParseExact(value, "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'", CultureInfo.InvariantCulture);
 
@@ -429,7 +426,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             }
         }
 
-        private double GetAspectRatio(ScheduleDirect.ImageData i)
+        private static double GetAspectRatio(ScheduleDirect.ImageData i)
         {
             int width = 0;
             int height = 0;
@@ -664,7 +661,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 }
             }
 
-            options.RequestHeaders["token"] = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);;
+            options.RequestHeaders["token"] = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);
             return await Post(options, false, providerInfo).ConfigureAwait(false);
         }
 
@@ -765,16 +762,10 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             }
         }
 
-        public string Name
-        {
-            get { return "Schedules Direct"; }
-        }
+        public string Name => "Schedules Direct";
 
         public static string TypeName = "SchedulesDirect";
-        public string Type
-        {
-            get { return TypeName; }
-        }
+        public string Type => TypeName;
 
         private async Task<bool> HasLineup(ListingsProviderInfo info, CancellationToken cancellationToken)
         {
@@ -951,7 +942,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return null;
         }
 
-        private string NormalizeName(string value)
+        private static string NormalizeName(string value)
         {
             return value.Replace(" ", string.Empty).Replace("-", string.Empty);
         }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
index 4d7c7fef41..2b1ee84a8a 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
@@ -36,15 +36,9 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
             _zipClient = zipClient;
         }
 
-        public string Name
-        {
-            get { return "XmlTV"; }
-        }
+        public string Name => "XmlTV";
 
-        public string Type
-        {
-            get { return "xmltv"; }
-        }
+        public string Type => "xmltv";
 
         private string GetLanguage(ListingsProviderInfo info)
         {
@@ -78,7 +72,7 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
             {
                 CancellationToken = cancellationToken,
                 Url = path,
-                Progress = new SimpleProgress<Double>(),
+                Progress = new SimpleProgress<double>(),
                 DecompressionMethod = CompressionMethod.Gzip,
 
                 // It's going to come back gzipped regardless of this value
@@ -164,7 +158,7 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
         {
             if (string.IsNullOrWhiteSpace(channelId))
             {
-                throw new ArgumentNullException("channelId");
+                throw new ArgumentNullException(nameof(channelId));
             }
 
             /*
@@ -187,7 +181,7 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
                         .Select(p => GetProgramInfo(p, info));
         }
 
-        private ProgramInfo GetProgramInfo(XmlTvProgram program, ListingsProviderInfo info)
+        private static ProgramInfo GetProgramInfo(XmlTvProgram program, ListingsProviderInfo info)
         {
             string episodeTitle = program.Episode?.Title;
 
@@ -210,9 +204,9 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
                 IsMovie = program.Categories.Any(c => info.MovieCategories.Contains(c, StringComparer.OrdinalIgnoreCase)),
                 IsNews = program.Categories.Any(c => info.NewsCategories.Contains(c, StringComparer.OrdinalIgnoreCase)),
                 IsSports = program.Categories.Any(c => info.SportsCategories.Contains(c, StringComparer.OrdinalIgnoreCase)),
-                ImageUrl = program.Icon != null && !String.IsNullOrEmpty(program.Icon.Source) ? program.Icon.Source : null,
-                HasImage = program.Icon != null && !String.IsNullOrEmpty(program.Icon.Source),
-                OfficialRating = program.Rating != null && !String.IsNullOrEmpty(program.Rating.Value) ? program.Rating.Value : null,
+                ImageUrl = program.Icon != null && !string.IsNullOrEmpty(program.Icon.Source) ? program.Icon.Source : null,
+                HasImage = program.Icon != null && !string.IsNullOrEmpty(program.Icon.Source),
+                OfficialRating = program.Rating != null && !string.IsNullOrEmpty(program.Rating.Value) ? program.Rating.Value : null,
                 CommunityRating = program.StarRating,
                 SeriesId = program.Episode == null ? null : program.Title.GetMD5().ToString("N")
             };
@@ -246,7 +240,7 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
             }
 
             // Construct an id from the channel and start date
-            programInfo.Id = String.Format("{0}_{1:O}", program.ChannelId, program.StartDate);
+            programInfo.Id = string.Format("{0}_{1:O}", program.ChannelId, program.StartDate);
 
             if (programInfo.IsMovie)
             {
@@ -294,7 +288,7 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
             {
                 Id = c.Id,
                 Name = c.DisplayName,
-                ImageUrl = c.Icon != null && !String.IsNullOrEmpty(c.Icon.Source) ? c.Icon.Source : null,
+                ImageUrl = c.Icon != null && !string.IsNullOrEmpty(c.Icon.Source) ? c.Icon.Source : null,
                 Number = string.IsNullOrWhiteSpace(c.Number) ? c.Id : c.Number
 
             }).ToList();
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 6fe5787158..dbc7b16a22 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common;
+using MediaBrowser.Common;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
@@ -321,6 +321,7 @@ namespace Emby.Server.Implementations.LiveTv
                     }
                     catch (Exception ex)
                     {
+                        _logger.LogDebug(ex, "GetImageCacheTag raised an exception in LiveTvDtoService.FillImages.");
                     }
                 }
 
@@ -331,10 +332,10 @@ namespace Emby.Server.Implementations.LiveTv
                     {
                         try
                         {
-                            dto.ParentBackdropImageTags = new string[]
-                        {
-                                _imageProcessor.GetImageCacheTag(program, image)
-                        };
+                            dto.ParentBackdropImageTags = new []
+                            {
+                                    _imageProcessor.GetImageCacheTag(program, image)
+                            };
                             dto.ParentBackdropItemId = program.Id.ToString("N");
                         }
                         catch (Exception ex)
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index a81a0bcbb7..d39c13bd09 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller.Configuration;
@@ -104,10 +104,7 @@ namespace Emby.Server.Implementations.LiveTv
         /// Gets the services.
         /// </summary>
         /// <value>The services.</value>
-        public IReadOnlyList<ILiveTvService> Services
-        {
-            get { return _services; }
-        }
+        public IReadOnlyList<ILiveTvService> Services => _services;
 
         private LiveTvOptions GetConfiguration()
         {
@@ -167,15 +164,9 @@ namespace Emby.Server.Implementations.LiveTv
             });
         }
 
-        public ITunerHost[] TunerHosts
-        {
-            get { return _tunerHosts; }
-        }
+        public ITunerHost[] TunerHosts => _tunerHosts;
 
-        public IListingsProvider[] ListingProviders
-        {
-            get { return _listingProviders; }
-        }
+        public IListingsProvider[] ListingProviders => _listingProviders;
 
         public List<NameIdPair> GetTunerHostTypes()
         {
@@ -323,7 +314,7 @@ namespace Emby.Server.Implementations.LiveTv
             return _services.FirstOrDefault(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
         }
 
-        private void Normalize(MediaSourceInfo mediaSource, ILiveTvService service, bool isVideo)
+        private static void Normalize(MediaSourceInfo mediaSource, ILiveTvService service, bool isVideo)
         {
             // Not all of the plugins are setting this
             mediaSource.IsInfiniteStream = true;
@@ -1418,6 +1409,7 @@ namespace Emby.Server.Implementations.LiveTv
 
             if (query.IsInProgress ?? false)
             {
+                //TODO Fix The co-variant conversion between Video[] and BaseItem[], this can generate runtime issues.
                 result.Items = result
                     .Items
                     .OfType<Video>()
@@ -2188,7 +2180,7 @@ namespace Emby.Server.Implementations.LiveTv
             return Services.Select(GetServiceInfo).ToArray();
         }
 
-        private LiveTvServiceInfo GetServiceInfo(ILiveTvService service)
+        private static LiveTvServiceInfo GetServiceInfo(ILiveTvService service)
         {
             return new LiveTvServiceInfo
             {
@@ -2245,7 +2237,7 @@ namespace Emby.Server.Implementations.LiveTv
             return service.ResetTuner(parts[1], cancellationToken);
         }
 
-        private void RemoveFields(DtoOptions options)
+        private static void RemoveFields(DtoOptions options)
         {
             var fields = options.Fields.ToList();
 
diff --git a/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
index 225360159b..3f113e3700 100644
--- a/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
@@ -20,20 +20,11 @@ namespace Emby.Server.Implementations.LiveTv
             _config = config;
         }
 
-        public string Name
-        {
-            get { return "Refresh Guide"; }
-        }
+        public string Name => "Refresh Guide";
 
-        public string Description
-        {
-            get { return "Downloads channel information from live tv services."; }
-        }
+        public string Description => "Downloads channel information from live tv services.";
 
-        public string Category
-        {
-            get { return "Live TV"; }
-        }
+        public string Category => "Live TV";
 
         public Task Execute(System.Threading.CancellationToken cancellationToken, IProgress<double> progress)
         {
@@ -60,24 +51,12 @@ namespace Emby.Server.Implementations.LiveTv
             return _config.GetConfiguration<LiveTvOptions>("livetv");
         }
 
-        public bool IsHidden
-        {
-            get { return _liveTvManager.Services.Count == 1 && GetConfiguration().TunerHosts.Length == 0; }
-        }
+        public bool IsHidden => _liveTvManager.Services.Count == 1 && GetConfiguration().TunerHosts.Length == 0;
 
-        public bool IsEnabled
-        {
-            get { return true; }
-        }
+        public bool IsEnabled => true;
 
-        public bool IsLogged
-        {
-            get { return true; }
-        }
+        public bool IsLogged => true;
 
-        public string Key
-        {
-            get { return "RefreshGuide"; }
-        }
+        public string Key => "RefreshGuide";
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
index ef2010ba64..78514c1d94 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
@@ -40,13 +40,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             FileSystem = fileSystem;
         }
 
-        public virtual bool IsSupported
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public virtual bool IsSupported => true;
 
         protected abstract Task<List<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken);
         public abstract string Type { get; }
@@ -140,7 +134,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
         {
             if (string.IsNullOrEmpty(channelId))
             {
-                throw new ArgumentNullException("channelId");
+                throw new ArgumentNullException(nameof(channelId));
             }
 
             if (IsValidChannelId(channelId))
@@ -175,7 +169,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
         {
             if (string.IsNullOrEmpty(channelId))
             {
-                throw new ArgumentNullException("channelId");
+                throw new ArgumentNullException(nameof(channelId));
             }
 
             if (!IsValidChannelId(channelId))
@@ -228,18 +222,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             throw new LiveTvConflictException();
         }
 
-        protected virtual string ChannelIdPrefix
-        {
-            get
-            {
-                return Type + "_";
-            }
-        }
+        protected virtual string ChannelIdPrefix => Type + "_";
+
         protected virtual bool IsValidChannelId(string channelId)
         {
             if (string.IsNullOrEmpty(channelId))
             {
-                throw new ArgumentNullException("channelId");
+                throw new ArgumentNullException(nameof(channelId));
             }
 
             return channelId.StartsWith(ChannelIdPrefix, StringComparison.OrdinalIgnoreCase);
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index be090df0c9..3ae47f3abe 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
@@ -42,28 +42,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             _environment = environment;
         }
 
-        public string Name
-        {
-            get { return "HD Homerun"; }
-        }
+        public string Name => "HD Homerun";
 
-        public override string Type
-        {
-            get { return DeviceType; }
-        }
+        public override string Type => DeviceType;
 
-        public static string DeviceType
-        {
-            get { return "hdhomerun"; }
-        }
+        public static string DeviceType => "hdhomerun";
 
-        protected override string ChannelIdPrefix
-        {
-            get
-            {
-                return "hdhr_";
-            }
-        }
+        protected override string ChannelIdPrefix => "hdhr_";
 
         private string GetChannelId(TunerHostInfo info, Channels i)
         {
@@ -274,7 +259,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
                 for (int i = 0; i < model.TunerCount; ++i)
                 {
-                    var name = String.Format("Tuner {0}", i + 1);
+                    var name = string.Format("Tuner {0}", i + 1);
                     var currentChannel = "none"; /// @todo Get current channel and map back to Station Id      
                     var isAvailable = await manager.CheckTunerAvailability(ipInfo, i, cancellationToken).ConfigureAwait(false);
                     LiveTvTunerStatus status = isAvailable ? LiveTvTunerStatus.Available : LiveTvTunerStatus.LiveTv;
@@ -325,7 +310,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             return await GetTunerInfosHttp(info, cancellationToken).ConfigureAwait(false);
         }
 
-        private string GetApiUrl(TunerHostInfo info)
+        private static string GetApiUrl(TunerHostInfo info)
         {
             var url = info.Url;
 
@@ -359,7 +344,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             return Config.GetConfiguration<EncodingOptions>("encoding");
         }
 
-        private string GetHdHrIdFromChannelId(string channelId)
+        private static string GetHdHrIdFromChannelId(string channelId)
         {
             return channelId.Split('_')[1];
         }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index 0e84622bda..335fc4cb48 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -37,10 +37,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
         {
             var commands = new List<Tuple<string, string>>();
 
-            if (!String.IsNullOrEmpty(_channel))
+            if (!string.IsNullOrEmpty(_channel))
                 commands.Add(Tuple.Create("channel", _channel));
 
-            if (!String.IsNullOrEmpty(_program))
+            if (!string.IsNullOrEmpty(_program))
                 commands.Add(Tuple.Create("program", _program));
             return commands;
         }
@@ -61,11 +61,11 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
         {
             var commands = new List<Tuple<string, string>>();
 
-            if (!String.IsNullOrEmpty(_channel))
+            if (!string.IsNullOrEmpty(_channel))
             {
                 if (!string.IsNullOrEmpty(_profile) && !string.Equals(_profile, "native", StringComparison.OrdinalIgnoreCase))
                 {
-                    commands.Add(Tuple.Create("vchannel", String.Format("{0} transcode={1}", _channel, _profile)));
+                    commands.Add(Tuple.Create("vchannel", string.Format("{0} transcode={1}", _channel, _profile)));
                 }
                 else
                 {
@@ -123,7 +123,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             }
         }
 
-        private async Task<bool> CheckTunerAvailability(ISocket socket, IpAddressInfo remoteIp, int tuner, CancellationToken cancellationToken)
+        private static async Task<bool> CheckTunerAvailability(ISocket socket, IpAddressInfo remoteIp, int tuner, CancellationToken cancellationToken)
         {
             var ipEndPoint = new IpEndPointInfo(remoteIp, HdHomeRunPort);
 
@@ -164,7 +164,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     continue;
 
                 _activeTuner = i;
-                var lockKeyString = String.Format("{0:d}", lockKeyValue);
+                var lockKeyString = string.Format("{0:d}", lockKeyValue);
                 var lockkeyMsg = CreateSetMessage(i, "lockkey", lockKeyString, null);
                 await tcpClient.SendToAsync(lockkeyMsg, 0, lockkeyMsg.Length, ipEndPoint, cancellationToken).ConfigureAwait(false);
                 var response = await tcpClient.ReceiveAsync(receiveBuffer, 0, receiveBuffer.Length, cancellationToken).ConfigureAwait(false);
@@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
                 }
 
-                var targetValue = String.Format("rtp://{0}:{1}", localIp, localPort);
+                var targetValue = string.Format("rtp://{0}:{1}", localIp, localPort);
                 var targetMsg = CreateSetMessage(i, "target", targetValue, lockKeyValue);
 
                 await tcpClient.SendToAsync(targetMsg, 0, targetMsg.Length, ipEndPoint, cancellationToken).ConfigureAwait(false);
@@ -262,7 +262,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
         private static byte[] CreateGetMessage(int tuner, string name)
         {
-            var byteName = Encoding.UTF8.GetBytes(String.Format("/tuner{0}/{1}\0", tuner, name));
+            var byteName = Encoding.UTF8.GetBytes(string.Format("/tuner{0}/{1}\0", tuner, name));
             int messageLength = byteName.Length + 10; // 4 bytes for header + 4 bytes for crc + 2 bytes for tag name and length
 
             var message = new byte[messageLength];
@@ -280,10 +280,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             return message;
         }
 
-        private static byte[] CreateSetMessage(int tuner, String name, String value, uint? lockkey)
+        private static byte[] CreateSetMessage(int tuner, string name, string value, uint? lockkey)
         {
-            var byteName = Encoding.UTF8.GetBytes(String.Format("/tuner{0}/{1}\0", tuner, name));
-            var byteValue = Encoding.UTF8.GetBytes(String.Format("{0}\0", value));
+            var byteName = Encoding.UTF8.GetBytes(string.Format("/tuner{0}/{1}\0", tuner, name));
+            var byteValue = Encoding.UTF8.GetBytes(string.Format("{0}\0", value));
 
             int messageLength = byteName.Length + byteValue.Length + 12;
             if (lockkey.HasValue)
@@ -360,7 +360,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
         private static bool ParseReturnMessage(byte[] buf, int numBytes, out string returnVal)
         {
-            returnVal = String.Empty;
+            returnVal = string.Empty;
 
             if (numBytes < 4)
                 return false;
@@ -411,7 +411,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
         private class HdHomerunCrc
         {
-            private static UInt32[] crc_table = {
+            private static uint[] crc_table = {
             0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
             0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
             0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
@@ -477,7 +477,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
             0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
 
-            public static UInt32 GetCrc32(byte[] bytes, int numBytes)
+            public static uint GetCrc32(byte[] bytes, int numBytes)
             {
                 var hash = 0xffffffff;
                 for (var i = 0; i < numBytes; i++)
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
index c781bccbb7..1a33154f87 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -38,7 +38,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             EnableStreamSharing = true;
         }
 
-        private Socket CreateSocket(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType)
+        private static Socket CreateSocket(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType)
         {
             var socket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp);
 
@@ -144,7 +144,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             });
         }
 
-        private void Resolve(TaskCompletionSource<bool> openTaskCompletionSource)
+        private static void Resolve(TaskCompletionSource<bool> openTaskCompletionSource)
         {
             Task.Run(() =>
             {
@@ -204,16 +204,16 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
             {
                 if (buffer == null)
-                    throw new ArgumentNullException("buffer");
+                    throw new ArgumentNullException(nameof(buffer));
 
                 if (offset + count < 0)
-                    throw new ArgumentOutOfRangeException("offset + count must not be negative", "offset+count");
+                    throw new ArgumentOutOfRangeException(nameof(offset),"offset + count must not be negative");
 
                 if (offset + count > buffer.Length)
-                    throw new ArgumentException("offset + count must not be greater than the length of buffer", "offset+count");
+                    throw new ArgumentException("offset + count must not be greater than the length of buffer");
 
                 if (disposed)
-                    throw new ObjectDisposedException(typeof(UdpClientStream).ToString());
+                    throw new ObjectDisposedException(nameof(UdpClientStream));
 
                 // This will always receive a 1328 packet size (PacketSize + RtpHeaderSize)
                 // The RTP header will be stripped so see how many reads we need to make to fill the buffer.
@@ -238,16 +238,16 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             public override int Read(byte[] buffer, int offset, int count)
             {
                 if (buffer == null)
-                    throw new ArgumentNullException("buffer");
+                    throw new ArgumentNullException(nameof(buffer));
 
                 if (offset + count < 0)
                     throw new ArgumentOutOfRangeException("offset + count must not be negative", "offset+count");
 
                 if (offset + count > buffer.Length)
-                    throw new ArgumentException("offset + count must not be greater than the length of buffer", "offset+count");
+                    throw new ArgumentException("offset + count must not be greater than the length of buffer");
 
                 if (disposed)
-                    throw new ObjectDisposedException(typeof(UdpClientStream).ToString());
+                    throw new ObjectDisposedException(nameof(UdpClientStream));
 
                 // This will always receive a 1328 packet size (PacketSize + RtpHeaderSize)
                 // The RTP header will be stripped so see how many reads we need to make to fill the buffer.
@@ -274,49 +274,19 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 disposed = true;
             }
 
-            public override bool CanRead
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public override bool CanRead => throw new NotImplementedException();
 
-            public override bool CanSeek
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public override bool CanSeek => throw new NotImplementedException();
 
-            public override bool CanWrite
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public override bool CanWrite => throw new NotImplementedException();
 
-            public override long Length
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public override long Length => throw new NotImplementedException();
 
             public override long Position
             {
-                get
-                {
-                    throw new NotImplementedException();
-                }
+                get => throw new NotImplementedException();
 
-                set
-                {
-                    throw new NotImplementedException();
-                }
+                set => throw new NotImplementedException();
             }
 
             public override void Flush()
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
index 4a2b4ebb22..b55b02ddc2 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
@@ -217,13 +217,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             }
         }
 
-        protected virtual int EmptyReadLimit
-        {
-            get
-            {
-                return 1000;
-            }
-        }
+        protected virtual int EmptyReadLimit => 1000;
 
         private void TrySeek(FileStream stream, long offset)
         {
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index a54bd16139..ab8731c397 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -39,15 +39,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             _mediaSourceManager = mediaSourceManager;
         }
 
-        public override string Type
-        {
-            get { return "m3u"; }
-        }
+        public override string Type => "m3u";
 
-        public virtual string Name
-        {
-            get { return "M3U Tuner"; }
-        }
+        public virtual string Name => "M3U Tuner";
 
         private string GetFullChannelIdPrefix(TunerHostInfo info)
         {
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index 208225c1ed..f83f958029 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -251,7 +251,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             return numberString;
         }
 
-        private bool IsValidChannelNumber(string numberString)
+        private static bool IsValidChannelNumber(string numberString)
         {
             if (string.IsNullOrWhiteSpace(numberString) ||
                 string.Equals(numberString, "-1", StringComparison.OrdinalIgnoreCase) ||
@@ -269,7 +269,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             return true;
         }
 
-        private string GetChannelName(string extInf, Dictionary<string, string> attributes)
+        private static string GetChannelName(string extInf, Dictionary<string, string> attributes)
         {
             var nameParts = extInf.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
             var nameInExtInf = nameParts.Length > 1 ? nameParts.Last().Trim() : null;
@@ -314,7 +314,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             return name;
         }
 
-        private Dictionary<string, string> ParseExtInf(string line, out string remaining)
+        private static Dictionary<string, string> ParseExtInf(string line, out string remaining)
         {
             var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-- 
cgit v1.2.3


From 846456b41e87c8ccced544298b80a27d0f199215 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sat, 12 Jan 2019 21:41:08 +0100
Subject: Reformatted the files with notes.

---
 .../ConnectionManager/ServiceActionListBuilder.cs  |   2 +-
 Emby.Naming/Video/VideoListResolver.cs             |   4 +-
 Emby.Server.Implementations/Devices/DeviceId.cs    |   7 +-
 .../LiveTv/LiveTvDtoService.cs                     |   2 +-
 .../TunerHosts/HdHomerun/HdHomerunUdpStream.cs     |   2 +-
 .../Playlists/PlaylistManager.cs                   |   2 +-
 .../ScheduledTasks/ScheduledTaskWorker.cs          |   3 +-
 .../Services/ServicePath.cs                        |   3 +-
 .../Sorting/SeriesSortNameComparer.cs              |   4 +-
 .../NLangDetect/Extensions/StringExtensions.cs     |  38 ++---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   8 +-
 MediaBrowser.Controller/Entities/PeopleHelper.cs   |   4 +-
 MediaBrowser.Controller/Library/ItemResolveArgs.cs |   4 +-
 MediaBrowser.Providers/Omdb/OmdbProvider.cs        |   4 +-
 MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs |   4 +-
 RSSDP/DeviceEventArgs.cs                           |  18 +--
 RSSDP/DeviceUnavailableEventArgs.cs                | 106 +++++++-------
 RSSDP/HttpRequestParser.cs                         | 130 ++++++++---------
 RSSDP/HttpResponseParser.cs                        | 154 ++++++++++-----------
 RSSDP/IEnumerableExtensions.cs                     |  14 +-
 20 files changed, 257 insertions(+), 256 deletions(-)

(limited to 'Emby.Server.Implementations/LiveTv')

diff --git a/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs b/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs
index d42184f8ea..674bc4c8ee 100644
--- a/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs
+++ b/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs
@@ -77,7 +77,7 @@ namespace Emby.Dlna.ConnectionManager
 
             return action;
         }
-        
+
         private static ServiceAction GetCurrentConnectionInfo()
         {
             var action = new ServiceAction
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index aa4bb61279..45d4593de2 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -1,4 +1,4 @@
-using Emby.Naming.Common;
+using Emby.Naming.Common;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -236,7 +236,7 @@ namespace Emby.Naming.Video
             if (testFilename.StartsWith(folderName, StringComparison.OrdinalIgnoreCase))
             {
                 testFilename = testFilename.Substring(folderName.Length).Trim();
-                return testFilename.StartsWith("-", StringComparison.OrdinalIgnoreCase)||Regex.Replace(testFilename, @"\[([^]]*)\]", "").Trim() == string.Empty;
+                return testFilename.StartsWith("-", StringComparison.OrdinalIgnoreCase) || Regex.Replace(testFilename, @"\[([^]]*)\]", "").Trim() == string.Empty;
             }
 
             return false;
diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index 5630d7d3ce..4f5950ac73 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -89,9 +89,10 @@ namespace Emby.Server.Implementations.Devices
 
         public DeviceId(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem)
         {
-			if (fileSystem == null) {
-				throw new ArgumentNullException(nameof(fileSystem));
-			}
+            if (fileSystem == null)
+            {
+                throw new ArgumentNullException(nameof(fileSystem));
+            }
 
             _appPaths = appPaths;
             _logger = logger;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
index dbc7b16a22..7397d4b60f 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -332,7 +332,7 @@ namespace Emby.Server.Implementations.LiveTv
                     {
                         try
                         {
-                            dto.ParentBackdropImageTags = new []
+                            dto.ParentBackdropImageTags = new[]
                             {
                                     _imageProcessor.GetImageCacheTag(program, image)
                             };
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
index 1a33154f87..fd78dfa8e7 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
@@ -207,7 +207,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     throw new ArgumentNullException(nameof(buffer));
 
                 if (offset + count < 0)
-                    throw new ArgumentOutOfRangeException(nameof(offset),"offset + count must not be negative");
+                    throw new ArgumentOutOfRangeException(nameof(offset), "offset + count must not be negative");
 
                 if (offset + count > buffer.Length)
                     throw new ArgumentException("offset + count must not be greater than the length of buffer");
diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index a5fa24fc82..38fbac0309 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -459,7 +459,7 @@ namespace Emby.Server.Implementations.Playlists
         {
             if (string.IsNullOrEmpty(folderPath))
             {
-                throw new ArgumentException("Folder path was null or empty.",nameof(folderPath));
+                throw new ArgumentException("Folder path was null or empty.", nameof(folderPath));
             }
 
             if (string.IsNullOrEmpty(fileAbsolutePath))
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 602eeb29be..c8d6f20229 100644
--- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -29,7 +29,6 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// <value>The scheduled task.</value>
         public IScheduledTask ScheduledTask { get; private set; }
 
-        /// <summary>
         /// Gets or sets the json serializer.
         /// </summary>
         /// <value>The json serializer.</value>
diff --git a/Emby.Server.Implementations/Services/ServicePath.cs b/Emby.Server.Implementations/Services/ServicePath.cs
index 4c98a3388b..0222b3782c 100644
--- a/Emby.Server.Implementations/Services/ServicePath.cs
+++ b/Emby.Server.Implementations/Services/ServicePath.cs
@@ -116,7 +116,6 @@ namespace Emby.Server.Implementations.Services
             {
                 if (string.IsNullOrEmpty(component)) continue;
 
-         
                 if (StringContains(component, VariablePrefix)
                     && component.IndexOf(ComponentSeperator) != -1)
                 {
@@ -352,7 +351,7 @@ namespace Emby.Server.Implementations.Services
 
             if (withPathInfoParts.Length != this.PathComponentsCount && !this.IsWildCardPath)
             {
-               return false;
+                return false;
             }
 
             if (!Verbs.Contains(httpMethod, StringComparer.OrdinalIgnoreCase))
diff --git a/Emby.Server.Implementations/Sorting/SeriesSortNameComparer.cs b/Emby.Server.Implementations/Sorting/SeriesSortNameComparer.cs
index 32a8f6b457..1bbe30b955 100644
--- a/Emby.Server.Implementations/Sorting/SeriesSortNameComparer.cs
+++ b/Emby.Server.Implementations/Sorting/SeriesSortNameComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using System;
@@ -24,7 +24,7 @@ namespace Emby.Server.Implementations.Sorting
 
             return hasSeries != null ? hasSeries.FindSeriesSortName() : null;
         }
-        
+
         /// <summary>
         /// Gets the name.
         /// </summary>
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/StringExtensions.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/StringExtensions.cs
index c60757c02e..5db68bbf1c 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/StringExtensions.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/StringExtensions.cs
@@ -1,25 +1,25 @@
-using System;
+using System;
 
 namespace NLangDetect.Core.Extensions
 {
-  public static class StringExtensions
-  {
-    /// <summary>
-    /// Returns a new character sequence that is a subsequence of this sequence. The subsequence starts with the character at the specified index and ends with the character at index end - 1. The length of the returned sequence is end - start, so if start == end then an empty sequence is returned.
-    /// </summary>
-    /// <param name="s"></param>
-    /// <param name="start">the start index, inclusive</param>
-    /// <param name="end">the end index, exclusive</param>
-    /// <returns>the specified subsequence</returns>
-    /// <exception cref="IndexOutOfRangeException"> if start or end are negative, if end is greater than length(), or if start is greater than end</exception>
-    public static string SubSequence(this string s, int start, int end)
+    public static class StringExtensions
     {
-      if (start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Argument must not be negative.");
-      if (end < 0) throw new ArgumentOutOfRangeException(nameof(end), "Argument must not be negative.");
-      if (end > s.Length) throw new ArgumentOutOfRangeException(nameof(end), "Argument must not be greater than the input string's length.");
-      if (start > end) throw new ArgumentOutOfRangeException(nameof(start), "Argument must not be greater than the 'end' argument.");
-      
-      return s.Substring(start, end - start);
+        /// <summary>
+        /// Returns a new character sequence that is a subsequence of this sequence. The subsequence starts with the character at the specified index and ends with the character at index end - 1. The length of the returned sequence is end - start, so if start == end then an empty sequence is returned.
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="start">the start index, inclusive</param>
+        /// <param name="end">the end index, exclusive</param>
+        /// <returns>the specified subsequence</returns>
+        /// <exception cref="IndexOutOfRangeException"> if start or end are negative, if end is greater than length(), or if start is greater than end</exception>
+        public static string SubSequence(this string s, int start, int end)
+        {
+            if (start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Argument must not be negative.");
+            if (end < 0) throw new ArgumentOutOfRangeException(nameof(end), "Argument must not be negative.");
+            if (end > s.Length) throw new ArgumentOutOfRangeException(nameof(end), "Argument must not be greater than the input string's length.");
+            if (start > end) throw new ArgumentOutOfRangeException(nameof(start), "Argument must not be greater than the 'end' argument.");
+
+            return s.Substring(start, end - start);
+        }
     }
-  }
 }
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 2e423c31e0..ba7f7070b6 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
@@ -595,8 +595,10 @@ namespace MediaBrowser.Api.Playback
         /// <param name="request">The stream request.</param>
         private void ParseStreamOptions(StreamRequest request)
         {
-            foreach (var param in Request.QueryString) {
-                if (char.IsLower(param.Name[0])) {
+            foreach (var param in Request.QueryString)
+            {
+                if (char.IsLower(param.Name[0]))
+                {
                     // This was probably not parsed initially and should be a StreamOptions
                     // TODO: This should be incorporated either in the lower framework for parsing requests
                     // or the generated URL should correctly serialize it
diff --git a/MediaBrowser.Controller/Entities/PeopleHelper.cs b/MediaBrowser.Controller/Entities/PeopleHelper.cs
index 1f670b7528..d09ef3a15f 100644
--- a/MediaBrowser.Controller/Entities/PeopleHelper.cs
+++ b/MediaBrowser.Controller/Entities/PeopleHelper.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +16,7 @@ namespace MediaBrowser.Controller.Entities
 
             if (string.IsNullOrEmpty(person.Name))
             {
-                throw new ArgumentException("The person's name was empty or null.",nameof(person));
+                throw new ArgumentException("The person's name was empty or null.", nameof(person));
             }
 
             // Normalize
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 387540b812..4d1a4ed2f5 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using System;
 using System.Collections.Generic;
@@ -155,7 +155,7 @@ namespace MediaBrowser.Controller.Library
         {
             if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentException("The path was empty or null.",nameof(path));
+                throw new ArgumentException("The path was empty or null.", nameof(path));
             }
 
             if (AdditionalLocations == null)
diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
index 8d99f7b7f0..6aca093ecf 100644
--- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.IO;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -320,7 +320,7 @@ namespace MediaBrowser.Providers.Omdb
         {
             if (string.IsNullOrWhiteSpace(seriesImdbId))
             {
-                throw new ArgumentException("The series IMDb ID was null or whitespace.",nameof(seriesImdbId));
+                throw new ArgumentException("The series IMDb ID was null or whitespace.", nameof(seriesImdbId));
             }
 
             var imdbParam = seriesImdbId.StartsWith("tt", StringComparison.OrdinalIgnoreCase) ? seriesImdbId : "tt" + seriesImdbId;
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 4fdba39fa3..5390f50495 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
@@ -65,7 +65,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
             if (string.IsNullOrEmpty(metadataFile))
             {
-                throw new ArgumentException("The metadata file was empty or null.",nameof(metadataFile));
+                throw new ArgumentException("The metadata file was empty or null.", nameof(metadataFile));
             }
 
             var settings = XmlReaderSettingsFactory.Create(false);
diff --git a/RSSDP/DeviceEventArgs.cs b/RSSDP/DeviceEventArgs.cs
index 0212d1d7ce..55b23b68c9 100644
--- a/RSSDP/DeviceEventArgs.cs
+++ b/RSSDP/DeviceEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -18,14 +18,14 @@ namespace Rssdp
 
         #region Constructors
 
-		/// <summary>
-		/// Constructs a new instance for the specified <see cref="SsdpDevice"/>.
-		/// </summary>
-		/// <param name="device">The <see cref="SsdpDevice"/> associated with the event this argument class is being used for.</param>
-		/// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
-		public DeviceEventArgs(SsdpDevice device)
-		{
-			if (device == null) throw new ArgumentNullException(nameof(device));
+        /// <summary>
+        /// Constructs a new instance for the specified <see cref="SsdpDevice"/>.
+        /// </summary>
+        /// <param name="device">The <see cref="SsdpDevice"/> associated with the event this argument class is being used for.</param>
+        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
+        public DeviceEventArgs(SsdpDevice device)
+        {
+            if (device == null) throw new ArgumentNullException(nameof(device));
 
             _Device = device;
         }
diff --git a/RSSDP/DeviceUnavailableEventArgs.cs b/RSSDP/DeviceUnavailableEventArgs.cs
index e01248fa5b..ecba7c0132 100644
--- a/RSSDP/DeviceUnavailableEventArgs.cs
+++ b/RSSDP/DeviceUnavailableEventArgs.cs
@@ -1,59 +1,59 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Rssdp
 {
-	/// <summary>
-	/// Event arguments for the <see cref="Rssdp.Infrastructure.SsdpDeviceLocatorBase.DeviceUnavailable"/> event.
-	/// </summary>
-	public sealed class DeviceUnavailableEventArgs : EventArgs
-	{
-
-		#region Fields
-
-		private readonly DiscoveredSsdpDevice _DiscoveredDevice;
-		private readonly bool _Expired;
-
-		#endregion
-
-		#region Constructors
-
-		/// <summary>
-		/// Full constructor.
-		/// </summary>
-		/// <param name="discoveredDevice">A <see cref="DiscoveredSsdpDevice"/> instance representing the device that has become unavailable.</param>
-		/// <param name="expired">A boolean value indicating whether this device is unavailable because it expired, or because it explicitly sent a byebye notification.. See <see cref="Expired"/> for more detail.</param>
-		/// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="discoveredDevice"/> parameter is null.</exception>
-		public DeviceUnavailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool expired) 
-		{
-			if (discoveredDevice == null) throw new ArgumentNullException(nameof(discoveredDevice));
-
-			_DiscoveredDevice = discoveredDevice;
-			_Expired = expired;
-		}
-
-		#endregion
-
-		#region Public Properties
-
-		/// <summary>
-		/// Returns true if the device is considered unavailable because it's cached information expired before a new alive notification or search result was received. Returns false if the device is unavailable because it sent an explicit notification of it's unavailability.
-		/// </summary>
-		public bool Expired
-		{
-			get { return _Expired; }
-		}
-
-		/// <summary>
-		/// A reference to a <see cref="Rssdp.DiscoveredSsdpDevice"/> instance containing the discovery details of the removed device.
-		/// </summary>
-		public DiscoveredSsdpDevice DiscoveredDevice
-		{
-			get { return _DiscoveredDevice; }
-		} 
-
-		#endregion
-	}
-}
\ No newline at end of file
+    /// <summary>
+    /// Event arguments for the <see cref="Rssdp.Infrastructure.SsdpDeviceLocatorBase.DeviceUnavailable"/> event.
+    /// </summary>
+    public sealed class DeviceUnavailableEventArgs : EventArgs
+    {
+
+        #region Fields
+
+        private readonly DiscoveredSsdpDevice _DiscoveredDevice;
+        private readonly bool _Expired;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Full constructor.
+        /// </summary>
+        /// <param name="discoveredDevice">A <see cref="DiscoveredSsdpDevice"/> instance representing the device that has become unavailable.</param>
+        /// <param name="expired">A boolean value indicating whether this device is unavailable because it expired, or because it explicitly sent a byebye notification.. See <see cref="Expired"/> for more detail.</param>
+        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="discoveredDevice"/> parameter is null.</exception>
+        public DeviceUnavailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool expired)
+        {
+            if (discoveredDevice == null) throw new ArgumentNullException(nameof(discoveredDevice));
+
+            _DiscoveredDevice = discoveredDevice;
+            _Expired = expired;
+        }
+
+        #endregion
+
+        #region Public Properties
+
+        /// <summary>
+        /// Returns true if the device is considered unavailable because it's cached information expired before a new alive notification or search result was received. Returns false if the device is unavailable because it sent an explicit notification of it's unavailability.
+        /// </summary>
+        public bool Expired
+        {
+            get { return _Expired; }
+        }
+
+        /// <summary>
+        /// A reference to a <see cref="Rssdp.DiscoveredSsdpDevice"/> instance containing the discovery details of the removed device.
+        /// </summary>
+        public DiscoveredSsdpDevice DiscoveredDevice
+        {
+            get { return _DiscoveredDevice; }
+        }
+
+        #endregion
+    }
+}
diff --git a/RSSDP/HttpRequestParser.cs b/RSSDP/HttpRequestParser.cs
index 7d611dea86..1af7f0d515 100644
--- a/RSSDP/HttpRequestParser.cs
+++ b/RSSDP/HttpRequestParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -8,70 +8,70 @@ using System.Threading.Tasks;
 
 namespace Rssdp.Infrastructure
 {
-	/// <summary>
-	/// Parses a string into a <see cref="System.Net.Http.HttpRequestMessage"/> or throws an exception.
-	/// </summary>
-	public sealed class HttpRequestParser : HttpParserBase<HttpRequestMessage>
-	{
-
-		#region Fields & Constants
-
-		private readonly string[] ContentHeaderNames = new string[]
-				{
-					"Allow", "Content-Disposition", "Content-Encoding", "Content-Language", "Content-Length", "Content-Location", "Content-MD5", "Content-Range", "Content-Type", "Expires", "Last-Modified"
-				};
-
-		#endregion
-
-		#region Public Methods
-
-		/// <summary>
-		/// Parses the specified data into a <see cref="System.Net.Http.HttpRequestMessage"/> instance.
-		/// </summary>
-		/// <param name="data">A string containing the data to parse.</param>
-		/// <returns>A <see cref="System.Net.Http.HttpRequestMessage"/> instance containing the parsed data.</returns>
-		public override System.Net.Http.HttpRequestMessage Parse(string data)
-		{
-			System.Net.Http.HttpRequestMessage retVal = null;
-
-			try
-			{
-				retVal = new System.Net.Http.HttpRequestMessage();
-
-				Parse(retVal, retVal.Headers, data);
-
-				return retVal;
-			}
-			finally
-			{
-				if (retVal != null)
-					retVal.Dispose();
-			}
-		}
-
-		#endregion
-
-		#region Overrides
-
-		/// <summary>
-		/// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the <paramref name="message"/>.
-		/// </summary>
-		/// <param name="data">The first line of the HTTP message to be parsed.</param>
-		/// <param name="message">Either a <see cref="System.Net.Http.HttpResponseMessage"/> or <see cref="System.Net.Http.HttpRequestMessage"/> to assign the parsed values to.</param>
-		protected override void ParseStatusLine(string data, HttpRequestMessage message)
-		{
-			if (data == null) throw new ArgumentNullException(nameof(data));
-			if (message == null) throw new ArgumentNullException(nameof(message));
-
-			var parts = data.Split(' ');
-			if (parts.Length < 2) throw new ArgumentException("Status line is invalid. Insufficient status parts.", nameof(data));
-
-			message.Method = new HttpMethod(parts[0].Trim());
-			Uri requestUri;
-			if (Uri.TryCreate(parts[1].Trim(), UriKind.RelativeOrAbsolute, out requestUri))
-				message.RequestUri = requestUri;
-			else
-				System.Diagnostics.Debug.WriteLine(parts[1]);
+    /// <summary>
+    /// Parses a string into a <see cref="System.Net.Http.HttpRequestMessage"/> or throws an exception.
+    /// </summary>
+    public sealed class HttpRequestParser : HttpParserBase<HttpRequestMessage>
+    {
+
+        #region Fields & Constants
+
+        private readonly string[] ContentHeaderNames = new string[]
+                {
+                    "Allow", "Content-Disposition", "Content-Encoding", "Content-Language", "Content-Length", "Content-Location", "Content-MD5", "Content-Range", "Content-Type", "Expires", "Last-Modified"
+                };
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified data into a <see cref="System.Net.Http.HttpRequestMessage"/> instance.
+        /// </summary>
+        /// <param name="data">A string containing the data to parse.</param>
+        /// <returns>A <see cref="System.Net.Http.HttpRequestMessage"/> instance containing the parsed data.</returns>
+        public override System.Net.Http.HttpRequestMessage Parse(string data)
+        {
+            System.Net.Http.HttpRequestMessage retVal = null;
+
+            try
+            {
+                retVal = new System.Net.Http.HttpRequestMessage();
+
+                Parse(retVal, retVal.Headers, data);
+
+                return retVal;
+            }
+            finally
+            {
+                if (retVal != null)
+                    retVal.Dispose();
+            }
+        }
+
+        #endregion
+
+        #region Overrides
+
+        /// <summary>
+        /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the <paramref name="message"/>.
+        /// </summary>
+        /// <param name="data">The first line of the HTTP message to be parsed.</param>
+        /// <param name="message">Either a <see cref="System.Net.Http.HttpResponseMessage"/> or <see cref="System.Net.Http.HttpRequestMessage"/> to assign the parsed values to.</param>
+        protected override void ParseStatusLine(string data, HttpRequestMessage message)
+        {
+            if (data == null) throw new ArgumentNullException(nameof(data));
+            if (message == null) throw new ArgumentNullException(nameof(message));
+
+            var parts = data.Split(' ');
+            if (parts.Length < 2) throw new ArgumentException("Status line is invalid. Insufficient status parts.", nameof(data));
+
+            message.Method = new HttpMethod(parts[0].Trim());
+            Uri requestUri;
+            if (Uri.TryCreate(parts[1].Trim(), UriKind.RelativeOrAbsolute, out requestUri))
+                message.RequestUri = requestUri;
+            else
+                System.Diagnostics.Debug.WriteLine(parts[1]);
 
             if (parts.Length >= 3)
             {
diff --git a/RSSDP/HttpResponseParser.cs b/RSSDP/HttpResponseParser.cs
index 9c1373f746..d864a8bb74 100644
--- a/RSSDP/HttpResponseParser.cs
+++ b/RSSDP/HttpResponseParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -8,82 +8,82 @@ using System.Threading.Tasks;
 
 namespace Rssdp.Infrastructure
 {
-	/// <summary>
-	/// Parses a string into a <see cref="System.Net.Http.HttpResponseMessage"/> or throws an exception.
-	/// </summary>
-	public sealed class HttpResponseParser : HttpParserBase<System.Net.Http.HttpResponseMessage> 
-	{
-
-		#region Fields & Constants
-
-		private readonly string[] ContentHeaderNames = new string[]
-				{
-					"Allow", "Content-Disposition", "Content-Encoding", "Content-Language", "Content-Length", "Content-Location", "Content-MD5", "Content-Range", "Content-Type", "Expires", "Last-Modified"
-				};
-
-		#endregion
-
-		#region Public Methods
-
-		/// <summary>
-		/// Parses the specified data into a <see cref="System.Net.Http.HttpResponseMessage"/> instance.
-		/// </summary>
-		/// <param name="data">A string containing the data to parse.</param>
-		/// <returns>A <see cref="System.Net.Http.HttpResponseMessage"/> instance containing the parsed data.</returns>
-		public override HttpResponseMessage Parse(string data)
-		{
-			System.Net.Http.HttpResponseMessage retVal = null;
-			try
-			{
-				retVal = new System.Net.Http.HttpResponseMessage();
-
-				Parse(retVal, retVal.Headers, data);
-
-				return retVal;
-			}
-			catch
-			{
-				if (retVal != null)
-					retVal.Dispose();
-
-				throw;
-			}
-		}
-
-		#endregion
-
-		#region Overrides Methods
-
-		/// <summary>
-		/// Returns a boolean indicating whether the specified HTTP header name represents a content header (true), or a message header (false).
-		/// </summary>
-		/// <param name="headerName">A string containing the name of the header to return the type of.</param>
-		/// <returns>A boolean, true if th specified header relates to HTTP content, otherwise false.</returns>
-		protected override bool IsContentHeader(string headerName)
-		{
-			return ContentHeaderNames.Contains(headerName, StringComparer.OrdinalIgnoreCase);
-		}
-
-		/// <summary>
-		/// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the <paramref name="message"/>.
-		/// </summary>
-		/// <param name="data">The first line of the HTTP message to be parsed.</param>
-		/// <param name="message">Either a <see cref="System.Net.Http.HttpResponseMessage"/> or <see cref="System.Net.Http.HttpRequestMessage"/> to assign the parsed values to.</param>
-		protected override void ParseStatusLine(string data, HttpResponseMessage message)
-		{
-			if (data == null) throw new ArgumentNullException(nameof(data));
-			if (message == null) throw new ArgumentNullException(nameof(message));
-
-			var parts = data.Split(' ');
-			if (parts.Length < 2) throw new ArgumentException("data status line is invalid. Insufficient status parts.", nameof(data));
-
-			message.Version = ParseHttpVersion(parts[0].Trim());
-
-			int statusCode = -1;
-			if (!Int32.TryParse(parts[1].Trim(), out statusCode))
-				throw new ArgumentException("data status line is invalid. Status code is not a valid integer.", nameof(data));
-
-			message.StatusCode = (HttpStatusCode)statusCode;
+    /// <summary>
+    /// Parses a string into a <see cref="System.Net.Http.HttpResponseMessage"/> or throws an exception.
+    /// </summary>
+    public sealed class HttpResponseParser : HttpParserBase<System.Net.Http.HttpResponseMessage>
+    {
+
+        #region Fields & Constants
+
+        private readonly string[] ContentHeaderNames = new string[]
+                {
+                    "Allow", "Content-Disposition", "Content-Encoding", "Content-Language", "Content-Length", "Content-Location", "Content-MD5", "Content-Range", "Content-Type", "Expires", "Last-Modified"
+                };
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified data into a <see cref="System.Net.Http.HttpResponseMessage"/> instance.
+        /// </summary>
+        /// <param name="data">A string containing the data to parse.</param>
+        /// <returns>A <see cref="System.Net.Http.HttpResponseMessage"/> instance containing the parsed data.</returns>
+        public override HttpResponseMessage Parse(string data)
+        {
+            System.Net.Http.HttpResponseMessage retVal = null;
+            try
+            {
+                retVal = new System.Net.Http.HttpResponseMessage();
+
+                Parse(retVal, retVal.Headers, data);
+
+                return retVal;
+            }
+            catch
+            {
+                if (retVal != null)
+                    retVal.Dispose();
+
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region Overrides Methods
+
+        /// <summary>
+        /// Returns a boolean indicating whether the specified HTTP header name represents a content header (true), or a message header (false).
+        /// </summary>
+        /// <param name="headerName">A string containing the name of the header to return the type of.</param>
+        /// <returns>A boolean, true if th specified header relates to HTTP content, otherwise false.</returns>
+        protected override bool IsContentHeader(string headerName)
+        {
+            return ContentHeaderNames.Contains(headerName, StringComparer.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the <paramref name="message"/>.
+        /// </summary>
+        /// <param name="data">The first line of the HTTP message to be parsed.</param>
+        /// <param name="message">Either a <see cref="System.Net.Http.HttpResponseMessage"/> or <see cref="System.Net.Http.HttpRequestMessage"/> to assign the parsed values to.</param>
+        protected override void ParseStatusLine(string data, HttpResponseMessage message)
+        {
+            if (data == null) throw new ArgumentNullException(nameof(data));
+            if (message == null) throw new ArgumentNullException(nameof(message));
+
+            var parts = data.Split(' ');
+            if (parts.Length < 2) throw new ArgumentException("data status line is invalid. Insufficient status parts.", nameof(data));
+
+            message.Version = ParseHttpVersion(parts[0].Trim());
+
+            int statusCode = -1;
+            if (!Int32.TryParse(parts[1].Trim(), out statusCode))
+                throw new ArgumentException("data status line is invalid. Status code is not a valid integer.", nameof(data));
+
+            message.StatusCode = (HttpStatusCode)statusCode;
 
             if (parts.Length >= 3)
             {
diff --git a/RSSDP/IEnumerableExtensions.cs b/RSSDP/IEnumerableExtensions.cs
index 950d561b05..c96542dca4 100644
--- a/RSSDP/IEnumerableExtensions.cs
+++ b/RSSDP/IEnumerableExtensions.cs
@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
 namespace Rssdp.Infrastructure
 {
-	internal static class IEnumerableExtensions
-	{
-		public static IEnumerable<T> SelectManyRecursive<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> selector)
-		{
-			if (source == null) throw new ArgumentNullException(nameof(source));
-			if (selector == null) throw new ArgumentNullException(nameof(selector));
+    internal static class IEnumerableExtensions
+    {
+        public static IEnumerable<T> SelectManyRecursive<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> selector)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (selector == null) throw new ArgumentNullException(nameof(selector));
 
             return !source.Any() ? source :
                 source.Concat(
-- 
cgit v1.2.3