From 1513c76a3e0b8f84def98df3fe99432370076497 Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Mon, 7 Oct 2019 07:53:28 -0400
Subject: Support MediaAttachment retrieval in MediaSourceManager.

---
 .../Library/MediaSourceManager.cs                  | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

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

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index d83e1fc02..e069ebd17 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -128,6 +128,32 @@ namespace Emby.Server.Implementations.Library
             return streams;
         }
 
+        public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
+        {
+            var list = _itemRepo.GetMediaAttachments(query);
+            return list;
+        }
+
+        public List<MediaAttachment> GetMediaAttachments(string mediaSourceId)
+        {
+            var list = GetMediaAttachments(new MediaAttachmentQuery
+            {
+                ItemId = new Guid(mediaSourceId)
+            });
+
+            return list;
+        }
+
+        public List<MediaAttachment> GetMediaAttachments(Guid itemId)
+        {
+            var list = GetMediaAttachments(new MediaAttachmentQuery
+            {
+                ItemId = itemId
+            });
+
+            return list;
+        }
+
         public async Task<List<MediaSourceInfo>> GetPlayackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
         {
             var mediaSources = GetStaticMediaSources(item, enablePathSubstitution, user);
-- 
cgit v1.2.3


From 7110069b399496979aa8fdc701d0e1af536425f7 Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Mon, 4 Nov 2019 10:37:19 -0500
Subject: Return list result directly for MediaAttachments.

---
 Emby.Server.Implementations/Library/MediaSourceManager.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 2e24b847b..27eb39530 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -130,28 +130,23 @@ namespace Emby.Server.Implementations.Library
 
         public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
         {
-            var list = _itemRepo.GetMediaAttachments(query);
-            return list;
+            return _itemRepo.GetMediaAttachments(query);
         }
 
         public List<MediaAttachment> GetMediaAttachments(string mediaSourceId)
         {
-            var list = GetMediaAttachments(new MediaAttachmentQuery
+            return GetMediaAttachments(new MediaAttachmentQuery
             {
                 ItemId = new Guid(mediaSourceId)
             });
-
-            return list;
         }
 
         public List<MediaAttachment> GetMediaAttachments(Guid itemId)
         {
-            var list = GetMediaAttachments(new MediaAttachmentQuery
+            return GetMediaAttachments(new MediaAttachmentQuery
             {
                 ItemId = itemId
             });
-
-            return list;
         }
 
         public async Task<List<MediaSourceInfo>> GetPlayackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
-- 
cgit v1.2.3


From 193a1fa474202ec0933c1a937c56ccecf58c4410 Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Thu, 7 Nov 2019 11:23:28 -0500
Subject: Update Emby.Server.Implementations/Library/MediaSourceManager.cs

docs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/MediaSourceManager.cs | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 27eb39530..833a5c88f 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -128,6 +128,7 @@ namespace Emby.Server.Implementations.Library
             return streams;
         }
 
+        /// <inheritdoc />
         public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
         {
             return _itemRepo.GetMediaAttachments(query);
-- 
cgit v1.2.3


From 8b2d7062c43ff6618d5bf4a5e26d0ba5bb70bd07 Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Thu, 7 Nov 2019 11:24:30 -0500
Subject: Update Emby.Server.Implementations/Library/MediaSourceManager.cs

docs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/MediaSourceManager.cs | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 833a5c88f..df6f0e77f 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -134,6 +134,7 @@ namespace Emby.Server.Implementations.Library
             return _itemRepo.GetMediaAttachments(query);
         }
 
+        /// <inheritdoc />
         public List<MediaAttachment> GetMediaAttachments(string mediaSourceId)
         {
             return GetMediaAttachments(new MediaAttachmentQuery
-- 
cgit v1.2.3


From d73f46dcda8db877edae4918a6053cad924808fa Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Thu, 7 Nov 2019 11:27:55 -0500
Subject: Update Emby.Server.Implementations/Library/MediaSourceManager.cs

docs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/MediaSourceManager.cs | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index df6f0e77f..9574a28e9 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -143,6 +143,7 @@ namespace Emby.Server.Implementations.Library
             });
         }
 
+        /// <inheritdoc />
         public List<MediaAttachment> GetMediaAttachments(Guid itemId)
         {
             return GetMediaAttachments(new MediaAttachmentQuery
-- 
cgit v1.2.3


From 5cab79c839d2212ae638db403ec4d7ba0699f9a1 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 4 Dec 2019 21:39:27 +0100
Subject: Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

---
 .../Library/MediaSourceManager.cs                  |   4 +-
 .../LiveTv/EmbyTV/DirectRecorder.cs                |   3 +-
 .../LiveTv/EmbyTV/EmbyTV.cs                        | 504 +++++++++------------
 .../LiveTv/EmbyTV/EpgChannelData.cs                |  68 +++
 .../LiveTv/EmbyTV/NfoConfigurationExtensions.cs    |  19 +
 .../LiveTv/LiveTvManager.cs                        |   5 +-
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   2 +-
 MediaBrowser.Api/Playback/MediaInfoService.cs      |   2 +-
 .../Library/IMediaSourceManager.cs                 |   4 +-
 .../Subtitles/SubtitleEncoder.cs                   |   2 +-
 jellyfin.ruleset                                   |   4 +-
 11 files changed, 319 insertions(+), 298 deletions(-)
 create mode 100644 Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
 create mode 100644 Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs

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

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 7a26e0c37..059b27e87 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -128,7 +128,7 @@ namespace Emby.Server.Implementations.Library
             return streams;
         }
 
-        public async Task<List<MediaSourceInfo>> GetPlayackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
+        public async Task<List<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
         {
             var mediaSources = GetStaticMediaSources(item, enablePathSubstitution, user);
 
@@ -290,7 +290,7 @@ namespace Emby.Server.Implementations.Library
                 return await GetLiveStream(liveStreamId, cancellationToken).ConfigureAwait(false);
             }
 
-            var sources = await GetPlayackMediaSources(item, null, false, enablePathSubstitution, cancellationToken).ConfigureAwait(false);
+            var sources = await GetPlaybackMediaSources(item, null, false, enablePathSubstitution, cancellationToken).ConfigureAwait(false);
 
             return sources.FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
         }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
index 8dee7046e..84e8c31f9 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
@@ -74,7 +75,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 DecompressionMethod = CompressionMethod.None
             };
 
-            using (var response = await _httpClient.SendAsync(httpRequestOptions, "GET").ConfigureAwait(false))
+            using (var response = await _httpClient.SendAsync(httpRequestOptions, HttpMethod.Get).ConfigureAwait(false))
             {
                 _logger.LogInformation("Opened recording stream from tuner provider");
 
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index ef5928e48..420209eda 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1,3 +1,6 @@
+#pragma warning disable SA1600
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -40,6 +43,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 {
     public class EmbyTV : ILiveTvService, ISupportsDirectStreamProvider, ISupportsNewTimerIds, IDisposable
     {
+        public const string DateAddedFormat = "yyyy-MM-dd HH:mm:ss";
+
+        private const int TunerDiscoveryDurationMs = 3000;
+
         private readonly IServerApplicationHost _appHost;
         private readonly ILogger _logger;
         private readonly IHttpClient _httpClient;
@@ -57,19 +64,21 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         private readonly IProviderManager _providerManager;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IProcessFactory _processFactory;
-        private IMediaSourceManager _mediaSourceManager;
-
-        public static EmbyTV Current;
-
-        public event EventHandler<GenericEventArgs<TimerInfo>> TimerCreated;
-        public event EventHandler<GenericEventArgs<string>> TimerCancelled;
+        private readonly IMediaSourceManager _mediaSourceManager;
+        private readonly IStreamHelper _streamHelper;
 
         private readonly ConcurrentDictionary<string, ActiveRecordingInfo> _activeRecordings =
             new ConcurrentDictionary<string, ActiveRecordingInfo>(StringComparer.OrdinalIgnoreCase);
 
-        private readonly IStreamHelper _streamHelper;
+        private readonly ConcurrentDictionary<string, EpgChannelData> _epgChannels =
+            new ConcurrentDictionary<string, EpgChannelData>(StringComparer.OrdinalIgnoreCase);
+
+        private readonly SemaphoreSlim _recordingDeleteSemaphore = new SemaphoreSlim(1, 1);
 
-        public EmbyTV(IServerApplicationHost appHost,
+        private bool _disposed = false;
+
+        public EmbyTV(
+            IServerApplicationHost appHost,
             IStreamHelper streamHelper,
             IMediaSourceManager mediaSourceManager,
             ILogger logger,
@@ -103,12 +112,40 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             _seriesTimerProvider = new SeriesTimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "seriestimers.json"));
             _timerProvider = new TimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "timers.json"));
-            _timerProvider.TimerFired += _timerProvider_TimerFired;
+            _timerProvider.TimerFired += OnTimerProviderTimerFired;
 
-            _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
+            _config.NamedConfigurationUpdated += OnNamedConfigurationUpdated;
         }
 
-        private void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
+        public event EventHandler<GenericEventArgs<TimerInfo>> TimerCreated;
+
+        public event EventHandler<GenericEventArgs<string>> TimerCancelled;
+
+        public static EmbyTV Current { get; private set; }
+
+        /// <inheritdoc />
+        public string Name => "Emby";
+
+        public string DataPath => Path.Combine(_config.CommonApplicationPaths.DataPath, "livetv");
+
+        /// <inheritdoc />
+        public string HomePageUrl => "https://github.com/jellyfin/jellyfin";
+
+        private string DefaultRecordingPath => Path.Combine(DataPath, "recordings");
+
+        private string RecordingPath
+        {
+            get
+            {
+                var path = GetConfiguration().RecordingPath;
+
+                return string.IsNullOrWhiteSpace(path)
+                    ? DefaultRecordingPath
+                    : path;
+            }
+        }
+
+        private void OnNamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
         {
             if (string.Equals(e.Key, "livetv", StringComparison.OrdinalIgnoreCase))
             {
@@ -116,11 +153,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public async Task Start()
+        public Task Start()
         {
             _timerProvider.RestartTimers();
 
-            await CreateRecordingFolders().ConfigureAwait(false);
+            return CreateRecordingFolders();
         }
 
         private async void OnRecordingFoldersChanged()
@@ -132,8 +169,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             try
             {
-                var recordingFolders = GetRecordingFolders();
-
+                var recordingFolders = GetRecordingFolders().ToArray();
                 var virtualFolders = _libraryManager.GetVirtualFolders()
                     .ToList();
 
@@ -241,26 +277,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public string Name => "Emby";
-
-        public string DataPath => Path.Combine(_config.CommonApplicationPaths.DataPath, "livetv");
-
-        private string DefaultRecordingPath => Path.Combine(DataPath, "recordings");
-
-        private string RecordingPath
-        {
-            get
-            {
-                var path = GetConfiguration().RecordingPath;
-
-                return string.IsNullOrWhiteSpace(path)
-                    ? DefaultRecordingPath
-                    : path;
-            }
-        }
-
-        public string HomePageUrl => "https://github.com/jellyfin/jellyfin";
-
         public async Task RefreshSeriesTimers(CancellationToken cancellationToken)
         {
             var seriesTimers = await GetSeriesTimersAsync(cancellationToken).ConfigureAwait(false);
@@ -339,7 +355,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (NotSupportedException)
                     {
-
                     }
                     catch (Exception ex)
                     {
@@ -351,7 +366,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return list;
         }
 
-        private async Task AddMetadata(IListingsProvider provider, ListingsProviderInfo info, List<ChannelInfo> tunerChannels, bool enableCache, CancellationToken cancellationToken)
+        private async Task AddMetadata(
+            IListingsProvider provider,
+            ListingsProviderInfo info,
+            IEnumerable<ChannelInfo> tunerChannels,
+            bool enableCache,
+            CancellationToken cancellationToken)
         {
             var epgChannels = await GetEpgChannels(provider, info, enableCache, cancellationToken).ConfigureAwait(false);
 
@@ -363,8 +383,9 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     if (!string.IsNullOrWhiteSpace(epgChannel.Name))
                     {
-                        //tunerChannel.Name = epgChannel.Name;
+                        // tunerChannel.Name = epgChannel.Name;
                     }
+
                     if (!string.IsNullOrWhiteSpace(epgChannel.ImageUrl))
                     {
                         tunerChannel.ImageUrl = epgChannel.ImageUrl;
@@ -373,10 +394,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private readonly ConcurrentDictionary<string, EpgChannelData> _epgChannels =
-            new ConcurrentDictionary<string, EpgChannelData>(StringComparer.OrdinalIgnoreCase);
-
-        private async Task<EpgChannelData> GetEpgChannels(IListingsProvider provider, ListingsProviderInfo info, bool enableCache, CancellationToken cancellationToken)
+        private async Task<EpgChannelData> GetEpgChannels(
+            IListingsProvider provider,
+            ListingsProviderInfo info,
+            bool enableCache,
+            CancellationToken cancellationToken)
         {
             if (!enableCache || !_epgChannels.TryGetValue(info.Id, out var result))
             {
@@ -394,59 +416,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return result;
         }
 
-        private class EpgChannelData
-        {
-            public EpgChannelData(List<ChannelInfo> channels)
-            {
-                ChannelsById = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
-                ChannelsByNumber = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
-                ChannelsByName = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
-
-                foreach (var channel in channels)
-                {
-                    ChannelsById[channel.Id] = channel;
-
-                    if (!string.IsNullOrEmpty(channel.Number))
-                    {
-                        ChannelsByNumber[channel.Number] = channel;
-                    }
-
-                    var normalizedName = NormalizeName(channel.Name ?? string.Empty);
-                    if (!string.IsNullOrWhiteSpace(normalizedName))
-                    {
-                        ChannelsByName[normalizedName] = channel;
-                    }
-                }
-            }
-
-            private Dictionary<string, ChannelInfo> ChannelsById { get; set; }
-            private Dictionary<string, ChannelInfo> ChannelsByNumber { get; set; }
-            private Dictionary<string, ChannelInfo> ChannelsByName { get; set; }
-
-            public ChannelInfo GetChannelById(string id)
-            {
-                ChannelInfo result = null;
-
-                ChannelsById.TryGetValue(id, out result);
-
-                return result;
-            }
-
-            public ChannelInfo GetChannelByNumber(string number)
-            {
-                ChannelsByNumber.TryGetValue(number, out var result);
-
-                return result;
-            }
-
-            public ChannelInfo GetChannelByName(string name)
-            {
-                ChannelsByName.TryGetValue(name, out var result);
-
-                return result;
-            }
-        }
-
         private async Task<ChannelInfo> GetEpgChannelFromTunerChannel(IListingsProvider provider, ListingsProviderInfo info, ChannelInfo tunerChannel, CancellationToken cancellationToken)
         {
             var epgChannels = await GetEpgChannels(provider, info, true, cancellationToken).ConfigureAwait(false);
@@ -463,6 +432,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     return mapping.Value;
                 }
             }
+
             return channelId;
         }
 
@@ -476,7 +446,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return GetEpgChannelFromTunerChannel(info.ChannelMappings, tunerChannel, epgChannels);
         }
 
-        private ChannelInfo GetEpgChannelFromTunerChannel(NameValuePair[] mappings, ChannelInfo tunerChannel, EpgChannelData epgChannelData)
+        private ChannelInfo GetEpgChannelFromTunerChannel(
+            NameValuePair[] mappings,
+            ChannelInfo tunerChannel,
+            EpgChannelData epgChannelData)
         {
             if (!string.IsNullOrWhiteSpace(tunerChannel.Id))
             {
@@ -537,7 +510,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (!string.IsNullOrWhiteSpace(tunerChannel.Name))
             {
-                var normalizedName = NormalizeName(tunerChannel.Name);
+                var normalizedName = EpgChannelData.NormalizeName(tunerChannel.Name);
 
                 var channel = epgChannelData.GetChannelByName(normalizedName);
 
@@ -550,11 +523,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return null;
         }
 
-        private static string NormalizeName(string value)
-        {
-            return value.Replace(" ", string.Empty).Replace("-", string.Empty);
-        }
-
         public async Task<List<ChannelInfo>> GetChannelsForListingsProvider(ListingsProviderInfo listingsProvider, CancellationToken cancellationToken)
         {
             var list = new List<ChannelInfo>();
@@ -600,6 +568,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 _seriesTimerProvider.Delete(remove);
             }
+
             return Task.CompletedTask;
         }
 
@@ -689,6 +658,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 programInfo = GetProgramInfoFromCache(timer);
             }
+
             if (programInfo == null)
             {
                 _logger.LogInformation("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
@@ -703,10 +673,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             timer.IsManual = true;
             _timerProvider.Add(timer);
 
-            if (TimerCreated != null)
-            {
-                TimerCreated(this, new GenericEventArgs<TimerInfo>(timer));
-            }
+            TimerCreated?.Invoke(this, new GenericEventArgs<TimerInfo>(timer));
 
             return Task.FromResult(timer.Id);
         }
@@ -800,7 +767,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
 
             // Only update if not currently active
-            if (!_activeRecordings.TryGetValue(updatedTimer.Id, out var activeRecordingInfo))
+            if (!_activeRecordings.TryGetValue(updatedTimer.Id, out _))
             {
                 existingTimer.PrePaddingSeconds = updatedTimer.PrePaddingSeconds;
                 existingTimer.PostPaddingSeconds = updatedTimer.PostPaddingSeconds;
@@ -846,6 +813,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 return info.Path;
             }
+
             return null;
         }
 
@@ -870,9 +838,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     {
                         return null;
                     }
+
                     return recording;
                 }
             }
+
             return null;
         }
 
@@ -1061,13 +1031,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             mediaSource.Id = Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture) + "_" + mediaSource.Id;
 
-            //if (mediaSource.DateLiveStreamOpened.HasValue && enableStreamSharing)
-            //{
-            //    var ticks = (DateTime.UtcNow - mediaSource.DateLiveStreamOpened.Value).Ticks - TimeSpan.FromSeconds(10).Ticks;
-            //    ticks = Math.Max(0, ticks);
-            //    mediaSource.Path += "?t=" + ticks.ToString(CultureInfo.InvariantCulture) + "&s=" + mediaSource.DateLiveStreamOpened.Value.Ticks.ToString(CultureInfo.InvariantCulture);
-            //}
-
             return mediaSource;
         }
 
@@ -1091,7 +1054,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (NotImplementedException)
                 {
-
                 }
             }
 
@@ -1142,7 +1104,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return Task.CompletedTask;
         }
 
-        async void _timerProvider_TimerFired(object sender, GenericEventArgs<TimerInfo> e)
+        private async void OnTimerProviderTimerFired(object sender, GenericEventArgs<TimerInfo> e)
         {
             var timer = e.Argument;
 
@@ -1177,7 +1139,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (OperationCanceledException)
             {
-
             }
             catch (Exception ex)
             {
@@ -1221,7 +1182,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 if (timer.SeasonNumber.HasValue)
                 {
-                    folderName = string.Format("Season {0}", timer.SeasonNumber.Value.ToString(CultureInfo.InvariantCulture));
+                    folderName = string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Season {0}",
+                        timer.SeasonNumber.Value);
                     recordPath = Path.Combine(recordPath, folderName);
                 }
             }
@@ -1275,6 +1239,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     recordPath = Path.Combine(recordPath, "Sports");
                 }
+
                 recordPath = Path.Combine(recordPath, _fileSystem.GetValidFilename(timer.Name).Trim());
             }
             else
@@ -1283,6 +1248,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     recordPath = Path.Combine(recordPath, "Other");
                 }
+
                 recordPath = Path.Combine(recordPath, _fileSystem.GetValidFilename(timer.Name).Trim());
             }
 
@@ -1304,6 +1270,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 programInfo = GetProgramInfoFromCache(timer);
             }
+
             if (programInfo == null)
             {
                 _logger.LogInformation("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
@@ -1315,9 +1282,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 CopyProgramInfoToTimerInfo(programInfo, timer);
             }
 
-            string seriesPath = null;
             var remoteMetadata = await FetchInternetMetadata(timer, CancellationToken.None).ConfigureAwait(false);
-            var recordPath = GetRecordingPath(timer, remoteMetadata, out seriesPath);
+            var recordPath = GetRecordingPath(timer, remoteMetadata, out string seriesPath);
             var recordingStatus = RecordingStatus.New;
 
             string liveStreamId = null;
@@ -1326,19 +1292,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             try
             {
-                var allMediaSources = await _mediaSourceManager.GetPlayackMediaSources(channelItem, null, true, false, CancellationToken.None).ConfigureAwait(false);
+                var allMediaSources = await _mediaSourceManager.GetPlaybackMediaSources(channelItem, null, true, false, CancellationToken.None).ConfigureAwait(false);
 
                 var mediaStreamInfo = allMediaSources[0];
                 IDirectStreamProvider directStreamProvider = null;
 
                 if (mediaStreamInfo.RequiresOpening)
                 {
-                    var liveStreamResponse = await _mediaSourceManager.OpenLiveStreamInternal(new LiveStreamRequest
-                    {
-                        ItemId = channelItem.Id,
-                        OpenToken = mediaStreamInfo.OpenToken
-
-                    }, CancellationToken.None).ConfigureAwait(false);
+                    var liveStreamResponse = await _mediaSourceManager.OpenLiveStreamInternal(
+                        new LiveStreamRequest
+                        {
+                            ItemId = channelItem.Id,
+                            OpenToken = mediaStreamInfo.OpenToken
+                        },
+                        CancellationToken.None).ConfigureAwait(false);
 
                     mediaStreamInfo = liveStreamResponse.Item1.MediaSource;
                     liveStreamId = mediaStreamInfo.LiveStreamId;
@@ -1412,12 +1379,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (recordingStatus != RecordingStatus.Completed && DateTime.UtcNow < timer.EndDate && timer.RetryCount < 10)
             {
-                const int retryIntervalSeconds = 60;
-                _logger.LogInformation("Retrying recording in {0} seconds.", retryIntervalSeconds);
+                const int RetryIntervalSeconds = 60;
+                _logger.LogInformation("Retrying recording in {0} seconds.", RetryIntervalSeconds);
 
                 timer.Status = RecordingStatus.New;
                 timer.PrePaddingSeconds = 0;
-                timer.StartDate = DateTime.UtcNow.AddSeconds(retryIntervalSeconds);
+                timer.StartDate = DateTime.UtcNow.AddSeconds(RetryIntervalSeconds);
                 timer.RetryCount++;
                 _timerProvider.AddOrUpdate(timer);
             }
@@ -1538,6 +1505,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 return;
             }
+
             if (string.IsNullOrWhiteSpace(seriesPath))
             {
                 return;
@@ -1576,34 +1544,34 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 DeleteLibraryItemsForTimers(timersToDelete);
 
                 var librarySeries = _libraryManager.FindByPath(seriesPath, true) as Folder;
-
                 if (librarySeries == null)
                 {
                     return;
                 }
 
-                var episodesToDelete = (librarySeries.GetItemList(new InternalItemsQuery
-                {
-                    OrderBy = new[] { new ValueTuple<string, SortOrder>(ItemSortBy.DateCreated, SortOrder.Descending) },
-                    IsVirtualItem = false,
-                    IsFolder = false,
-                    Recursive = true,
-                    DtoOptions = new DtoOptions(true)
-
-                }))
-                    .Where(i => i.IsFileProtocol && File.Exists(i.Path))
-                    .Skip(seriesTimer.KeepUpTo - 1)
-                    .ToList();
+                var episodesToDelete = librarySeries.GetItemList(
+                    new InternalItemsQuery
+                    {
+                        OrderBy = new[] { new ValueTuple<string, SortOrder>(ItemSortBy.DateCreated, SortOrder.Descending) },
+                        IsVirtualItem = false,
+                        IsFolder = false,
+                        Recursive = true,
+                        DtoOptions = new DtoOptions(true)
+                    }).Where(i => i.IsFileProtocol && File.Exists(i.Path))
+                        .Skip(seriesTimer.KeepUpTo - 1)
+                        .ToList();
 
                 foreach (var item in episodesToDelete)
                 {
                     try
                     {
-                        _libraryManager.DeleteItem(item, new DeleteOptions
-                        {
-                            DeleteFileLocation = true
-
-                        }, true);
+                        _libraryManager.DeleteItem(
+                            item,
+                            new DeleteOptions
+                            {
+                                DeleteFileLocation = true
+                            },
+                            true);
                     }
                     catch (Exception ex)
                     {
@@ -1617,7 +1585,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private readonly SemaphoreSlim _recordingDeleteSemaphore = new SemaphoreSlim(1, 1);
         private void DeleteLibraryItemsForTimers(List<TimerInfo> timers)
         {
             foreach (var timer in timers)
@@ -1644,22 +1611,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (libraryItem != null)
             {
-                _libraryManager.DeleteItem(libraryItem, new DeleteOptions
-                {
-                    DeleteFileLocation = true
-
-                }, true);
+                _libraryManager.DeleteItem(
+                    libraryItem,
+                    new DeleteOptions
+                    {
+                        DeleteFileLocation = true
+                    },
+                    true);
             }
             else
             {
-                try
+                if (File.Exists(timer.RecordingPath))
                 {
                     _fileSystem.DeleteFile(timer.RecordingPath);
                 }
-                catch (IOException)
-                {
-
-                }
             }
 
             _timerProvider.Delete(timer);
@@ -1690,16 +1655,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 return true;
             }
 
-            var hasRecordingAtPath = _activeRecordings
+            return _activeRecordings
                 .Values
                 .ToList()
                 .Any(i => string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase) && !string.Equals(i.Timer.Id, timerId, StringComparison.OrdinalIgnoreCase));
-
-            if (hasRecordingAtPath)
-            {
-                return true;
-            }
-            return false;
         }
 
         private IRecorder GetRecorder(MediaSourceInfo mediaSource)
@@ -1756,17 +1715,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private void Process_Exited(object sender, EventArgs e)
         {
-            var process = (IProcess)sender;
-            try
+            using (var process = (IProcess)sender)
             {
                 _logger.LogInformation("Recording post-processing script completed with exit code {ExitCode}", process.ExitCode);
-            }
-            catch
-            {
 
+                process.Dispose();
             }
-
-            process.Dispose();
         }
 
         private async Task SaveRecordingImage(string recordingPath, LiveTvProgram program, ItemImageInfo image)
@@ -1776,44 +1730,16 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 image = await _libraryManager.ConvertImageToLocal(program, image, 0).ConfigureAwait(false);
             }
 
-            string imageSaveFilenameWithoutExtension = null;
-
-            switch (image.Type)
+            string imageSaveFilenameWithoutExtension = image.Type switch
             {
-                case ImageType.Primary:
-
-                    if (program.IsSeries)
-                    {
-                        imageSaveFilenameWithoutExtension = Path.GetFileNameWithoutExtension(recordingPath) + "-thumb";
-                    }
-                    else
-                    {
-                        imageSaveFilenameWithoutExtension = "poster";
-                    }
-
-                    break;
-                case ImageType.Logo:
-                    imageSaveFilenameWithoutExtension = "logo";
-                    break;
-                case ImageType.Thumb:
-                    if (program.IsSeries)
-                    {
-                        imageSaveFilenameWithoutExtension = Path.GetFileNameWithoutExtension(recordingPath) + "-thumb";
-                    }
-                    else
-                    {
-                        imageSaveFilenameWithoutExtension = "landscape";
-                    }
-
-                    break;
-                case ImageType.Backdrop:
-                    imageSaveFilenameWithoutExtension = "fanart";
-                    break;
-                default:
-                    break;
-            }
+                ImageType.Primary => program.IsSeries ? Path.GetFileNameWithoutExtension(recordingPath) + "-thumb" : "poster",
+                ImageType.Logo => "logo",
+                ImageType.Thumb => program.IsSeries ? Path.GetFileNameWithoutExtension(recordingPath) + "-thumb" : "landscape",
+                ImageType.Backdrop => "fanart",
+                _ => null
+            };
 
-            if (string.IsNullOrWhiteSpace(imageSaveFilenameWithoutExtension))
+            if (imageSaveFilenameWithoutExtension == null)
             {
                 return;
             }
@@ -1897,7 +1823,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     Limit = 1,
                     ExternalId = timer.ProgramId,
                     DtoOptions = new DtoOptions(true)
-
                 }).FirstOrDefault() as LiveTvProgram;
 
                 // dummy this up
@@ -1921,11 +1846,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     program.AddGenre("Sports");
                 }
+
                 if (timer.IsKids)
                 {
                     program.AddGenre("Kids");
                     program.AddGenre("Children");
                 }
+
                 if (timer.IsNews)
                 {
                     program.AddGenre("News");
@@ -1980,14 +1907,17 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     {
                         writer.WriteElementString("id", id);
                     }
+
                     if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out id))
                     {
                         writer.WriteElementString("imdb_id", id);
                     }
+
                     if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out id))
                     {
                         writer.WriteElementString("tmdbid", id);
                     }
+
                     if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Zap2It.ToString(), out id))
                     {
                         writer.WriteElementString("zap2itid", id);
@@ -2014,7 +1944,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public const string DateAddedFormat = "yyyy-MM-dd HH:mm:ss";
         private void SaveVideoNfo(TimerInfo timer, string recordingPath, BaseItem item, bool lockData)
         {
             var nfoPath = Path.ChangeExtension(recordingPath, ".nfo");
@@ -2056,7 +1985,9 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         {
                             var formatString = options.ReleaseDateFormat;
 
-                            writer.WriteElementString("aired", premiereDate.Value.ToLocalTime().ToString(formatString));
+                            writer.WriteElementString(
+                                "aired",
+                                premiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                         }
 
                         if (item.IndexNumber.HasValue)
@@ -2087,12 +2018,18 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         {
                             var formatString = options.ReleaseDateFormat;
 
-                            writer.WriteElementString("premiered", item.PremiereDate.Value.ToLocalTime().ToString(formatString));
-                            writer.WriteElementString("releasedate", item.PremiereDate.Value.ToLocalTime().ToString(formatString));
+                            writer.WriteElementString(
+                                "premiered",
+                                item.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
+                            writer.WriteElementString(
+                                "releasedate",
+                                item.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                         }
                     }
 
-                    writer.WriteElementString("dateadded", DateTime.UtcNow.ToLocalTime().ToString(DateAddedFormat));
+                    writer.WriteElementString(
+                        "dateadded",
+                        DateTime.UtcNow.ToLocalTime().ToString(DateAddedFormat, CultureInfo.InvariantCulture));
 
                     if (item.ProductionYear.HasValue)
                     {
@@ -2106,7 +2043,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                     var overview = (item.Overview ?? string.Empty)
                         .StripHtml()
-                        .Replace("&quot;", "'");
+                        .Replace("&quot;", "'", StringComparison.Ordinal);
 
                     writer.WriteElementString("plot", overview);
 
@@ -2214,17 +2151,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         }
 
         private static bool IsPersonType(PersonInfo person, string type)
-        {
-            return string.Equals(person.Type, type, StringComparison.OrdinalIgnoreCase) || string.Equals(person.Role, type, StringComparison.OrdinalIgnoreCase);
-        }
-
-        private void AddGenre(List<string> genres, string genre)
-        {
-            if (!genres.Contains(genre, StringComparer.OrdinalIgnoreCase))
-            {
-                genres.Add(genre);
-            }
-        }
+            => string.Equals(person.Type, type, StringComparison.OrdinalIgnoreCase)
+                || string.Equals(person.Role, type, StringComparison.OrdinalIgnoreCase);
 
         private LiveTvProgram GetProgramInfoFromCache(string programId)
         {
@@ -2283,25 +2211,19 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 return false;
             }
 
-            if (!seriesTimer.RecordAnyTime)
+            if (!seriesTimer.RecordAnyTime
+                && Math.Abs(seriesTimer.StartDate.TimeOfDay.Ticks - timer.StartDate.TimeOfDay.Ticks) >= TimeSpan.FromMinutes(10).Ticks)
             {
-                if (Math.Abs(seriesTimer.StartDate.TimeOfDay.Ticks - timer.StartDate.TimeOfDay.Ticks) >= TimeSpan.FromMinutes(10).Ticks)
-                {
-                    return true;
-                }
+                return true;
             }
 
-            //if (!seriesTimer.Days.Contains(timer.StartDate.ToLocalTime().DayOfWeek))
-            //{
-            //    return true;
-            //}
-
             if (seriesTimer.RecordNewOnly && timer.IsRepeat)
             {
                 return true;
             }
 
-            if (!seriesTimer.RecordAnyChannel && !string.Equals(timer.ChannelId, seriesTimer.ChannelId, StringComparison.OrdinalIgnoreCase))
+            if (!seriesTimer.RecordAnyChannel
+                && !string.Equals(timer.ChannelId, seriesTimer.ChannelId, StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }
@@ -2346,7 +2268,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             var allTimers = GetTimersForSeries(seriesTimer).ToList();
 
-
             var enabledTimersForSeries = new List<TimerInfo>();
             foreach (var timer in allTimers)
             {
@@ -2369,10 +2290,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     {
                         enabledTimersForSeries.Add(timer);
                     }
+
                     _timerProvider.Add(timer);
 
                     TimerCreated?.Invoke(this, new GenericEventArgs<TimerInfo>(timer));
                 }
+
                 // Only update if not currently active - test both new timer and existing in case Id's are different
                 // Id's could be different if the timer was created manually prior to series timer creation
                 else if (!_activeRecordings.TryGetValue(timer.Id, out _) && !_activeRecordings.TryGetValue(existingTimer.Id, out _))
@@ -2508,13 +2431,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 if (!tempChannelCache.TryGetValue(parent.ChannelId, out LiveTvChannel channel))
                 {
-                    channel = _libraryManager.GetItemList(new InternalItemsQuery
-                    {
-                        IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
-                        ItemIds = new[] { parent.ChannelId },
-                        DtoOptions = new DtoOptions()
-
-                    }).Cast<LiveTvChannel>().FirstOrDefault();
+                    channel = _libraryManager.GetItemList(
+                        new InternalItemsQuery
+                        {
+                            IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
+                            ItemIds = new[] { parent.ChannelId },
+                            DtoOptions = new DtoOptions()
+                        }).FirstOrDefault() as LiveTvChannel;
 
                     if (channel != null && !string.IsNullOrWhiteSpace(channel.ExternalId))
                     {
@@ -2567,13 +2490,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 if (!tempChannelCache.TryGetValue(programInfo.ChannelId, out LiveTvChannel channel))
                 {
-                    channel = _libraryManager.GetItemList(new InternalItemsQuery
-                    {
-                        IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
-                        ItemIds = new[] { programInfo.ChannelId },
-                        DtoOptions = new DtoOptions()
-
-                    }).Cast<LiveTvChannel>().FirstOrDefault();
+                    channel = _libraryManager.GetItemList(
+                        new InternalItemsQuery
+                        {
+                            IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
+                            ItemIds = new[] { programInfo.ChannelId },
+                            DtoOptions = new DtoOptions()
+                        }).FirstOrDefault() as LiveTvChannel;
 
                     if (channel != null && !string.IsNullOrWhiteSpace(channel.ExternalId))
                     {
@@ -2618,10 +2541,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             foreach (var providerId in timerInfo.ProviderIds)
             {
-                var srch = "Series";
-                if (providerId.Key.StartsWith(srch, StringComparison.OrdinalIgnoreCase))
+                const string Search = "Series";
+                if (providerId.Key.StartsWith(Search, StringComparison.OrdinalIgnoreCase))
                 {
-                    seriesProviderIds[providerId.Key.Substring(srch.Length)] = providerId.Value;
+                    seriesProviderIds[providerId.Key.Substring(Search.Length)] = providerId.Value;
                 }
             }
 
@@ -2632,12 +2555,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if ((program.EpisodeNumber.HasValue && program.SeasonNumber.HasValue) || !string.IsNullOrWhiteSpace(program.EpisodeTitle))
             {
-                var seriesIds = _libraryManager.GetItemIds(new InternalItemsQuery
-                {
-                    IncludeItemTypes = new[] { typeof(Series).Name },
-                    Name = program.Name
-
-                }).ToArray();
+                var seriesIds = _libraryManager.GetItemIds(
+                    new InternalItemsQuery
+                    {
+                        IncludeItemTypes = new[] { typeof(Series).Name },
+                        Name = program.Name
+                    }).ToArray();
 
                 if (seriesIds.Length == 0)
                 {
@@ -2666,59 +2589,70 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return false;
         }
 
-        private bool _disposed;
+        /// <inheritdoc />
         public void Dispose()
         {
-            _disposed = true;
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                _recordingDeleteSemaphore.Dispose();
+            }
+
             foreach (var pair in _activeRecordings.ToList())
             {
                 pair.Value.CancellationTokenSource.Cancel();
             }
+
+            _disposed = true;
         }
 
-        public List<VirtualFolderInfo> GetRecordingFolders()
+        public IEnumerable<VirtualFolderInfo> GetRecordingFolders()
         {
-            var list = new List<VirtualFolderInfo>();
-
             var defaultFolder = RecordingPath;
             var defaultName = "Recordings";
 
             if (Directory.Exists(defaultFolder))
             {
-                list.Add(new VirtualFolderInfo
+                yield return new VirtualFolderInfo
                 {
                     Locations = new string[] { defaultFolder },
                     Name = defaultName
-                });
+                };
             }
 
             var customPath = GetConfiguration().MovieRecordingPath;
-            if ((!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase)) && Directory.Exists(customPath))
+            if (!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase) && Directory.Exists(customPath))
             {
-                list.Add(new VirtualFolderInfo
+                yield return new VirtualFolderInfo
                 {
                     Locations = new string[] { customPath },
                     Name = "Recorded Movies",
                     CollectionType = CollectionType.Movies
-                });
+                };
             }
 
             customPath = GetConfiguration().SeriesRecordingPath;
-            if ((!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase)) && Directory.Exists(customPath))
+            if (!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase) && Directory.Exists(customPath))
             {
-                list.Add(new VirtualFolderInfo
+                yield return new VirtualFolderInfo
                 {
                     Locations = new string[] { customPath },
                     Name = "Recorded Shows",
                     CollectionType = CollectionType.TvShows
-                });
+                };
             }
-
-            return list;
         }
 
-        private const int TunerDiscoveryDurationMs = 3000;
-
         public async Task<List<TunerHostInfo>> DiscoverTuners(bool newDevicesOnly, CancellationToken cancellationToken)
         {
             var list = new List<TunerHostInfo>();
@@ -2737,6 +2671,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     discoveredDevices = discoveredDevices.Where(d => !configuredDeviceIds.Contains(d.DeviceId, StringComparer.OrdinalIgnoreCase))
                             .ToList();
                 }
+
                 list.AddRange(discoveredDevices);
             }
 
@@ -2773,11 +2708,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private async Task<List<TunerHostInfo>> DiscoverDevices(ITunerHost host, int discoveryDuationMs, CancellationToken cancellationToken)
+        private async Task<List<TunerHostInfo>> DiscoverDevices(ITunerHost host, int discoveryDurationMs, CancellationToken cancellationToken)
         {
             try
             {
-                var discoveredDevices = await host.DiscoverDevices(discoveryDuationMs, cancellationToken).ConfigureAwait(false);
+                var discoveredDevices = await host.DiscoverDevices(discoveryDurationMs, cancellationToken).ConfigureAwait(false);
 
                 foreach (var device in discoveredDevices)
                 {
@@ -2794,11 +2729,4 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
     }
-    public static class ConfigurationExtension
-    {
-        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager manager)
-        {
-            return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
-        }
-    }
 }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
new file mode 100644
index 000000000..498aa3c26
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
@@ -0,0 +1,68 @@
+#pragma warning disable SA1600
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Controller.LiveTv;
+
+namespace Emby.Server.Implementations.LiveTv.EmbyTV
+{
+
+    internal class EpgChannelData
+    {
+        public EpgChannelData(IEnumerable<ChannelInfo> channels)
+        {
+            ChannelsById = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
+            ChannelsByNumber = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
+            ChannelsByName = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var channel in channels)
+            {
+                ChannelsById[channel.Id] = channel;
+
+                if (!string.IsNullOrEmpty(channel.Number))
+                {
+                    ChannelsByNumber[channel.Number] = channel;
+                }
+
+                var normalizedName = NormalizeName(channel.Name ?? string.Empty);
+                if (!string.IsNullOrWhiteSpace(normalizedName))
+                {
+                    ChannelsByName[normalizedName] = channel;
+                }
+            }
+        }
+
+        private Dictionary<string, ChannelInfo> ChannelsById { get; set; }
+
+        private Dictionary<string, ChannelInfo> ChannelsByNumber { get; set; }
+
+        private Dictionary<string, ChannelInfo> ChannelsByName { get; set; }
+
+        public ChannelInfo GetChannelById(string id)
+        {
+            ChannelsById.TryGetValue(id, out var result);
+
+            return result;
+        }
+
+        public ChannelInfo GetChannelByNumber(string number)
+        {
+            ChannelsByNumber.TryGetValue(number, out var result);
+
+            return result;
+        }
+
+        public ChannelInfo GetChannelByName(string name)
+        {
+            ChannelsByName.TryGetValue(name, out var result);
+
+            return result;
+        }
+
+        public static string NormalizeName(string value)
+        {
+            return value.Replace(" ", string.Empty, StringComparison.Ordinal).Replace("-", string.Empty, StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs
new file mode 100644
index 000000000..83f5e8413
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs
@@ -0,0 +1,19 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+
+namespace Emby.Server.Implementations.LiveTv.EmbyTV
+{
+    /// <summary>
+    /// Class containing extension methods for working with the nfo configuration.
+    /// </summary>
+    public static class NfoConfigurationExtensions
+    {
+        /// <summary>
+        /// Gets the nfo configuration.
+        /// </summary>
+        /// <param name="configurationManager">The configuration manager.</param>
+        /// <returns>The nfo configuration.</returns>
+        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager configurationManager)
+         => configurationManager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index d4bd598e3..d1f405679 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1,3 +1,6 @@
+#pragma warning disable SA1600
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -35,7 +38,7 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.LiveTv
 {
     /// <summary>
-    /// Class LiveTvManager
+    /// Class LiveTvManager.
     /// </summary>
     public class LiveTvManager : ILiveTvManager, IDisposable
     {
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 4bd729aac..d6f5bb0c0 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -768,7 +768,7 @@ namespace MediaBrowser.Api.Playback
 
                 if (mediaSource == null)
                 {
-                    var mediaSources = (await MediaSourceManager.GetPlayackMediaSources(LibraryManager.GetItemById(request.Id), null, false, false, cancellationToken).ConfigureAwait(false)).ToList();
+                    var mediaSources = (await MediaSourceManager.GetPlaybackMediaSources(LibraryManager.GetItemById(request.Id), null, false, false, cancellationToken).ConfigureAwait(false)).ToList();
 
                     mediaSource = string.IsNullOrEmpty(request.MediaSourceId)
                        ? mediaSources[0]
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index da8f99a3d..ee440f5db 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -270,7 +270,7 @@ namespace MediaBrowser.Api.Playback
                 try
                 {
                     // TODO handle supportedLiveMediaTypes ?
-                    mediaSources = await _mediaSourceManager.GetPlayackMediaSources(item, user, true, false, CancellationToken.None).ConfigureAwait(false);
+                    mediaSources = await _mediaSourceManager.GetPlaybackMediaSources(item, user, true, false, CancellationToken.None).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
index fbae4edb0..1bf981d79 100644
--- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -39,9 +39,9 @@ namespace MediaBrowser.Controller.Library
         List<MediaStream> GetMediaStreams(MediaStreamQuery query);
 
         /// <summary>
-        /// Gets the playack media sources.
+        /// Gets the playback media sources.
         /// </summary>
-        Task<List<MediaSourceInfo>> GetPlayackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken);
+        Task<List<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the static media sources.
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index d5fa76c3a..67c7fa343 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -126,7 +126,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 throw new ArgumentNullException(nameof(mediaSourceId));
             }
 
-            var mediaSources = await _mediaSourceManager.GetPlayackMediaSources(item, null, true, false, cancellationToken).ConfigureAwait(false);
+            var mediaSources = await _mediaSourceManager.GetPlaybackMediaSources(item, null, true, false, cancellationToken).ConfigureAwait(false);
 
             var mediaSource = mediaSources
                 .First(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
diff --git a/jellyfin.ruleset b/jellyfin.ruleset
index 75b5573b6..d3d3001ed 100644
--- a/jellyfin.ruleset
+++ b/jellyfin.ruleset
@@ -31,7 +31,9 @@
   <Rules AnalyzerId="Microsoft.CodeAnalysis.FxCopAnalyzers" RuleNamespace="Microsoft.Design">
     <!-- disable warning CA1031: Do not catch general exception types -->
     <Rule Id="CA1031" Action="Info" />
-    <!-- disable warning CA1062: Validate arguments of public methods -->
+    <!-- disable warning CA1056: URI properties should not be strings -->
+    <Rule Id="CA1056" Action="Info" />
+    <!-- disable warning CA1720: Identifiers should not contain type names -->
     <Rule Id="CA1062" Action="Info" />
     <!-- disable warning CA1720: Identifiers should not contain type names -->
     <Rule Id="CA1720" Action="Info" />
-- 
cgit v1.2.3


From 35151553e3fc9ddbe352744af8d832b1337491c8 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 6 Dec 2019 20:40:06 +0100
Subject: Add back all old emby tests

---
 Emby.Naming/Common/NamingOptions.cs                |  41 +-
 Emby.Naming/Video/CleanStringParser.cs             |   2 +-
 Emby.Naming/Video/ExtraResolver.cs                 |   2 +-
 Emby.Naming/Video/ExtraResult.cs                   |   5 +-
 Emby.Naming/Video/ExtraRule.cs                     |   5 +-
 Emby.Naming/Video/StubResolver.cs                  |   4 +-
 Emby.Naming/Video/VideoFileInfo.cs                 |   6 +-
 Emby.Naming/Video/VideoListResolver.cs             |   9 +-
 Emby.Naming/Video/VideoResolver.cs                 |   2 +-
 .../Library/LibraryManager.cs                      |  31 +-
 MediaBrowser.Model/Entities/MediaType.cs           |   5 +-
 jellyfin.ruleset                                   |   2 +
 .../Jellyfin.Naming.Tests/EpisodePathParserTest.cs |  55 ---
 .../Music/MultiDiscAlbumTests.cs                   |  57 +++
 .../Subtitles/SubtitleParserTests.cs               |  40 ++
 .../TV/AbsoluteEpisodeNumberTests.cs               |  61 +++
 .../Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs  |  69 +++
 .../Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs | 421 ++++++++++++++++++
 .../TV/EpisodeNumberWithoutSeasonTests.cs          | 127 ++++++
 .../TV/EpisodePathParserTest.cs                    |  55 +++
 .../TV/EpisodeWithoutSeasonTests.cs                |  56 +++
 .../Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs  | 105 +++++
 .../Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs  | 112 +++++
 .../Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs  | 305 +++++++++++++
 .../Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs |  95 ++++
 tests/Jellyfin.Naming.Tests/Video/BaseVideoTest.cs |  15 +
 .../Video/CleanDateTimeTests.cs                    | 143 ++++++
 .../Video/CleanStringTests.cs                      | 133 ++++++
 tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs    |  77 ++++
 tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs |  78 ++++
 .../Video/MultiVersionTests.cs                     | 438 +++++++++++++++++++
 tests/Jellyfin.Naming.Tests/Video/StackTests.cs    | 478 +++++++++++++++++++++
 tests/Jellyfin.Naming.Tests/Video/StubTests.cs     |  55 +++
 .../Video/VideoListResolverTests.cs                | 457 ++++++++++++++++++++
 .../Video/VideoResolverTests.cs                    | 275 ++++++++++++
 35 files changed, 3705 insertions(+), 116 deletions(-)
 delete mode 100644 tests/Jellyfin.Naming.Tests/EpisodePathParserTest.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/AbsoluteEpisodeNumberTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/EpisodeWithoutSeasonTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/BaseVideoTest.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/StackTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/StubTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs

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

diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index d37be0e63..f8601c59f 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Emby.Naming.Video;
+using MediaBrowser.Model.Entities;
 
 namespace Emby.Naming.Common
 {
@@ -173,7 +174,7 @@ namespace Emby.Naming.Common
 
             CleanDateTimes = new[]
             {
-                @"(.+[^ _\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\,\.\(\)\[\]\-][^0-9]|$)"
+                @"(.+[^_\,\.\(\)\[\]\-])[_\.\(\)\[\]\-](19[0-9][0-9]|20[0-1][0-9])([ _\,\.\(\)\[\]\-][^0-9]|).*(19[0-9][0-9]|20[0-1][0-9])*"
             };
 
             CleanStrings = new[]
@@ -336,7 +337,7 @@ namespace Emby.Naming.Common
 
                 // *** End Kodi Standard Naming
 
-                // [bar] Foo - 1 [baz]
+                // [bar] Foo - 1 [baz]
                 new EpisodeExpression(@".*?(\[.*?\])+.*?(?<seriesname>(\w+\s*?)+?)[-\s_]+(?<epnumber>\d+).*$")
                 {
                     IsNamed = true
@@ -420,126 +421,126 @@ namespace Emby.Naming.Common
             {
                 new ExtraRule
                 {
-                    ExtraType = "trailer",
+                    ExtraType = ExtraType.Trailer,
                     RuleType = ExtraRuleType.Filename,
                     Token = "trailer",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "trailer",
+                    ExtraType = ExtraType.Trailer,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-trailer",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "trailer",
+                    ExtraType = ExtraType.Trailer,
                     RuleType = ExtraRuleType.Suffix,
                     Token = ".trailer",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "trailer",
+                    ExtraType = ExtraType.Trailer,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "_trailer",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "trailer",
+                    ExtraType = ExtraType.Trailer,
                     RuleType = ExtraRuleType.Suffix,
                     Token = " trailer",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "sample",
+                    ExtraType = ExtraType.Sample,
                     RuleType = ExtraRuleType.Filename,
                     Token = "sample",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "sample",
+                    ExtraType = ExtraType.Sample,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-sample",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "sample",
+                    ExtraType = ExtraType.Sample,
                     RuleType = ExtraRuleType.Suffix,
                     Token = ".sample",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "sample",
+                    ExtraType = ExtraType.Sample,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "_sample",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "sample",
+                    ExtraType = ExtraType.Sample,
                     RuleType = ExtraRuleType.Suffix,
                     Token = " sample",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "themesong",
+                    ExtraType = ExtraType.ThemeSong,
                     RuleType = ExtraRuleType.Filename,
                     Token = "theme",
                     MediaType = MediaType.Audio
                 },
                 new ExtraRule
                 {
-                    ExtraType = "scene",
+                    ExtraType = ExtraType.Scene,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-scene",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "clip",
+                    ExtraType = ExtraType.Clip,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-clip",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "interview",
+                    ExtraType = ExtraType.Interview,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-interview",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "behindthescenes",
+                    ExtraType = ExtraType.BehindTheScenes,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-behindthescenes",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "deletedscene",
+                    ExtraType = ExtraType.DeletedScene,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-deleted",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "featurette",
+                    ExtraType = ExtraType.Clip,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-featurette",
                     MediaType = MediaType.Video
                 },
                 new ExtraRule
                 {
-                    ExtraType = "short",
+                    ExtraType = ExtraType.Clip,
                     RuleType = ExtraRuleType.Suffix,
                     Token = "-short",
                     MediaType = MediaType.Video
diff --git a/Emby.Naming/Video/CleanStringParser.cs b/Emby.Naming/Video/CleanStringParser.cs
index 02b90310d..e2da121db 100644
--- a/Emby.Naming/Video/CleanStringParser.cs
+++ b/Emby.Naming/Video/CleanStringParser.cs
@@ -4,7 +4,7 @@ using System.Text.RegularExpressions;
 namespace Emby.Naming.Video
 {
     /// <summary>
-    /// http://kodi.wiki/view/Advancedsettings.xml#video
+    /// <see href="http://kodi.wiki/view/Advancedsettings.xml#video" />.
     /// </summary>
     public class CleanStringParser
     {
diff --git a/Emby.Naming/Video/ExtraResolver.cs b/Emby.Naming/Video/ExtraResolver.cs
index 9f70494d0..f83da44a4 100644
--- a/Emby.Naming/Video/ExtraResolver.cs
+++ b/Emby.Naming/Video/ExtraResolver.cs
@@ -20,7 +20,7 @@ namespace Emby.Naming.Video
         {
             return _options.VideoExtraRules
                 .Select(i => GetExtraInfo(path, i))
-                .FirstOrDefault(i => !string.IsNullOrEmpty(i.ExtraType)) ?? new ExtraResult();
+                .FirstOrDefault(i => i.ExtraType != null) ?? new ExtraResult();
         }
 
         private ExtraResult GetExtraInfo(string path, ExtraRule rule)
diff --git a/Emby.Naming/Video/ExtraResult.cs b/Emby.Naming/Video/ExtraResult.cs
index ff6f20c47..60d6b80ec 100644
--- a/Emby.Naming/Video/ExtraResult.cs
+++ b/Emby.Naming/Video/ExtraResult.cs
@@ -1,3 +1,5 @@
+using MediaBrowser.Model.Entities;
+
 namespace Emby.Naming.Video
 {
     public class ExtraResult
@@ -6,7 +8,8 @@ namespace Emby.Naming.Video
         /// Gets or sets the type of the extra.
         /// </summary>
         /// <value>The type of the extra.</value>
-        public string ExtraType { get; set; }
+        public ExtraType? ExtraType { get; set; }
+
         /// <summary>
         /// Gets or sets the rule.
         /// </summary>
diff --git a/Emby.Naming/Video/ExtraRule.cs b/Emby.Naming/Video/ExtraRule.cs
index b8eb8427e..62ec70163 100644
--- a/Emby.Naming/Video/ExtraRule.cs
+++ b/Emby.Naming/Video/ExtraRule.cs
@@ -9,16 +9,19 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <value>The token.</value>
         public string Token { get; set; }
+
         /// <summary>
         /// Gets or sets the type of the extra.
         /// </summary>
         /// <value>The type of the extra.</value>
-        public string ExtraType { get; set; }
+        public MediaBrowser.Model.Entities.ExtraType ExtraType { get; set; }
+
         /// <summary>
         /// Gets or sets the type of the rule.
         /// </summary>
         /// <value>The type of the rule.</value>
         public ExtraRuleType RuleType { get; set; }
+
         /// <summary>
         /// Gets or sets the type of the media.
         /// </summary>
diff --git a/Emby.Naming/Video/StubResolver.cs b/Emby.Naming/Video/StubResolver.cs
index b78244cb3..97f3178e5 100644
--- a/Emby.Naming/Video/StubResolver.cs
+++ b/Emby.Naming/Video/StubResolver.cs
@@ -11,14 +11,14 @@ namespace Emby.Naming.Video
         {
             if (path == null)
             {
-                return default(StubResult);
+                return default;
             }
 
             var extension = Path.GetExtension(path);
 
             if (!options.StubFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
             {
-                return default(StubResult);
+                return default;
             }
 
             var result = new StubResult()
diff --git a/Emby.Naming/Video/VideoFileInfo.cs b/Emby.Naming/Video/VideoFileInfo.cs
index 2f42f7784..8416821c2 100644
--- a/Emby.Naming/Video/VideoFileInfo.cs
+++ b/Emby.Naming/Video/VideoFileInfo.cs
@@ -1,3 +1,5 @@
+using MediaBrowser.Model.Entities;
+
 namespace Emby.Naming.Video
 {
     /// <summary>
@@ -30,10 +32,10 @@ namespace Emby.Naming.Video
         public int? Year { get; set; }
 
         /// <summary>
-        /// Gets or sets the type of the extra, e.g. trailer, theme song, behing the scenes, etc.
+        /// Gets or sets the type of the extra, e.g. trailer, theme song, behind the scenes, etc.
         /// </summary>
         /// <value>The type of the extra.</value>
-        public string ExtraType { get; set; }
+        public ExtraType? ExtraType { get; set; }
 
         /// <summary>
         /// Gets or sets the extra rule.
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index 5fa0041e0..e43e920c4 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Emby.Naming.Common;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 
 namespace Emby.Naming.Video
@@ -29,7 +30,7 @@ namespace Emby.Naming.Video
             // Filter out all extras, otherwise they could cause stacks to not be resolved
             // See the unit test TestStackedWithTrailer
             var nonExtras = videoInfos
-                .Where(i => string.IsNullOrEmpty(i.ExtraType))
+                .Where(i => i.ExtraType == null)
                 .Select(i => new FileSystemMetadata
                 {
                     FullName = i.Path,
@@ -76,7 +77,7 @@ namespace Emby.Naming.Video
             }
 
             var standaloneMedia = remainingFiles
-                .Where(i => string.IsNullOrEmpty(i.ExtraType))
+                .Where(i => i.ExtraType == null)
                 .ToList();
 
             foreach (var media in standaloneMedia)
@@ -145,7 +146,7 @@ namespace Emby.Naming.Video
             if (list.Count == 1)
             {
                 var trailers = remainingFiles
-                    .Where(i => string.Equals(i.ExtraType, "trailer", StringComparison.OrdinalIgnoreCase))
+                    .Where(i => i.ExtraType == ExtraType.Trailer)
                     .ToList();
 
                 list[0].Extras.AddRange(trailers);
@@ -226,7 +227,7 @@ namespace Emby.Naming.Video
             }
 
             return remainingFiles
-                .Where(i => !string.IsNullOrEmpty(i.ExtraType))
+                .Where(i => i.ExtraType == null)
                 .Where(i => baseNames.Any(b => i.FileNameWithoutExtension.StartsWith(b, StringComparison.OrdinalIgnoreCase)))
                 .ToList();
         }
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 91f443500..05ba0c2e5 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -91,7 +91,7 @@ namespace Emby.Naming.Video
             {
                 var cleanDateTimeResult = CleanDateTime(name);
 
-                if (string.IsNullOrEmpty(extraResult.ExtraType))
+                if (extraResult.ExtraType == null)
                 {
                     name = CleanString(cleanDateTimeResult.Name).Name;
                 }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 528636ecd..8589b1b33 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2556,7 +2556,7 @@ namespace Emby.Server.Implementations.Library
 
             if (currentVideo != null)
             {
-                files.AddRange(currentVideo.Extras.Where(i => string.Equals(i.ExtraType, "trailer", StringComparison.OrdinalIgnoreCase)).Select(i => _fileSystem.GetFileInfo(i.Path)));
+                files.AddRange(currentVideo.Extras.Where(i => i.ExtraType == ExtraType.Trailer).Select(i => _fileSystem.GetFileInfo(i.Path)));
             }
 
             var resolvers = new IItemResolver[]
@@ -2606,7 +2606,7 @@ namespace Emby.Server.Implementations.Library
 
             if (currentVideo != null)
             {
-                files.AddRange(currentVideo.Extras.Where(i => !string.Equals(i.ExtraType, "trailer", StringComparison.OrdinalIgnoreCase)).Select(i => _fileSystem.GetFileInfo(i.Path)));
+                files.AddRange(currentVideo.Extras.Where(i => i.ExtraType != ExtraType.Trailer).Select(i => _fileSystem.GetFileInfo(i.Path)));
             }
 
             return ResolvePaths(files, directoryService, null, new LibraryOptions(), null)
@@ -2710,7 +2710,7 @@ namespace Emby.Server.Implementations.Library
 
             if (!string.Equals(newPath, path, StringComparison.Ordinal))
             {
-                if (to.IndexOf('/') != -1)
+                if (to.IndexOf('/', StringComparison.Ordinal) != -1)
                 {
                     newPath = newPath.Replace('\\', '/');
                 }
@@ -2731,30 +2731,7 @@ namespace Emby.Server.Implementations.Library
 
             var result = resolver.GetExtraInfo(item.Path);
 
-            if (string.Equals(result.ExtraType, "deletedscene", StringComparison.OrdinalIgnoreCase))
-            {
-                item.ExtraType = ExtraType.DeletedScene;
-            }
-            else if (string.Equals(result.ExtraType, "behindthescenes", StringComparison.OrdinalIgnoreCase))
-            {
-                item.ExtraType = ExtraType.BehindTheScenes;
-            }
-            else if (string.Equals(result.ExtraType, "interview", StringComparison.OrdinalIgnoreCase))
-            {
-                item.ExtraType = ExtraType.Interview;
-            }
-            else if (string.Equals(result.ExtraType, "scene", StringComparison.OrdinalIgnoreCase))
-            {
-                item.ExtraType = ExtraType.Scene;
-            }
-            else if (string.Equals(result.ExtraType, "sample", StringComparison.OrdinalIgnoreCase))
-            {
-                item.ExtraType = ExtraType.Sample;
-            }
-            else
-            {
-                item.ExtraType = ExtraType.Clip;
-            }
+            item.ExtraType = result.ExtraType;
         }
 
         public List<PersonInfo> GetPeople(InternalPeopleQuery query)
diff --git a/MediaBrowser.Model/Entities/MediaType.cs b/MediaBrowser.Model/Entities/MediaType.cs
index c56c8f8f2..d8b02c9ea 100644
--- a/MediaBrowser.Model/Entities/MediaType.cs
+++ b/MediaBrowser.Model/Entities/MediaType.cs
@@ -3,20 +3,23 @@ namespace MediaBrowser.Model.Entities
     /// <summary>
     /// Class MediaType
     /// </summary>
-    public class MediaType
+    public static class MediaType
     {
         /// <summary>
         /// The video
         /// </summary>
         public const string Video = "Video";
+
         /// <summary>
         /// The audio
         /// </summary>
         public const string Audio = "Audio";
+
         /// <summary>
         /// The photo
         /// </summary>
         public const string Photo = "Photo";
+
         /// <summary>
         /// The book
         /// </summary>
diff --git a/jellyfin.ruleset b/jellyfin.ruleset
index 75b5573b6..1d424a27d 100644
--- a/jellyfin.ruleset
+++ b/jellyfin.ruleset
@@ -24,6 +24,8 @@
     <Rule Id="SA1413" Action="None" />
     <!-- disable warning SA1512: Single-line comments must not be followed by blank line -->
     <Rule Id="SA1512" Action="None" />
+    <!-- disable warning SA1515: Single-line comment should be preceded by blank line -->
+    <Rule Id="SA1515" Action="None" />
     <!-- disable warning SA1633: The file header is missing or not located at the top of the file -->
     <Rule Id="SA1633" Action="None" />
   </Rules>
diff --git a/tests/Jellyfin.Naming.Tests/EpisodePathParserTest.cs b/tests/Jellyfin.Naming.Tests/EpisodePathParserTest.cs
deleted file mode 100644
index dd1e04215..000000000
--- a/tests/Jellyfin.Naming.Tests/EpisodePathParserTest.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Emby.Naming.Common;
-using Emby.Naming.TV;
-using Xunit;
-
-namespace Jellyfin.Naming.Tests
-{
-    public class EpisodePathParserTest
-    {
-        [Theory]
-        [InlineData("/media/Foo/Foo-S01E01", "Foo", 1, 1)]
-        [InlineData("/media/Foo - S04E011", "Foo", 4, 11)]
-        [InlineData("/media/Foo/Foo s01x01", "Foo", 1, 1)]
-        [InlineData("/media/Foo (2019)/Season 4/Foo (2019).S04E03", "Foo (2019)", 4, 3)]
-        public void ParseEpisodesCorrectly(string path, string name, int season, int episode)
-        {
-            NamingOptions o = new NamingOptions();
-            EpisodePathParser p = new EpisodePathParser(o);
-            var res = p.Parse(path, false);
-
-            Assert.True(res.Success);
-            Assert.Equal(name, res.SeriesName);
-            Assert.Equal(season, res.SeasonNumber);
-            Assert.Equal(episode, res.EpisodeNumber);
-
-            // testing other paths delimeter
-            var res2 = p.Parse(path.Replace('/', '\\'), false);
-            Assert.True(res2.Success);
-            Assert.Equal(name, res2.SeriesName);
-            Assert.Equal(season, res2.SeasonNumber);
-            Assert.Equal(episode, res2.EpisodeNumber);
-        }
-
-        [Theory]
-        [InlineData("/media/Foo/Foo 889", "Foo", 889)]
-        [InlineData("/media/Foo/[Bar] Foo Baz - 11 [1080p]", "Foo Baz", 11)]
-        public void ParseEpisodeWithoutSeason(string path, string name, int episode)
-        {
-            NamingOptions o = new NamingOptions();
-            EpisodePathParser p = new EpisodePathParser(o);
-            var res = p.Parse(path, true, fillExtendedInfo: true);
-
-            Assert.True(res.Success);
-            Assert.Equal(name, res.SeriesName);
-            Assert.Null(res.SeasonNumber);
-            Assert.Equal(episode, res.EpisodeNumber);
-
-            // testing other paths delimeter
-            var res2 = p.Parse(path.Replace('/', '\\'), false, fillExtendedInfo: false);
-            Assert.True(res2.Success);
-            Assert.Equal(name, res2.SeriesName);
-            Assert.Null(res2.SeasonNumber);
-            Assert.Equal(episode, res2.EpisodeNumber);
-        }
-    }
-}
diff --git a/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
new file mode 100644
index 000000000..eb69d915c
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
@@ -0,0 +1,57 @@
+using Emby.Naming.Audio;
+using Emby.Naming.Common;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Music
+{
+    public class MultiDiscAlbumTests
+    {
+        [Fact]
+        public void TestMultiDiscAlbums()
+        {
+            Assert.False(IsMultiDiscAlbumFolder(@"blah blah"));
+            Assert.False(IsMultiDiscAlbumFolder(@"d:/music\weezer/03 Pinkerton"));
+            Assert.False(IsMultiDiscAlbumFolder(@"d:/music/michael jackson/Bad (2012 Remaster)"));
+
+            Assert.True(IsMultiDiscAlbumFolder(@"cd1"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disc1"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disk1"));
+
+            // Add a space
+            Assert.True(IsMultiDiscAlbumFolder(@"cd 1"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disc 1"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disk 1"));
+
+            Assert.True(IsMultiDiscAlbumFolder(@"cd  - 1"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disc- 1"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disk - 1"));
+
+            Assert.True(IsMultiDiscAlbumFolder(@"Disc 01 (Hugo Wolf · 24 Lieder)"));
+            Assert.True(IsMultiDiscAlbumFolder(@"Disc 04 (Encores and Folk Songs)"));
+            Assert.True(IsMultiDiscAlbumFolder(@"Disc04 (Encores and Folk Songs)"));
+            Assert.True(IsMultiDiscAlbumFolder(@"Disc 04(Encores and Folk Songs)"));
+            Assert.True(IsMultiDiscAlbumFolder(@"Disc04(Encores and Folk Songs)"));
+
+            Assert.True(IsMultiDiscAlbumFolder(@"D:/Video/MBTestLibrary/VideoTest/music/.38 special/anth/Disc 2"));
+        }
+
+        [Fact]
+        public void TestMultiDiscAlbums1()
+        {
+            Assert.False(IsMultiDiscAlbumFolder(@"[1985] Oppurtunities (Let's make lots of money) (1985)"));
+        }
+
+        [Fact]
+        public void TestMultiDiscAlbums2()
+        {
+            Assert.False(IsMultiDiscAlbumFolder(@"Blah 04(Encores and Folk Songs)"));
+        }
+
+        private bool IsMultiDiscAlbumFolder(string path)
+        {
+            var parser = new AlbumParser(new NamingOptions());
+
+            return parser.ParseMultiPart(path).IsMultiPart;
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs b/tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs
new file mode 100644
index 000000000..e8f14cdc4
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs
@@ -0,0 +1,40 @@
+using Emby.Naming.Common;
+using Emby.Naming.Subtitles;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Subtitles
+{
+    public class SubtitleParserTests
+    {
+        private SubtitleParser GetParser()
+        {
+            var options = new NamingOptions();
+
+            return new SubtitleParser(options);
+        }
+
+        [Fact]
+        public void TestSubtitles()
+        {
+            Test("The Skin I Live In (2011).srt", null, false, false);
+            Test("The Skin I Live In (2011).eng.srt", "eng", false, false);
+            Test("The Skin I Live In (2011).eng.default.srt", "eng", true, false);
+            Test("The Skin I Live In (2011).eng.forced.srt", "eng", false, true);
+            Test("The Skin I Live In (2011).eng.foreign.srt", "eng", false, true);
+            Test("The Skin I Live In (2011).eng.default.foreign.srt", "eng", true, true);
+
+            Test("The Skin I Live In (2011).default.foreign.eng.srt", "eng", true, true);
+        }
+
+        private void Test(string input, string language, bool isDefault, bool isForced)
+        {
+            var parser = GetParser();
+
+            var result = parser.ParseFile(input);
+
+            Assert.Equal(language, result.Language, true);
+            Assert.Equal(isDefault, result.IsDefault);
+            Assert.Equal(isForced, result.IsForced);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/AbsoluteEpisodeNumberTests.cs b/tests/Jellyfin.Naming.Tests/TV/AbsoluteEpisodeNumberTests.cs
new file mode 100644
index 000000000..9abbcc7bf
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/AbsoluteEpisodeNumberTests.cs
@@ -0,0 +1,61 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class AbsoluteEpisodeNumberTests
+    {
+        [Fact]
+        public void TestAbsoluteEpisodeNumber1()
+        {
+            Assert.Equal(12, GetEpisodeNumberFromFile(@"The Simpsons/12.avi"));
+        }
+
+        [Fact]
+        public void TestAbsoluteEpisodeNumber2()
+        {
+            Assert.Equal(12, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons 12.avi"));
+        }
+
+        [Fact]
+        public void TestAbsoluteEpisodeNumber3()
+        {
+            Assert.Equal(82, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons 82.avi"));
+        }
+
+        [Fact]
+        public void TestAbsoluteEpisodeNumber4()
+        {
+            Assert.Equal(112, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons 112.avi"));
+        }
+
+        [Fact]
+        public void TestAbsoluteEpisodeNumber5()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/Foo_ep_02.avi"));
+        }
+
+        [Fact]
+        public void TestAbsoluteEpisodeNumber6()
+        {
+            Assert.Equal(889, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons 889.avi"));
+        }
+
+        [Fact]
+        public void TestAbsoluteEpisodeNumber7()
+        {
+            Assert.Equal(101, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons 101.avi"));
+        }
+
+        private int? GetEpisodeNumberFromFile(string path)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodeResolver(options)
+                .Resolve(path, false, null, null, true);
+
+            return result.EpisodeNumber;
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs b/tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs
new file mode 100644
index 000000000..29daf8cc3
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs
@@ -0,0 +1,69 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class DailyEpisodeTests
+    {
+        [Fact]
+        public void TestDailyEpisode1()
+        {
+            Test(@"/server/anything_1996.11.14.mp4", "anything", 1996, 11, 14);
+        }
+
+        [Fact]
+        public void TestDailyEpisode2()
+        {
+            Test(@"/server/anything_1996-11-14.mp4", "anything", 1996, 11, 14);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestDailyEpisode3()
+        {
+            Test(@"/server/anything_14.11.1996.mp4", "anything", 1996, 11, 14);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestDailyEpisode4()
+        {
+            Test(@"/server/A Daily Show - (2015-01-15) - Episode Name - [720p].mkv", "A Daily Show", 2015, 01, 15);
+        }
+
+        [Fact]
+        public void TestDailyEpisode5()
+        {
+            Test(@"/server/james.corden.2017.04.20.anne.hathaway.720p.hdtv.x264-crooks.mkv", "james.corden", 2017, 04, 20);
+        }
+
+        [Fact]
+        public void TestDailyEpisode6()
+        {
+            Test(@"/server/ABC News 2018_03_24_19_00_00.mkv", "ABC News", 2018, 03, 24);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestDailyEpisode7()
+        {
+            Test(@"/server/Last Man Standing_KTLADT_2018_05_25_01_28_00.wtv", "Last Man Standing", 2018, 05, 25);
+        }
+
+        private void Test(string path, string seriesName, int? year, int? month, int? day)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodeResolver(options)
+                .Resolve(path, false);
+
+            Assert.Null(result.SeasonNumber);
+            Assert.Null(result.EpisodeNumber);
+            Assert.Equal(year, result.Year);
+            Assert.Equal(month, result.Month);
+            Assert.Equal(day, result.Day);
+            Assert.Equal(seriesName, result.SeriesName, true);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs
new file mode 100644
index 000000000..03fae3159
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs
@@ -0,0 +1,421 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class EpisodeNumberTests
+    {
+        [Fact]
+        public void TestEpisodeNumber1()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 02/S02E03 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber40()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2/02x03 - 02x04 - 02x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber41()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber42()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/S01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber43()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/S01E02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber44()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2/Elementary - 02x03-04-15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber45()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/S01xE02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber46()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/seriesname S01E02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber47()
+        {
+            Assert.Equal(36, GetEpisodeNumberFromFile(@"Season 2/[HorribleSubs] Hunter X Hunter - 136 [720p].mkv"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber50()
+        {
+            // This convention is not currently supported, just adding in case we want to look at it in the future
+            Assert.Equal(1, GetEpisodeNumberFromFile(@"2016/Season s2016e1.mp4"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumber51()
+        {
+            // This convention is not currently supported, just adding in case we want to look at it in the future
+            Assert.Equal(1, GetEpisodeNumberFromFile(@"2016/Season 2016x1.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber52()
+        {
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode - 16.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber53()
+        {
+            // This is not supported. Expected to fail, although it would be a good one to add support for.
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16.avi"));
+        }
+        [Fact]
+        public void TestEpisodeNumber54()
+        {
+            // This is not supported. Expected to fail, although it would be a good one to add support for.
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16 - Some Title.avi"));
+        }
+        [Fact]
+        public void TestEpisodeNumber55()
+        {
+            // This is not supported. Expected to fail, although it would be a good one to add support for.
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16.avi"));
+        }
+        [Fact]
+        public void TestEpisodeNumber56()
+        {
+            // This is not supported. Expected to fail, although it would be a good one to add support for.
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16 - Some Title.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber57()
+        {
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/16 Some Title.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber58()
+        {
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/16 - 12 Some Title.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber59()
+        {
+            Assert.Equal(7, GetEpisodeNumberFromFile(@"Season 2/7 - 12 Angry Men.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumber60()
+        {
+            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/16 12 Some Title.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumber61()
+        {
+            Assert.Equal(7, GetEpisodeNumberFromFile(@"Season 2/7 12 Angry Men.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumber62()
+        {
+            // This is not supported. Expected to fail, although it would be a good one to add support for.
+            Assert.Equal(3, GetEpisodeNumberFromFile(@"Season 4/Uchuu.Senkan.Yamato.2199.E03.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber63()
+        {
+            Assert.Equal(3, GetEpisodeNumberFromFile(@"Season 4/Uchuu.Senkan.Yamato.2199.S04E03.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber64()
+        {
+            Assert.Equal(368, GetEpisodeNumberFromFile(@"Running Man/Running Man S2017E368.mkv"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumber65()
+        {
+            // Not supported yet
+            Assert.Equal(7, GetEpisodeNumberFromFile(@"/The.Legend.of.Condor.Heroes.2017.V2.web-dl.1080p.h264.aac-hdctv/The.Legend.of.Condor.Heroes.2017.E07.V2.web-dl.1080p.h264.aac-hdctv.mkv"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber30()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2/02x03 - 02x04 - 02x15 - Ep Name.mp4"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumber31()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/seriesname 01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber32()
+        {
+            Assert.Equal(9, GetEpisodeNumberFromFile(@"Season 25/The Simpsons.S25E09.Steal this episode.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber33()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/seriesname S01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber34()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2/Elementary - 02x03 - 02x04 - 02x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber35()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/seriesname S01xE02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber36()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 02/02x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber37()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 02/Elementary - 02x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber38()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 02/02x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber39()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 02/Elementary - 02x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber20()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2/02x03-04-15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber21()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 02/02x03-E15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber22()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 02/Elementary - 02x03-E15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber23()
+        {
+            Assert.Equal(23, GetEpisodeNumberFromFile(@"Season 1/Elementary - S01E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber24()
+        {
+            Assert.Equal(23, GetEpisodeNumberFromFile(@"Season 2009/S2009E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber25()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber26()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/S2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber27()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/S2009E02 blah.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumber28()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/seriesname 2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber29()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber11()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/2009x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber12()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03-E15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber13()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/S2009xE02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber14()
+        {
+            Assert.Equal(23, GetEpisodeNumberFromFile(@"Season 2009/Elementary - S2009E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber15()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/seriesname S2009xE02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber16()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/2009x03-E15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber17()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/seriesname S2009E02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber18()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/2009x03 - 2009x04 - 2009x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber19()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/2009x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber2()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2009/seriesname S2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber3()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03 - 2009x04 - 2009x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber4()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03-04-15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber5()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/2009x03-04-15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber6()
+        {
+            Assert.Equal(03, GetEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber7()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/02 - blah-02 a.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber8()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 1/02 - blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber9()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2/02 - blah 14 blah.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber10()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2/02.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber48()
+        {
+            Assert.Equal(02, GetEpisodeNumberFromFile(@"Season 2/2. Infestation.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumber49()
+        {
+            Assert.Equal(7, GetEpisodeNumberFromFile(@"The Wonder Years/The.Wonder.Years.S04.PDTV.x264-JCH/The Wonder Years s04e07 Christmas Party NTSC PDTV.avi"));
+        }
+
+        private int? GetEpisodeNumberFromFile(string path)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodePathParser(options)
+                .Parse(path, false);
+
+            return result.EpisodeNumber;
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs
new file mode 100644
index 000000000..00aa9ee7c
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs
@@ -0,0 +1,127 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class EpisodeNumberWithoutSeasonTests
+    {
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason1()
+        {
+            Assert.Equal(8, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons.S25E08.Steal this episode.mp4"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason2()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons - 02 - Ep Name.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason3()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/02.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason4()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/02 - Ep Name.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason5()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/02-Ep Name.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason6()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/02.EpName.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason7()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons - 02.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason8()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons - 02 Ep Name.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumberWithoutSeason9()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons 5 - 02 - Ep Name.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumberWithoutSeason10()
+        {
+            Assert.Equal(2, GetEpisodeNumberFromFile(@"The Simpsons/The Simpsons 5 - 02 Ep Name.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumberWithoutSeason11()
+        {
+            Assert.Equal(7, GetEpisodeNumberFromFile(@"Seinfeld/Seinfeld 0807 The Checks.avi"));
+            Assert.Equal(8, GetSeasonNumberFromFile(@"Seinfeld/Seinfeld 0807 The Checks.avi"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason12()
+        {
+            Assert.Equal(7, GetEpisodeNumberFromFile(@"GJ Club (2013)/GJ Club - 07.mkv"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestEpisodeNumberWithoutSeason13()
+        {
+            // This is not supported anymore after removing the episode number 365+ hack from EpisodePathParser
+            Assert.Equal(13, GetEpisodeNumberFromFile(@"Case Closed (1996-2007)/Case Closed - 13.mkv"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason14()
+        {
+            Assert.Equal(3, GetSeasonNumberFromFile(@"Case Closed (1996-2007)/Case Closed - 317.mkv"));
+            Assert.Equal(17, GetEpisodeNumberFromFile(@"Case Closed (1996-2007)/Case Closed - 317.mkv"));
+        }
+
+        [Fact]
+        public void TestEpisodeNumberWithoutSeason15()
+        {
+            Assert.Equal(2017, GetSeasonNumberFromFile(@"Running Man/Running Man S2017E368.mkv"));
+        }
+
+        private int? GetEpisodeNumberFromFile(string path)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodeResolver(options)
+                .Resolve(path, false);
+
+            return result.EpisodeNumber;
+        }
+
+        private int? GetSeasonNumberFromFile(string path)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodeResolver(options)
+                .Resolve(path, false);
+
+            return result.SeasonNumber;
+        }
+
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs b/tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs
new file mode 100644
index 000000000..8e8adb35b
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs
@@ -0,0 +1,55 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class EpisodePathParserTest
+    {
+        [Theory]
+        [InlineData("/media/Foo/Foo-S01E01", "Foo", 1, 1)]
+        [InlineData("/media/Foo - S04E011", "Foo", 4, 11)]
+        [InlineData("/media/Foo/Foo s01x01", "Foo", 1, 1)]
+        [InlineData("/media/Foo (2019)/Season 4/Foo (2019).S04E03", "Foo (2019)", 4, 3)]
+        public void ParseEpisodesCorrectly(string path, string name, int season, int episode)
+        {
+            NamingOptions o = new NamingOptions();
+            EpisodePathParser p = new EpisodePathParser(o);
+            var res = p.Parse(path, false);
+
+            Assert.True(res.Success);
+            Assert.Equal(name, res.SeriesName);
+            Assert.Equal(season, res.SeasonNumber);
+            Assert.Equal(episode, res.EpisodeNumber);
+
+            // testing other paths delimeter
+            var res2 = p.Parse(path.Replace('/', '/'), false);
+            Assert.True(res2.Success);
+            Assert.Equal(name, res2.SeriesName);
+            Assert.Equal(season, res2.SeasonNumber);
+            Assert.Equal(episode, res2.EpisodeNumber);
+        }
+
+        [Theory]
+        [InlineData("/media/Foo/Foo 889", "Foo", 889)]
+        [InlineData("/media/Foo/[Bar] Foo Baz - 11 [1080p]", "Foo Baz", 11)]
+        public void ParseEpisodeWithoutSeason(string path, string name, int episode)
+        {
+            NamingOptions o = new NamingOptions();
+            EpisodePathParser p = new EpisodePathParser(o);
+            var res = p.Parse(path, true, fillExtendedInfo: true);
+
+            Assert.True(res.Success);
+            Assert.Equal(name, res.SeriesName);
+            Assert.Null(res.SeasonNumber);
+            Assert.Equal(episode, res.EpisodeNumber);
+
+            // testing other paths delimeter
+            var res2 = p.Parse(path.Replace('/', '/'), false, fillExtendedInfo: false);
+            Assert.True(res2.Success);
+            Assert.Equal(name, res2.SeriesName);
+            Assert.Null(res2.SeasonNumber);
+            Assert.Equal(episode, res2.EpisodeNumber);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/EpisodeWithoutSeasonTests.cs b/tests/Jellyfin.Naming.Tests/TV/EpisodeWithoutSeasonTests.cs
new file mode 100644
index 000000000..c2851ccdb
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/EpisodeWithoutSeasonTests.cs
@@ -0,0 +1,56 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class EpisodeWithoutSeasonTests
+    {
+        // FIXME
+        // [Fact]
+        public void TestWithoutSeason1()
+        {
+            Test(@"/server/anything_ep02.mp4", "anything", null, 2);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestWithoutSeason2()
+        {
+            Test(@"/server/anything_ep_02.mp4", "anything", null, 2);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestWithoutSeason3()
+        {
+            Test(@"/server/anything_part.II.mp4", "anything", null, null);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestWithoutSeason4()
+        {
+            Test(@"/server/anything_pt.II.mp4", "anything", null, null);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestWithoutSeason5()
+        {
+            Test(@"/server/anything_pt_II.mp4", "anything", null, null);
+        }
+
+        private void Test(string path, string seriesName, int? seasonNumber, int? episodeNumber)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodeResolver(options)
+                .Resolve(path, false);
+
+            Assert.Equal(seasonNumber, result.SeasonNumber);
+            Assert.Equal(episodeNumber, result.EpisodeNumber);
+            Assert.Equal(seriesName, result.SeriesName, true);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs b/tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs
new file mode 100644
index 000000000..b15dd6b74
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs
@@ -0,0 +1,105 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class MultiEpisodeTests
+    {
+        [Fact]
+        public void TestGetEndingEpisodeNumberFromFile()
+        {
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/4x01 – 20 Hours in America (1).mkv"));
+
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/01x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/S01x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/S01E02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/S01xE02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/seriesname 01x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/seriesname S01x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/seriesname S01E02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/seriesname S01xE02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2/02x03 - 04 Ep Name.mp4"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2/My show name 02x03 - 04 Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2/Elementary - 02x03 - 02x04 - 02x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2/02x03 - 02x04 - 02x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2/02x03-04-15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2/Elementary - 02x03-04-15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 02/02x03-E15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 02/Elementary - 02x03-E15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 02/02x03 - x04 - x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 02/Elementary - 02x03 - x04 - x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 02/02x03x04x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 02/Elementary - 02x03x04x15 - Ep Name.mp4"));
+            Assert.Equal(26, GetEndingEpisodeNumberFromFile(@"Season 1/Elementary - S01E23-E24-E26 - The Woman.mp4"));
+            Assert.Equal(26, GetEndingEpisodeNumberFromFile(@"Season 1/S01E23-E24-E26 - The Woman.mp4"));
+
+
+            // Four Digits seasons
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/2009x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/S2009x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/S2009E02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/S2009xE02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/seriesname 2009x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/seriesname S2009x02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/seriesname S2009E02 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2009/seriesname S2009xE02 blah.avi"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03 - 2009x04 - 2009x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/2009x03 - 2009x04 - 2009x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/2009x03-04-15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03-04-15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/2009x03-E15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03-E15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/2009x03 - x04 - x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03 - x04 - x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/2009x03x04x15 - Ep Name.mp4"));
+            Assert.Equal(15, GetEndingEpisodeNumberFromFile(@"Season 2009/Elementary - 2009x03x04x15 - Ep Name.mp4"));
+            Assert.Equal(26, GetEndingEpisodeNumberFromFile(@"Season 2009/Elementary - S2009E23-E24-E26 - The Woman.mp4"));
+            Assert.Equal(26, GetEndingEpisodeNumberFromFile(@"Season 2009/S2009E23-E24-E26 - The Woman.mp4"));
+
+            // Without season number
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/02 - blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2/02 - blah 14 blah.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/02 - blah-02 a.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2/02.avi"));
+
+            Assert.Equal(3, GetEndingEpisodeNumberFromFile(@"Season 1/02-03 - blah.avi"));
+            Assert.Equal(4, GetEndingEpisodeNumberFromFile(@"Season 2/02-04 - blah 14 blah.avi"));
+            Assert.Equal(5, GetEndingEpisodeNumberFromFile(@"Season 1/02-05 - blah-02 a.avi"));
+            Assert.Equal(4, GetEndingEpisodeNumberFromFile(@"Season 2/02-04.avi"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 2/[HorribleSubs] Hunter X Hunter - 136 [720p].mkv"));
+
+            // With format specification that must not be detected as ending episode number
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/series-s09e14-1080p.mkv"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/series-s09e14-720p.mkv"));
+            Assert.Null(GetEndingEpisodeNumberFromFile(@"Season 1/series-s09e14-720i.mkv"));
+            Assert.Equal(4, GetEndingEpisodeNumberFromFile(@"Season 1/MOONLIGHTING_s01e01-e04.mkv"));
+        }
+
+        [Fact]
+        public void TestGetEndingEpisodeNumberFromFolder()
+        {
+            Assert.Equal(4, GetEndingEpisodeNumberFromFolder(@"Season 1/MOONLIGHTING_s01e01-e04"));
+        }
+
+        private int? GetEndingEpisodeNumberFromFolder(string path)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodePathParser(options)
+                .Parse(path, true);
+
+            return result.EndingEpsiodeNumber;
+        }
+
+        private int? GetEndingEpisodeNumberFromFile(string path)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodePathParser(options)
+                .Parse(path, false);
+
+            return result.EndingEpsiodeNumber;
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs b/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
new file mode 100644
index 000000000..ffa8d3483
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
@@ -0,0 +1,112 @@
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class SeasonFolderTests
+    {
+        [Fact]
+        public void TestGetSeasonNumberFromPath1()
+        {
+            Assert.Equal(1, GetSeasonNumberFromPath(@"/Drive/Season 1"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath2()
+        {
+            Assert.Equal(2, GetSeasonNumberFromPath(@"/Drive/Season 2"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath3()
+        {
+            Assert.Equal(2, GetSeasonNumberFromPath(@"/Drive/Season 02"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath4()
+        {
+            Assert.Equal(1, GetSeasonNumberFromPath(@"/Drive/Season 1"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath5()
+        {
+            Assert.Equal(2, GetSeasonNumberFromPath(@"/Drive/Seinfeld/S02"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath6()
+        {
+            Assert.Equal(2, GetSeasonNumberFromPath(@"/Drive/Seinfeld/2"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath7()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromPath(@"/Drive/Season 2009"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath8()
+        {
+            Assert.Equal(1, GetSeasonNumberFromPath(@"/Drive/Season1"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath9()
+        {
+            Assert.Equal(4, GetSeasonNumberFromPath(@"The Wonder Years/The.Wonder.Years.S04.PDTV.x264-JCH"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath10()
+        {
+            Assert.Equal(7, GetSeasonNumberFromPath(@"/Drive/Season 7 (2016)"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath11()
+        {
+            Assert.Equal(7, GetSeasonNumberFromPath(@"/Drive/Staffel 7 (2016)"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath12()
+        {
+            Assert.Equal(7, GetSeasonNumberFromPath(@"/Drive/Stagione 7 (2016)"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath14()
+        {
+            Assert.Null(GetSeasonNumberFromPath(@"/Drive/Season (8)"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath13()
+        {
+            Assert.Equal(3, GetSeasonNumberFromPath(@"/Drive/3.Staffel"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath15()
+        {
+            Assert.Null(GetSeasonNumberFromPath(@"/Drive/s06e05"));
+        }
+
+        [Fact]
+        public void TestGetSeasonNumberFromPath16()
+        {
+            Assert.Null(GetSeasonNumberFromPath(@"/Drive/The.Legend.of.Condor.Heroes.2017.V2.web-dl.1080p.h264.aac-hdctv"));
+        }
+
+        private int? GetSeasonNumberFromPath(string path)
+        {
+            var result = new SeasonPathParser()
+                .Parse(path, true, true);
+
+            return result.SeasonNumber;
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs b/tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs
new file mode 100644
index 000000000..ba3c5ecac
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs
@@ -0,0 +1,305 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class SeasonNumberTests
+    {
+        private int? GetSeasonNumberFromEpisodeFile(string path)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodeResolver(options)
+                .Resolve(path, false);
+
+            return result.SeasonNumber;
+        }
+
+        [Fact]
+        public void TestSeasonNumber1()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"/Show/Season 02/S02E03 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber2()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/seriesname S01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber3()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/S01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber4()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/seriesname S01xE02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber5()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber6()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/S01E02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber7()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/S01xE02 blah.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestSeasonNumber8()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/seriesname 01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber9()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/seriesname S01x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber10()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/seriesname S01E02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber11()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 2/Elementary - 02x03 - 02x04 - 02x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber12()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 2/02x03 - 02x04 - 02x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber13()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 2/02x03-04-15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber14()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 2/Elementary - 02x03-04-15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber15()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 02/02x03-E15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber16()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 02/Elementary - 02x03-E15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber17()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 02/02x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber18()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 02/Elementary - 02x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber19()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 02/02x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber20()
+        {
+            Assert.Equal(2, GetSeasonNumberFromEpisodeFile(@"Season 02/Elementary - 02x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber21()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/Elementary - S01E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber22()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Season 1/S01E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber23()
+        {
+            Assert.Equal(25, GetSeasonNumberFromEpisodeFile(@"Season 25/The Simpsons.S25E09.Steal this episode.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber24()
+        {
+            Assert.Equal(25, GetSeasonNumberFromEpisodeFile(@"The Simpsons/The Simpsons.S25E09.Steal this episode.mp4"));
+        }
+
+        [Fact]
+        public void TestSeasonNumber25()
+        {
+            Assert.Equal(2016, GetSeasonNumberFromEpisodeFile(@"2016/Season s2016e1.mp4"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestSeasonNumber26()
+        {
+            // This convention is not currently supported, just adding in case we want to look at it in the future
+            Assert.Equal(2016, GetSeasonNumberFromEpisodeFile(@"2016/Season 2016x1.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber1()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber2()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/S2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber3()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/S2009E02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber4()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/S2009xE02 blah.avi"));
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestFourDigitSeasonNumber5()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/seriesname 2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber6()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/seriesname S2009x02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber7()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/seriesname S2009E02 blah.avi"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber8()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/Elementary - 2009x03 - 2009x04 - 2009x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber9()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/2009x03 - 2009x04 - 2009x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber10()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/2009x03-04-15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber11()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/Elementary - 2009x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber12()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/2009x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber13()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/Elementary - 2009x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber14()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/Elementary - S2009E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber15()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/S2009E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber16()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/Elementary - 2009x03 - x04 - x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber17()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/2009x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber18()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/Elementary - 2009x03x04x15 - Ep Name.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber19()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/Elementary - S2009E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestFourDigitSeasonNumber20()
+        {
+            Assert.Equal(2009, GetSeasonNumberFromEpisodeFile(@"Season 2009/S2009E23-E24-E26 - The Woman.mp4"));
+        }
+
+        [Fact]
+        public void TestNoSeriesFolder()
+        {
+            Assert.Equal(1, GetSeasonNumberFromEpisodeFile(@"Series/1-12 - The Woman.mp4"));
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs b/tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs
new file mode 100644
index 000000000..c9323c218
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs
@@ -0,0 +1,95 @@
+using Emby.Naming.Common;
+using Emby.Naming.TV;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.TV
+{
+    public class SimpleEpisodeTests
+    {
+        [Fact]
+        public void TestSimpleEpisodePath1()
+        {
+            Test(@"/server/anything_s01e02.mp4", "anything", 1, 2);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath2()
+        {
+            Test(@"/server/anything_s1e2.mp4", "anything", 1, 2);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath3()
+        {
+            Test(@"/server/anything_s01.e02.mp4", "anything", 1, 2);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath4()
+        {
+            Test(@"/server/anything_s01_e02.mp4", "anything", 1, 2);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath5()
+        {
+            Test(@"/server/anything_102.mp4", "anything", 1, 2);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath6()
+        {
+            Test(@"/server/anything_1x02.mp4", "anything", 1, 2);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestSimpleEpisodePath7()
+        {
+            Test(@"/server/The Walking Dead 4x01.mp4", "The Walking Dead", 4, 1);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath8()
+        {
+            Test(@"/server/the_simpsons-s02e01_18536.mp4", "the_simpsons", 2, 1);
+        }
+
+
+        [Fact]
+        public void TestSimpleEpisodePath9()
+        {
+            Test(@"/server/Temp/S01E02 foo.mp4", string.Empty, 1, 2);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath10()
+        {
+            Test(@"Series/4-12 - The Woman.mp4", string.Empty, 4, 12);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath11()
+        {
+            Test(@"Series/4x12 - The Woman.mp4", string.Empty, 4, 12);
+        }
+
+        [Fact]
+        public void TestSimpleEpisodePath12()
+        {
+            Test(@"Series/LA X, Pt. 1_s06e32.mp4", "LA X, Pt. 1", 6, 32);
+        }
+
+        private void Test(string path, string seriesName, int? seasonNumber, int? episodeNumber)
+        {
+            var options = new NamingOptions();
+
+            var result = new EpisodeResolver(options)
+                .Resolve(path, false);
+
+            Assert.Equal(seasonNumber, result.SeasonNumber);
+            Assert.Equal(episodeNumber, result.EpisodeNumber);
+            Assert.Equal(seriesName, result.SeriesName, true);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/BaseVideoTest.cs b/tests/Jellyfin.Naming.Tests/Video/BaseVideoTest.cs
new file mode 100644
index 000000000..b993e241c
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/BaseVideoTest.cs
@@ -0,0 +1,15 @@
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public abstract class BaseVideoTest
+    {
+        protected VideoResolver GetParser()
+        {
+            var options = new NamingOptions();
+
+            return new VideoResolver(options);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs b/tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs
new file mode 100644
index 000000000..bba73ad91
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs
@@ -0,0 +1,143 @@
+using System.IO;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class CleanDateTimeTests : BaseVideoTest
+    {
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTime()
+        {
+            Test(@"The Wolf of Wall Street (2013).mkv", "The Wolf of Wall Street", 2013);
+            Test(@"The Wolf of Wall Street 2 (2013).mkv", "The Wolf of Wall Street 2", 2013);
+            Test(@"The Wolf of Wall Street - 2 (2013).mkv", "The Wolf of Wall Street - 2", 2013);
+            Test(@"The Wolf of Wall Street 2001 (2013).mkv", "The Wolf of Wall Street 2001", 2013);
+
+            Test(@"300 (2006).mkv", "300", 2006);
+            Test(@"d:/movies/300 (2006).mkv", "300", 2006);
+            Test(@"300 2 (2006).mkv", "300 2", 2006);
+            Test(@"300 - 2 (2006).mkv", "300 - 2", 2006);
+            Test(@"300 2001 (2006).mkv", "300 2001", 2006);
+
+            Test(@"curse.of.chucky.2013.stv.unrated.multi.1080p.bluray.x264-rough", "curse.of.chucky", 2013);
+            Test(@"curse.of.chucky.2013.stv.unrated.multi.2160p.bluray.x264-rough", "curse.of.chucky", 2013);
+
+            Test(@"/server/Movies/300 (2007)/300 (2006).bluray.disc", "300", 2006);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTime1()
+        {
+            Test(@"Arrival.2016.2160p.Blu-Ray.HEVC.mkv", "Arrival", 2016);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithoutFileExtension()
+        {
+            Test(@"The Wolf of Wall Street (2013)", "The Wolf of Wall Street", 2013);
+            Test(@"The Wolf of Wall Street 2 (2013)", "The Wolf of Wall Street 2", 2013);
+            Test(@"The Wolf of Wall Street - 2 (2013)", "The Wolf of Wall Street - 2", 2013);
+            Test(@"The Wolf of Wall Street 2001 (2013)", "The Wolf of Wall Street 2001", 2013);
+
+            Test(@"300 (2006)", "300", 2006);
+            Test(@"d:/movies/300 (2006)", "300", 2006);
+            Test(@"300 2 (2006)", "300 2", 2006);
+            Test(@"300 - 2 (2006)", "300 - 2", 2006);
+            Test(@"300 2001 (2006)", "300 2001", 2006);
+
+            Test(@"/server/Movies/300 (2007)/300 (2006)", "300", 2006);
+            Test(@"/server/Movies/300 (2007)/300 (2006).mkv", "300", 2006);
+        }
+
+        [Fact]
+        public void TestCleanDateTimeWithoutDate()
+        {
+            Test(@"American.Psycho.mkv", "American.Psycho.mkv", null);
+            Test(@"American Psycho.mkv", "American Psycho.mkv", null);
+        }
+
+        [Fact]
+        public void TestCleanDateTimeWithBracketedName()
+        {
+            Test(@"[rec].mkv", "[rec].mkv", null);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithoutExtension()
+        {
+            Test(@"St. Vincent (2014)", "St. Vincent", 2014);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithoutDate1()
+        {
+            Test("Super movie(2009).mp4", "Super movie", 2009);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithoutParenthesis()
+        {
+            Test("Drug War 2013.mp4", "Drug War", 2013);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithMultipleYears()
+        {
+            Test("My Movie (1997) - GreatestReleaseGroup 2019.mp4", "My Movie", 1997);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithYearAndResolution()
+        {
+            Test("First Man 2018 1080p.mkv", "First Man", 2018);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithYearAndResolution1()
+        {
+            Test("First Man (2018) 1080p.mkv", "First Man", 2018);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateTimeWithSceneRelease()
+        {
+            Test("Maximum Ride - 2016 - WEBDL-1080p - x264 AC3.mkv", "Maximum Ride", 2016);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestYearInBrackets()
+        {
+            Test("Robin Hood [Multi-Subs] [2018].mkv", "Robin Hood", 2018);
+        }
+
+        private void Test(string input, string expectedName, int? expectedYear)
+        {
+            input = Path.GetFileName(input);
+
+            var result = GetParser().CleanDateTime(input);
+
+            Assert.Equal(expectedName, result.Name, true);
+            Assert.Equal(expectedYear, result.Year);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateAndStringsSequence()
+        {
+            // In this test case, running CleanDateTime first produces no date, so it will attempt to run CleanString first and then CleanDateTime again
+
+            Test(@"3.Days.to.Kill.2014.720p.BluRay.x264.YIFY.mkv", "3.Days.to.Kill", 2014);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
new file mode 100644
index 000000000..cd90ac236
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Globalization;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class CleanStringTests : BaseVideoTest
+    {
+        // FIXME
+        // [Fact]
+        public void TestCleanString()
+        {
+            Test("Super movie 480p.mp4", "Super movie");
+            Test("Super movie 480p 2001.mp4", "Super movie");
+            Test("Super movie [480p].mp4", "Super movie");
+            Test("480 Super movie [tmdbid=12345].mp4", "480 Super movie");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanString1()
+        {
+            Test("Super movie(2009).mp4", "Super movie(2009).mp4");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanString2()
+        {
+            Test("Run lola run (lola rennt) (2009).mp4", "Run lola run (lola rennt) (2009).mp4");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestStringWithoutDate()
+        {
+            Test(@"American.Psycho.mkv", "American.Psycho.mkv");
+            Test(@"American Psycho.mkv", "American Psycho.mkv");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestNameWithBrackets()
+        {
+            Test(@"[rec].mkv", "[rec].mkv");
+        }
+
+        // FIXME
+        // [Fact]
+        public void Test4k()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.4k.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestUltraHd()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.UltraHD.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestUHd()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.UHD.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestHDR()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.HDR.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestHDC()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestHDC1()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon-HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestBDrip()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.BDrip.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestBDripHDC()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.BDrip-HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMulti()
+        {
+            Test("Crouching.Tiger.Hidden.Dragon.4K.UltraHD.HDR.BDrip-HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestLeadingBraces()
+        {
+            // Not actually supported, just reported by a user
+            Test("[0004] - After The Sunset.el.mkv", "After The Sunset");
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestTrailingBraces()
+        {
+            Test("After The Sunset - [0004].mkv", "After The Sunset");
+        }
+
+        private void Test(string input, string expectedName)
+        {
+            var result = GetParser().CleanString(input).ToString();
+
+            Assert.Equal(expectedName, result, true);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
new file mode 100644
index 000000000..1646237a0
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
@@ -0,0 +1,77 @@
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+using MediaBrowser.Model.Entities;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class ExtraTests : BaseVideoTest
+    {
+        // Requirements
+        // movie-deleted = ExtraType deletedscene
+
+        // All of the above rules should be configurable through the options objects (ideally, even the ExtraTypes)
+
+        [Fact]
+        public void TestKodiExtras()
+        {
+            var videoOptions = new NamingOptions();
+
+            Test("trailer.mp4", ExtraType.Trailer, videoOptions);
+            Test("300-trailer.mp4", ExtraType.Trailer, videoOptions);
+
+            Test("theme.mp3", ExtraType.ThemeSong, videoOptions);
+        }
+
+        [Fact]
+        public void TestExpandedExtras()
+        {
+            var videoOptions = new NamingOptions();
+
+            Test("trailer.mp4", ExtraType.Trailer, videoOptions);
+            Test("trailer.mp3", null, videoOptions);
+            Test("300-trailer.mp4", ExtraType.Trailer, videoOptions);
+
+            Test("theme.mp3", ExtraType.ThemeSong, videoOptions);
+            Test("theme.mkv", null, videoOptions);
+
+            Test("300-scene.mp4", ExtraType.Scene, videoOptions);
+            Test("300-scene2.mp4", ExtraType.Scene, videoOptions);
+            Test("300-clip.mp4", ExtraType.Clip, videoOptions);
+
+            Test("300-deleted.mp4", ExtraType.DeletedScene, videoOptions);
+            Test("300-deletedscene.mp4", ExtraType.DeletedScene, videoOptions);
+            Test("300-interview.mp4", ExtraType.Interview, videoOptions);
+            Test("300-behindthescenes.mp4", ExtraType.BehindTheScenes, videoOptions);
+        }
+
+        [Fact]
+        public void TestSample()
+        {
+            var videoOptions = new NamingOptions();
+
+            Test("300-sample.mp4", ExtraType.Sample, videoOptions);
+        }
+
+        private void Test(string input, ExtraType? expectedType, NamingOptions videoOptions)
+        {
+            var parser = GetExtraTypeParser(videoOptions);
+
+            var extraType = parser.GetExtraInfo(input).ExtraType;
+
+            if (expectedType == null)
+            {
+                Assert.Null(extraType);
+            }
+            else
+            {
+                Assert.Equal(expectedType, extraType);
+            }
+        }
+
+        private ExtraResolver GetExtraTypeParser(NamingOptions videoOptions)
+        {
+            return new ExtraResolver(videoOptions);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs b/tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs
new file mode 100644
index 000000000..ed3112936
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs
@@ -0,0 +1,78 @@
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class Format3DTests : BaseVideoTest
+    {
+        [Fact]
+        public void TestKodiFormat3D()
+        {
+            var options = new NamingOptions();
+
+            Test("Super movie.3d.mp4", false, null, options);
+            Test("Super movie.3d.hsbs.mp4", true, "hsbs", options);
+            Test("Super movie.3d.sbs.mp4", true, "sbs", options);
+            Test("Super movie.3d.htab.mp4", true, "htab", options);
+            Test("Super movie.3d.tab.mp4", true, "tab", options);
+            Test("Super movie 3d hsbs.mp4", true, "hsbs", options);
+        }
+
+        [Fact]
+        public void Test3DName()
+        {
+            var result =
+                GetParser().ResolveFile(@"C:/Users/media/Desktop/Video Test/Movies/Oblivion/Oblivion.3d.hsbs.mkv");
+
+            Assert.Equal("hsbs", result.Format3D);
+            Assert.Equal("Oblivion", result.Name);
+        }
+
+        [Fact]
+        public void TestExpandedFormat3D()
+        {
+            // These were introduced for Media Browser 3
+            // Kodi conventions are preferred but these still need to be supported
+            var options = new NamingOptions();
+
+            Test("Super movie.3d.mp4", false, null, options);
+            Test("Super movie.3d.hsbs.mp4", true, "hsbs", options);
+            Test("Super movie.3d.sbs.mp4", true, "sbs", options);
+            Test("Super movie.3d.htab.mp4", true, "htab", options);
+            Test("Super movie.3d.tab.mp4", true, "tab", options);
+
+            Test("Super movie.hsbs.mp4", true, "hsbs", options);
+            Test("Super movie.sbs.mp4", true, "sbs", options);
+            Test("Super movie.htab.mp4", true, "htab", options);
+            Test("Super movie.tab.mp4", true, "tab", options);
+            Test("Super movie.sbs3d.mp4", true, "sbs3d", options);
+            Test("Super movie.3d.mvc.mp4", true, "mvc", options);
+
+            Test("Super movie [3d].mp4", false, null, options);
+            Test("Super movie [hsbs].mp4", true, "hsbs", options);
+            Test("Super movie [fsbs].mp4", true, "fsbs", options);
+            Test("Super movie [ftab].mp4", true, "ftab", options);
+            Test("Super movie [htab].mp4", true, "htab", options);
+            Test("Super movie [sbs3d].mp4", true, "sbs3d", options);
+        }
+
+        private void Test(string input, bool is3D, string format3D, NamingOptions options)
+        {
+            var parser = new Format3DParser(options);
+
+            var result = parser.Parse(input);
+
+            Assert.Equal(is3D, result.Is3D);
+
+            if (format3D == null)
+            {
+                Assert.Null(result.Format3D);
+            }
+            else
+            {
+                Assert.Equal(format3D, result.Format3D, true);
+            }
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
new file mode 100644
index 000000000..b8674ec49
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
@@ -0,0 +1,438 @@
+using System.Linq;
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+using MediaBrowser.Model.IO;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class MultiVersionTests
+    {
+        // FIXME
+        // [Fact]
+        public void TestMultiEdition1()
+        {
+            var files = new[]
+            {
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - 1080p.mkv",
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past-trailer.mp4",
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - [hsbs].mkv",
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past [hsbs].mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Single(result[0].Extras);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiEdition2()
+        {
+            var files = new[]
+            {
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - apple.mkv",
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past-trailer.mp4",
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - banana.mkv",
+                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past [banana].mp4"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Single(result[0].Extras);
+            Assert.Equal(2, result[0].AlternateVersions.Count);
+        }
+
+        [Fact]
+        public void TestMultiEdition3()
+        {
+            // This is currently not supported and will fail, but we should try to figure it out
+            var files = new[]
+            {
+                @"/movies/The Phantom of the Opera (1925)/The Phantom of the Opera (1925) - 1925 version.mkv",
+                @"/movies/The Phantom of the Opera (1925)/The Phantom of the Opera (1925) - 1929 version.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Single(result[0].AlternateVersions);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestLetterFolders()
+        {
+            var files = new[]
+            {
+                @"/movies/M/Movie 1.mkv",
+                @"/movies/M/Movie 2.mkv",
+                @"/movies/M/Movie 3.mkv",
+                @"/movies/M/Movie 4.mkv",
+                @"/movies/M/Movie 5.mkv",
+                @"/movies/M/Movie 6.mkv",
+                @"/movies/M/Movie 7.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(7, result.Count);
+            Assert.Empty(result[0].Extras);
+            Assert.Empty(result[0].AlternateVersions);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersionLimit()
+        {
+            var files = new[]
+            {
+                @"/movies/Movie/Movie.mkv",
+                @"/movies/Movie/Movie-2.mkv",
+                @"/movies/Movie/Movie-3.mkv",
+                @"/movies/Movie/Movie-4.mkv",
+                @"/movies/Movie/Movie-5.mkv",
+                @"/movies/Movie/Movie-6.mkv",
+                @"/movies/Movie/Movie-7.mkv",
+                @"/movies/Movie/Movie-8.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Empty(result[0].Extras);
+            Assert.Equal(7, result[0].AlternateVersions.Count);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersionLimit2()
+        {
+            var files = new[]
+            {
+                @"/movies/Mo/Movie 1.mkv",
+                @"/movies/Mo/Movie 2.mkv",
+                @"/movies/Mo/Movie 3.mkv",
+                @"/movies/Mo/Movie 4.mkv",
+                @"/movies/Mo/Movie 5.mkv",
+                @"/movies/Mo/Movie 6.mkv",
+                @"/movies/Mo/Movie 7.mkv",
+                @"/movies/Mo/Movie 8.mkv",
+                @"/movies/Mo/Movie 9.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(9, result.Count);
+            Assert.Empty(result[0].Extras);
+            Assert.Empty(result[0].AlternateVersions);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion3()
+        {
+            var files = new[]
+            {
+                @"/movies/Movie/Movie 1.mkv",
+                @"/movies/Movie/Movie 2.mkv",
+                @"/movies/Movie/Movie 3.mkv",
+                @"/movies/Movie/Movie 4.mkv",
+                @"/movies/Movie/Movie 5.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(5, result.Count);
+            Assert.Empty(result[0].Extras);
+            Assert.Empty(result[0].AlternateVersions);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion4()
+        {
+            // Test for false positive
+
+            var files = new[]
+            {
+                @"/movies/Iron Man/Iron Man.mkv",
+                @"/movies/Iron Man/Iron Man (2008).mkv",
+                @"/movies/Iron Man/Iron Man (2009).mkv",
+                @"/movies/Iron Man/Iron Man (2010).mkv",
+                @"/movies/Iron Man/Iron Man (2011).mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(5, result.Count);
+            Assert.Empty(result[0].Extras);
+            Assert.Empty(result[0].AlternateVersions);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion5()
+        {
+            var files = new[]
+            {
+                @"/movies/Iron Man/Iron Man.mkv",
+                @"/movies/Iron Man/Iron Man-720p.mkv",
+                @"/movies/Iron Man/Iron Man-test.mkv",
+                @"/movies/Iron Man/Iron Man-bluray.mkv",
+                @"/movies/Iron Man/Iron Man-3d.mkv",
+                @"/movies/Iron Man/Iron Man-3d-hsbs.mkv",
+                @"/movies/Iron Man/Iron Man-3d.hsbs.mkv",
+                @"/movies/Iron Man/Iron Man[test].mkv",
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Empty(result[0].Extras);
+            Assert.Equal(7, result[0].AlternateVersions.Count);
+            Assert.False(result[0].AlternateVersions[2].Is3D);
+            Assert.True(result[0].AlternateVersions[3].Is3D);
+            Assert.True(result[0].AlternateVersions[4].Is3D);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion6()
+        {
+            var files = new[]
+            {
+                @"/movies/Iron Man/Iron Man.mkv",
+                @"/movies/Iron Man/Iron Man - 720p.mkv",
+                @"/movies/Iron Man/Iron Man - test.mkv",
+                @"/movies/Iron Man/Iron Man - bluray.mkv",
+                @"/movies/Iron Man/Iron Man - 3d.mkv",
+                @"/movies/Iron Man/Iron Man - 3d-hsbs.mkv",
+                @"/movies/Iron Man/Iron Man - 3d.hsbs.mkv",
+                @"/movies/Iron Man/Iron Man [test].mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Empty(result[0].Extras);
+            Assert.Equal(7, result[0].AlternateVersions.Count);
+            Assert.False(result[0].AlternateVersions[3].Is3D);
+            Assert.True(result[0].AlternateVersions[4].Is3D);
+            Assert.True(result[0].AlternateVersions[5].Is3D);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion7()
+        {
+            var files = new[]
+            {
+                @"/movies/Iron Man/Iron Man - B (2006).mkv",
+                @"/movies/Iron Man/Iron Man - C (2007).mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(2, result.Count);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion8()
+        {
+            // This is not actually supported yet
+
+            var files = new[]
+            {
+                @"/movies/Iron Man/Iron Man.mkv",
+                @"/movies/Iron Man/Iron Man_720p.mkv",
+                @"/movies/Iron Man/Iron Man_test.mkv",
+                @"/movies/Iron Man/Iron Man_bluray.mkv",
+                @"/movies/Iron Man/Iron Man_3d.mkv",
+                @"/movies/Iron Man/Iron Man_3d-hsbs.mkv",
+                @"/movies/Iron Man/Iron Man_3d.hsbs.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Empty(result[0].Extras);
+            Assert.Equal(6, result[0].AlternateVersions.Count);
+            Assert.False(result[0].AlternateVersions[2].Is3D);
+            Assert.True(result[0].AlternateVersions[3].Is3D);
+            Assert.True(result[0].AlternateVersions[4].Is3D);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion9()
+        {
+            // Test for false positive
+
+            var files = new[]
+            {
+                @"/movies/Iron Man/Iron Man (2007).mkv",
+                @"/movies/Iron Man/Iron Man (2008).mkv",
+                @"/movies/Iron Man/Iron Man (2009).mkv",
+                @"/movies/Iron Man/Iron Man (2010).mkv",
+                @"/movies/Iron Man/Iron Man (2011).mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(5, result.Count);
+            Assert.Empty(result[0].Extras);
+            Assert.Empty(result[0].AlternateVersions);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion10()
+        {
+            var files = new[]
+            {
+                @"/movies/Blade Runner (1982)/Blade Runner (1982) [Final Cut] [1080p HEVC AAC].mkv",
+                @"/movies/Blade Runner (1982)/Blade Runner (1982) [EE by ADM] [480p HEVC AAC,AAC,AAC].mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Empty(result[0].Extras);
+            Assert.Single(result[0].AlternateVersions);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestMultiVersion11()
+        {
+            // Currently not supported but we should probably handle this.
+
+            var files = new[]
+            {
+                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) [1080p] Blu-ray.x264.DTS.mkv",
+                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) [2160p] Blu-ray.x265.AAC.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+            Assert.Empty(result[0].Extras);
+            Assert.Single(result[0].AlternateVersions);
+        }
+
+        private VideoListResolver GetResolver()
+        {
+            var options = new NamingOptions();
+            return new VideoListResolver(options);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/StackTests.cs b/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
new file mode 100644
index 000000000..5faef0e3d
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
@@ -0,0 +1,478 @@
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+using MediaBrowser.Model.IO;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class StackTests : BaseVideoTest
+    {
+        [Fact]
+        public void TestSimpleStack()
+        {
+            var files = new[]
+            {
+                "Bad Boys (2006) part1.mkv",
+                "Bad Boys (2006) part2.mkv",
+                "Bad Boys (2006) part3.mkv",
+                "Bad Boys (2006) part4.mkv",
+                "Bad Boys (2006)-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+            TestStackInfo(result.Stacks[0], "Bad Boys (2006)", 4);
+        }
+
+        [Fact]
+        public void TestFalsePositives()
+        {
+            var files = new[]
+            {
+                "Bad Boys (2006).mkv",
+                "Bad Boys (2007).mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestFalsePositives2()
+        {
+            var files = new[]
+            {
+                "Bad Boys 2006.mkv",
+                "Bad Boys 2007.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestFalsePositives3()
+        {
+            var files = new[]
+            {
+                "300 (2006).mkv",
+                "300 (2007).mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestFalsePositives4()
+        {
+            var files = new[]
+            {
+                "300 2006.mkv",
+                "300 2007.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestFalsePositives5()
+        {
+            var files = new[]
+            {
+                "Star Trek 1 - The motion picture.mkv",
+                "Star Trek 2- The wrath of khan.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestFalsePositives6()
+        {
+            var files = new[]
+            {
+                "Red Riding in the Year of Our Lord 1983 (2009).mkv",
+                "Red Riding in the Year of Our Lord 1980 (2009).mkv",
+                "Red Riding in the Year of Our Lord 1974 (2009).mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestStackName()
+        {
+            var files = new[]
+            {
+                "d:/movies/300 2006 part1.mkv",
+                "d:/movies/300 2006 part2.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+            TestStackInfo(result.Stacks[0], "300 2006", 2);
+        }
+
+        [Fact]
+        public void TestDirtyNames()
+        {
+            var files = new[]
+            {
+                "Bad Boys (2006).part1.stv.unrated.multi.1080p.bluray.x264-rough.mkv",
+                "Bad Boys (2006).part2.stv.unrated.multi.1080p.bluray.x264-rough.mkv",
+                "Bad Boys (2006).part3.stv.unrated.multi.1080p.bluray.x264-rough.mkv",
+                "Bad Boys (2006).part4.stv.unrated.multi.1080p.bluray.x264-rough.mkv",
+                "Bad Boys (2006)-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+            TestStackInfo(result.Stacks[0], "Bad Boys (2006).stv.unrated.multi.1080p.bluray.x264-rough", 4);
+        }
+
+        [Fact]
+        public void TestNumberedFiles()
+        {
+            var files = new[]
+            {
+                "Bad Boys (2006).mkv",
+                "Bad Boys (2006) 1.mkv",
+                "Bad Boys (2006) 2.mkv",
+                "Bad Boys (2006) 3.mkv",
+                "Bad Boys (2006)-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestSimpleStackWithNumericName()
+        {
+            var files = new[]
+            {
+                "300 (2006) part1.mkv",
+                "300 (2006) part2.mkv",
+                "300 (2006) part3.mkv",
+                "300 (2006) part4.mkv",
+                "300 (2006)-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+            TestStackInfo(result.Stacks[0], "300 (2006)", 4);
+        }
+
+        [Fact]
+        public void TestMixedExpressionsNotAllowed()
+        {
+            var files = new[]
+            {
+                "Bad Boys (2006) part1.mkv",
+                "Bad Boys (2006) part2.mkv",
+                "Bad Boys (2006) part3.mkv",
+                "Bad Boys (2006) parta.mkv",
+                "Bad Boys (2006)-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+            TestStackInfo(result.Stacks[0], "Bad Boys (2006)", 3);
+        }
+
+        [Fact]
+        public void TestDualStacks()
+        {
+            var files = new[]
+            {
+                "Bad Boys (2006) part1.mkv",
+                "Bad Boys (2006) part2.mkv",
+                "Bad Boys (2006) part3.mkv",
+                "Bad Boys (2006) part4.mkv",
+                "Bad Boys (2006)-trailer.mkv",
+                "300 (2006) part1.mkv",
+                "300 (2006) part2.mkv",
+                "300 (2006) part3.mkv",
+                "300 (2006)-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Equal(2, result.Stacks.Count);
+            TestStackInfo(result.Stacks[1], "Bad Boys (2006)", 4);
+            TestStackInfo(result.Stacks[0], "300 (2006)", 3);
+        }
+
+        [Fact]
+        public void TestDirectories()
+        {
+            var files = new[]
+            {
+                "blah blah - cd 1",
+                "blah blah - cd 2"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveDirectories(files);
+
+            Assert.Single(result.Stacks);
+            TestStackInfo(result.Stacks[0], "blah blah", 2);
+        }
+
+        [Fact]
+        public void TestFalsePositive()
+        {
+            var files = new[]
+            {
+                "300a.mkv",
+                "300b.mkv",
+                "300c.mkv",
+                "300-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+
+            TestStackInfo(result.Stacks[0], "300", 3);
+        }
+
+        [Fact]
+        public void TestFailSequence()
+        {
+            var files = new[]
+            {
+                "300 part1.mkv",
+                "300 part2.mkv",
+                "Avatar",
+                "Avengers part1.mkv",
+                "Avengers part2.mkv",
+                "Avengers part3.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Equal(2, result.Stacks.Count);
+
+            TestStackInfo(result.Stacks[0], "300", 2);
+            TestStackInfo(result.Stacks[1], "Avengers", 3);
+        }
+
+        [Fact]
+        public void TestMixedExpressions()
+        {
+            var files = new[]
+            {
+                "Bad Boys (2006) part1.mkv",
+                "Bad Boys (2006) part2.mkv",
+                "Bad Boys (2006) part3.mkv",
+                "Bad Boys (2006) part4.mkv",
+                "Bad Boys (2006)-trailer.mkv",
+                "300 (2006) parta.mkv",
+                "300 (2006) partb.mkv",
+                "300 (2006) partc.mkv",
+                "300 (2006) partd.mkv",
+                "300 (2006)-trailer.mkv",
+                "300a.mkv",
+                "300b.mkv",
+                "300c.mkv",
+                "300-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Equal(3, result.Stacks.Count);
+
+            TestStackInfo(result.Stacks[0], "300 (2006)", 4);
+            TestStackInfo(result.Stacks[1], "300", 3);
+            TestStackInfo(result.Stacks[2], "Bad Boys (2006)", 4);
+        }
+
+        [Fact]
+        public void TestAlphaLimitOfFour()
+        {
+            var files = new[]
+            {
+                "300 (2006) parta.mkv",
+                "300 (2006) partb.mkv",
+                "300 (2006) partc.mkv",
+                "300 (2006) partd.mkv",
+                "300 (2006) parte.mkv",
+                "300 (2006) partf.mkv",
+                "300 (2006) partg.mkv",
+                "300 (2006)-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+
+            TestStackInfo(result.Stacks[0], "300 (2006)", 4);
+        }
+
+        [Fact]
+        public void TestMixed()
+        {
+            var files = new[]
+            {
+                new FileSystemMetadata{FullName = "Bad Boys (2006) part1.mkv", IsDirectory = false},
+                new FileSystemMetadata{FullName = "Bad Boys (2006) part2.mkv", IsDirectory = false},
+                new FileSystemMetadata{FullName = "300 (2006) part2", IsDirectory = true},
+                new FileSystemMetadata{FullName = "300 (2006) part3", IsDirectory = true},
+                new FileSystemMetadata{FullName = "300 (2006) part1", IsDirectory = true}
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files);
+
+            Assert.Equal(2, result.Stacks.Count);
+            TestStackInfo(result.Stacks[0], "300 (2006)", 3);
+            TestStackInfo(result.Stacks[1], "Bad Boys (2006)", 2);
+        }
+
+        [Fact]
+        public void TestDirectories2()
+        {
+            //TestDirectory(@"blah blah", false, @"blah blah");
+            //TestDirectory(@"d:/music/weezer/03 Pinkerton", false, "03 Pinkerton");
+            //TestDirectory(@"d:/music/michael jackson/Bad (2012 Remaster)", false, "Bad (2012 Remaster)");
+
+            //TestDirectory(@"blah blah - cd1", true, "blah blah");
+            //TestDirectory(@"blah blah - disc1", true, "blah blah");
+            //TestDirectory(@"blah blah - disk1", true, "blah blah");
+            //TestDirectory(@"blah blah - pt1", true, "blah blah");
+            //TestDirectory(@"blah blah - part1", true, "blah blah");
+            //TestDirectory(@"blah blah - dvd1", true, "blah blah");
+
+            //// Add a space
+            //TestDirectory(@"blah blah - cd 1", true, "blah blah");
+            //TestDirectory(@"blah blah - disc 1", true, "blah blah");
+            //TestDirectory(@"blah blah - disk 1", true, "blah blah");
+            //TestDirectory(@"blah blah - pt 1", true, "blah blah");
+            //TestDirectory(@"blah blah - part 1", true, "blah blah");
+            //TestDirectory(@"blah blah - dvd 1", true, "blah blah");
+
+            //// Not case sensitive
+            //TestDirectory(@"blah blah - Disc1", true, "blah blah");
+        }
+
+        [Fact]
+        public void TestNamesWithoutParts()
+        {
+            // No stacking here because there is no part/disc/etc
+            var files = new[]
+            {
+                "Harry Potter and the Deathly Hallows.mkv",
+                "Harry Potter and the Deathly Hallows 1.mkv",
+                "Harry Potter and the Deathly Hallows 2.mkv",
+                "Harry Potter and the Deathly Hallows 3.mkv",
+                "Harry Potter and the Deathly Hallows 4.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Empty(result.Stacks);
+        }
+
+        [Fact]
+        public void TestNumbersAppearingBeforePartNumber()
+        {
+            // No stacking here because there is no part/disc/etc
+            var files = new[]
+            {
+                "Neverland (2011)[720p][PG][Voted 6.5][Family-Fantasy]part1.mkv",
+                "Neverland (2011)[720p][PG][Voted 6.5][Family-Fantasy]part2.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveFiles(files);
+
+            Assert.Single(result.Stacks);
+            Assert.Equal(2, result.Stacks[0].Files.Count);
+        }
+
+        [Fact]
+        public void TestMultiDiscs()
+        {
+            // No stacking here because there is no part/disc/etc
+            var files = new[]
+            {
+                @"M:/Movies (DVD)/Movies (Musical)/The Sound of Music/The Sound of Music (1965) (Disc 01)",
+                @"M:/Movies (DVD)/Movies (Musical)/The Sound of Music/The Sound of Music (1965) (Disc 02)"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.ResolveDirectories(files);
+
+            Assert.Single(result.Stacks);
+            Assert.Equal(2, result.Stacks[0].Files.Count);
+        }
+
+        private void TestStackInfo(FileStack stack, string name, int fileCount)
+        {
+            Assert.Equal(fileCount, stack.Files.Count);
+            Assert.Equal(name, stack.Name);
+        }
+
+        private StackResolver GetResolver()
+        {
+            return new StackResolver(new NamingOptions());
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/StubTests.cs b/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
new file mode 100644
index 000000000..96fa8c5a5
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Globalization;
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class StubTests : BaseVideoTest
+    {
+        [Fact]
+        public void TestStubs()
+        {
+            Test("video.mkv", false, null);
+            Test("video.disc", true, null);
+            Test("video.dvd.disc", true, "dvd");
+            Test("video.hddvd.disc", true, "hddvd");
+            Test("video.bluray.disc", true, "bluray");
+            Test("video.brrip.disc", true, "bluray");
+            Test("video.bd25.disc", true, "bluray");
+            Test("video.bd50.disc", true, "bluray");
+            Test("video.vhs.disc", true, "vhs");
+            Test("video.hdtv.disc", true, "tv");
+            Test("video.pdtv.disc", true, "tv");
+            Test("video.dsr.disc", true, "tv");
+        }
+
+        [Fact]
+        public void TestStubName()
+        {
+            var result =
+                GetParser().ResolveFile(@"C:/Users/media/Desktop/Video Test/Movies/Oblivion/Oblivion.dvd.disc");
+
+            Assert.Equal("Oblivion", result.Name);
+        }
+
+        private void Test(string path, bool isStub, string stubType)
+        {
+            var options = new NamingOptions();
+
+            var resultStubType = StubResolver.ResolveFile(path, options);
+
+            Assert.Equal(isStub, resultStubType.IsStub);
+
+            if (stubType == null)
+            {
+                Assert.Null(resultStubType.StubType);
+            }
+            else
+            {
+                Assert.Equal(stubType, resultStubType.StubType, true);
+            }
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs b/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
new file mode 100644
index 000000000..ef8a17898
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
@@ -0,0 +1,457 @@
+using System.Linq;
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+using MediaBrowser.Model.IO;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class VideoListResolverTests
+    {
+        // FIXME
+        // [Fact]
+        public void TestStackAndExtras()
+        {
+            // No stacking here because there is no part/disc/etc
+            var files = new[]
+            {
+                "Harry Potter and the Deathly Hallows-trailer.mkv",
+                "Harry Potter and the Deathly Hallows.trailer.mkv",
+                "Harry Potter and the Deathly Hallows part1.mkv",
+                "Harry Potter and the Deathly Hallows part2.mkv",
+                "Harry Potter and the Deathly Hallows part3.mkv",
+                "Harry Potter and the Deathly Hallows part4.mkv",
+                "Batman-deleted.mkv",
+                "Batman-sample.mkv",
+                "Batman-trailer.mkv",
+                "Batman part1.mkv",
+                "Batman part2.mkv",
+                "Batman part3.mkv",
+                "Avengers.mkv",
+                "Avengers-trailer.mkv",
+
+                // Despite having a keyword in the name that will return an ExtraType, there's no original video to match it to
+                // So this is just a standalone video
+                "trailer.mkv",
+
+                // Same as above
+                "WillyWonka-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(5, result.Count);
+
+            Assert.Equal(3, result[1].Files.Count);
+            Assert.Equal(3, result[1].Extras.Count);
+            Assert.Equal("Batman", result[1].Name);
+
+            Assert.Equal(4, result[2].Files.Count);
+            Assert.Equal(2, result[2].Extras.Count);
+            Assert.Equal("Harry Potter and the Deathly Hallows", result[2].Name);
+        }
+
+        [Fact]
+        public void TestWithMetadata()
+        {
+            var files = new[]
+            {
+                "300.mkv",
+                "300.nfo"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestWithExtra()
+        {
+            var files = new[]
+            {
+                "300.mkv",
+                "300 trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestVariationWithFolderName()
+        {
+            var files = new[]
+            {
+                "X-Men Days of Future Past - 1080p.mkv",
+                "X-Men Days of Future Past-trailer.mp4"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestTrailer2()
+        {
+            var files = new[]
+            {
+                "X-Men Days of Future Past - 1080p.mkv",
+                "X-Men Days of Future Past-trailer.mp4",
+                "X-Men Days of Future Past-trailer2.mp4"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestDifferentNames()
+        {
+            var files = new[]
+            {
+                "Looper (2012)-trailer.mkv",
+                "Looper.2012.bluray.720p.x264.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestSeparateFiles()
+        {
+            // These should be considered separate, unrelated videos
+            var files = new[]
+            {
+                "My video 1.mkv",
+                "My video 2.mkv",
+                "My video 3.mkv",
+                "My video 4.mkv",
+                "My video 5.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(5, result.Count);
+        }
+
+        [Fact]
+        public void TestMultiDisc()
+        {
+            var files = new[]
+            {
+                @"M:/Movies (DVD)/Movies (Musical)/Sound of Music (1965)/Sound of Music Disc 1",
+                @"M:/Movies (DVD)/Movies (Musical)/Sound of Music (1965)/Sound of Music Disc 2"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = true,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestPoundSign()
+        {
+            // These should be considered separate, unrelated videos
+            var files = new[]
+            {
+                @"My movie #1.mp4",
+                @"My movie #2.mp4"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = true,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(2, result.Count);
+        }
+
+        [Fact]
+        public void TestStackedWithTrailer()
+        {
+            var files = new[]
+            {
+                @"No (2012) part1.mp4",
+                @"No (2012) part2.mp4",
+                @"No (2012) part1-trailer.mp4"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestStackedWithTrailer2()
+        {
+            var files = new[]
+            {
+                @"No (2012) part1.mp4",
+                @"No (2012) part2.mp4",
+                @"No (2012)-trailer.mp4"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestExtrasByFolderName()
+        {
+            var files = new[]
+            {
+                @"/Movies/Top Gun (1984)/movie.mp4",
+                @"/Movies/Top Gun (1984)/Top Gun (1984)-trailer.mp4",
+                @"/Movies/Top Gun (1984)/Top Gun (1984)-trailer2.mp4",
+                @"trailer.mp4"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestDoubleTags()
+        {
+            var files = new[]
+            {
+                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Counterfeit Racks (2011) Disc 1 cd1.avi",
+                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Counterfeit Racks (2011) Disc 1 cd2.avi",
+                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Disc 2 cd1.avi",
+                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Disc 2 cd2.avi"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(2, result.Count);
+        }
+
+        [Fact]
+        public void TestArgumentOutOfRangeException()
+        {
+            var files = new[]
+            {
+                @"/nas-markrobbo78/Videos/INDEX HTPC/Movies/Watched/3 - ACTION/Argo (2012)/movie.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestColony()
+        {
+            var files = new[]
+            {
+                @"The Colony.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestFourSisters()
+        {
+            var files = new[]
+            {
+                @"Four Sisters and a Wedding - A.avi",
+                @"Four Sisters and a Wedding - B.avi"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestMovieTrailer()
+        {
+            var files = new[]
+            {
+                @"/Server/Despicable Me/Despicable Me (2010).mkv",
+                @"/Server/Despicable Me/movie-trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestTrailerFalsePositives()
+        {
+            var files = new[]
+            {
+                @"/Server/Despicable Me/Skyscraper (2018) - Big Game Spot.mkv",
+                @"/Server/Despicable Me/Skyscraper (2018) - Trailer.mkv",
+                @"/Server/Despicable Me/Baywatch (2017) - Big Game Spot.mkv",
+                @"/Server/Despicable Me/Baywatch (2017) - Trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Equal(4, result.Count);
+        }
+
+        [Fact]
+        public void TestSubfolders()
+        {
+            var files = new[]
+            {
+                @"/Movies/Despicable Me/Despicable Me.mkv",
+                @"/Movies/Despicable Me/trailers/trailer.mkv"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        private VideoListResolver GetResolver()
+        {
+            var options = new NamingOptions();
+            return new VideoListResolver(options);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs b/tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs
new file mode 100644
index 000000000..5a3ce8886
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs
@@ -0,0 +1,275 @@
+using MediaBrowser.Model.Entities;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.Video
+{
+    public class VideoResolverTests : BaseVideoTest
+    {
+        // FIXME
+        // [Fact]
+        public void TestSimpleFile()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/Brave (2007)/Brave (2006).mkv");
+
+            Assert.Equal(2006, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Equal("Brave", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestSimpleFile2()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/Bad Boys (1995)/Bad Boys (1995).mkv");
+
+            Assert.Equal(1995, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Equal("Bad Boys", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestSimpleFileWithNumericName()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/300 (2007)/300 (2006).mkv");
+
+            Assert.Equal(2006, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Equal("300", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestExtra()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/Brave (2007)/Brave (2006)-trailer.mkv");
+
+            Assert.Equal(2006, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Equal(ExtraType.Trailer, result.ExtraType);
+            Assert.Equal("Brave (2006)-trailer", result.Name);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestExtraWithNumericName()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/300 (2007)/300 (2006)-trailer.mkv");
+
+            Assert.Equal(2006, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Equal("300 (2006)-trailer", result.Name);
+            Assert.Equal(ExtraType.Trailer, result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestStubFileWithNumericName()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/300 (2007)/300 (2006).bluray.disc");
+
+            Assert.Equal(2006, result.Year);
+            Assert.True(result.IsStub);
+            Assert.Equal("bluray", result.StubType);
+            Assert.False(result.Is3D);
+            Assert.Equal("300", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestStubFile()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/Brave (2007)/Brave (2006).bluray.disc");
+
+            Assert.Equal(2006, result.Year);
+            Assert.True(result.IsStub);
+            Assert.Equal("bluray", result.StubType);
+            Assert.False(result.Is3D);
+            Assert.Equal("Brave", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestExtraStubWithNumericNameNotSupported()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/300 (2007)/300 (2006)-trailer.bluray.disc");
+
+            Assert.Equal(2006, result.Year);
+            Assert.True(result.IsStub);
+            Assert.Equal("bluray", result.StubType);
+            Assert.False(result.Is3D);
+            Assert.Equal("300", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestExtraStubNotSupported()
+        {
+            // Using a stub for an extra is currently not supported
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/brave (2007)/brave (2006)-trailer.bluray.disc");
+
+            Assert.Equal(2006, result.Year);
+            Assert.True(result.IsStub);
+            Assert.Equal("bluray", result.StubType);
+            Assert.False(result.Is3D);
+            Assert.Equal("brave", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void Test3DFileWithNumericName()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/300 (2007)/300 (2006).3d.sbs.mkv");
+
+            Assert.Equal(2006, result.Year);
+            Assert.False(result.IsStub);
+            Assert.True(result.Is3D);
+            Assert.Equal("sbs", result.Format3D);
+            Assert.Equal("300", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestBad3DFileWithNumericName()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/300 (2007)/300 (2006).3d1.sbas.mkv");
+
+            Assert.Equal(2006, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Equal("300", result.Name);
+            Assert.Null(result.ExtraType);
+            Assert.Null(result.Format3D);
+        }
+
+        // FIXME
+        // [Fact]
+        public void Test3DFile()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/brave (2007)/brave (2006).3d.sbs.mkv");
+
+            Assert.Equal(2006, result.Year);
+            Assert.False(result.IsStub);
+            Assert.True(result.Is3D);
+            Assert.Equal("sbs", result.Format3D);
+            Assert.Equal("brave", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        [Fact]
+        public void TestNameWithoutDate()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/American Psycho/American.Psycho.mkv");
+
+            Assert.Null(result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Null(result.Format3D);
+            Assert.Equal("American.Psycho", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateAndStringsSequence()
+        {
+            var parser = GetParser();
+
+            // In this test case, running CleanDateTime first produces no date, so it will attempt to run CleanString first and then CleanDateTime again
+            var result =
+                parser.ResolveFile(@"/server/Movies/3.Days.to.Kill/3.Days.to.Kill.2014.720p.BluRay.x264.YIFY.mkv");
+
+            Assert.Equal(2014, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Null(result.Format3D);
+            Assert.Equal("3.Days.to.Kill", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        // FIXME
+        // [Fact]
+        public void TestCleanDateAndStringsSequence1()
+        {
+            var parser = GetParser();
+
+            // In this test case, running CleanDateTime first produces no date, so it will attempt to run CleanString first and then CleanDateTime again
+            var result =
+                parser.ResolveFile(@"/server/Movies/3 days to kill (2005)/3 days to kill (2005).mkv");
+
+            Assert.Equal(2005, result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Null(result.Format3D);
+            Assert.Equal("3 days to kill", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+
+        [Fact]
+        public void TestFolderNameWithExtension()
+        {
+            var parser = GetParser();
+
+            var result =
+                parser.ResolveFile(@"/server/Movies/7 Psychos.mkv/7 Psychos.mkv");
+
+            Assert.Null(result.Year);
+            Assert.False(result.IsStub);
+            Assert.False(result.Is3D);
+            Assert.Equal("7 Psychos", result.Name);
+            Assert.Null(result.ExtraType);
+        }
+    }
+}
-- 
cgit v1.2.3


From 2ef4ffd698fb4ae95754f76238e52cfb6162db24 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 11 Dec 2019 00:13:57 +0100
Subject: More warnings (removed)

---
 Emby.Naming/Emby.Naming.csproj                     |   2 +-
 Emby.Photos/Emby.Photos.csproj                     |   7 +-
 .../Activity/ActivityLogEntryPoint.cs              |   1 +
 .../Activity/ActivityManager.cs                    |   1 +
 .../Activity/ActivityRepository.cs                 |   1 +
 Emby.Server.Implementations/ApplicationHost.cs     |  13 +-
 .../Branding/BrandingConfigurationFactory.cs       |   1 +
 .../Channels/ChannelDynamicMediaSourceProvider.cs  |   1 +
 .../Channels/ChannelImageProvider.cs               |   1 +
 .../Channels/ChannelManager.cs                     |   1 +
 .../Channels/ChannelPostScanTask.cs                |   1 +
 .../Channels/RefreshChannelsScheduledTask.cs       |   1 +
 .../Collections/CollectionImageProvider.cs         |   1 +
 .../Collections/CollectionManager.cs               |   1 +
 .../Cryptography/CryptographyProvider.cs           |   2 +-
 .../Data/BaseSqliteRepository.cs                   |   1 +
 .../Data/CleanDatabaseScheduledTask.cs             |   1 +
 .../Data/ManagedConnection.cs                      |   1 +
 .../Data/SqliteDisplayPreferencesRepository.cs     |   1 +
 .../Data/SqliteExtensions.cs                       |   1 +
 .../Data/SqliteUserDataRepository.cs               |   1 +
 .../Data/SqliteUserRepository.cs                   |   1 +
 Emby.Server.Implementations/Devices/DeviceId.cs    |   1 +
 .../Devices/DeviceManager.cs                       |   1 +
 .../Diagnostics/CommonProcess.cs                   |   1 +
 .../Diagnostics/ProcessFactory.cs                  |   1 +
 Emby.Server.Implementations/Dto/DtoService.cs      |   1 +
 .../Emby.Server.Implementations.csproj             |  16 +--
 .../EntryPoints/AutomaticRestartEntryPoint.cs      |   1 +
 .../EntryPoints/ExternalPortForwarding.cs          |   1 +
 .../EntryPoints/LibraryChangedNotifier.cs          |   1 +
 .../EntryPoints/RecordingNotifier.cs               |   1 +
 .../EntryPoints/UserDataChangeNotifier.cs          |   1 +
 .../HttpServer/FileWriter.cs                       |   1 +
 .../HttpServer/HttpListenerHost.cs                 |   2 +-
 .../HttpServer/HttpResultFactory.cs                |   1 +
 .../HttpServer/IHttpListener.cs                    |   1 +
 .../HttpServer/RangeRequestWriter.cs               |   1 +
 .../HttpServer/Security/AuthService.cs             |   1 +
 .../HttpServer/Security/AuthorizationContext.cs    |   1 +
 .../HttpServer/Security/SessionContext.cs          |   1 +
 .../IO/ExtendedFileSystemInfo.cs                   |   1 +
 Emby.Server.Implementations/IO/FileRefresher.cs    |   1 +
 Emby.Server.Implementations/IO/LibraryMonitor.cs   |   1 +
 .../IO/ManagedFileSystem.cs                        |   1 +
 .../IO/MbLinkShortcutHandler.cs                    |   1 +
 Emby.Server.Implementations/IO/StreamHelper.cs     |   1 +
 .../Images/BaseDynamicImageProvider.cs             |   1 +
 .../Library/DefaultAuthenticationProvider.cs       |  13 +-
 .../Library/ExclusiveLiveStream.cs                 |   1 +
 .../Library/LibraryManager.cs                      |   1 +
 .../Library/LiveStreamHelper.cs                    |   1 +
 .../Library/MediaSourceManager.cs                  |   1 +
 .../Library/MediaStreamSelector.cs                 |   1 +
 .../Library/MusicManager.cs                        |   1 +
 .../Library/Resolvers/Audio/AudioResolver.cs       |   1 +
 .../Library/Resolvers/BaseVideoResolver.cs         |   1 +
 .../Library/Resolvers/Books/BookResolver.cs        |   1 +
 .../Library/Resolvers/PhotoResolver.cs             |   1 +
 .../Library/Resolvers/PlaylistResolver.cs          |   1 +
 .../Library/Resolvers/SpecialFolderResolver.cs     |   1 +
 .../Library/Resolvers/TV/SeriesResolver.cs         |   1 +
 .../Library/Resolvers/VideoResolver.cs             |   1 +
 .../Library/SearchEngine.cs                        |   1 +
 .../Library/UserDataManager.cs                     |   1 +
 Emby.Server.Implementations/Library/UserManager.cs |   3 +-
 .../Library/UserViewManager.cs                     |   1 +
 Jellyfin.Api/Jellyfin.Api.csproj                   |   2 +-
 Jellyfin.Server/Jellyfin.Server.csproj             |  14 +-
 .../Configuration/ConfigurationUpdateEventArgs.cs  |   1 +
 .../Configuration/IConfigurationFactory.cs         |   1 +
 .../Configuration/IConfigurationManager.cs         |   1 +
 MediaBrowser.Common/Cryptography/PasswordHash.cs   |  25 ++--
 MediaBrowser.Common/Events/EventHelper.cs          |   8 +-
 MediaBrowser.Common/Extensions/BaseExtensions.cs   |   7 +-
 MediaBrowser.Common/Extensions/CopyToExtensions.cs |   4 +-
 .../Extensions/MethodNotAllowedException.cs        |  26 ++++
 .../Extensions/RateLimitExceededException.cs       |  26 ++++
 .../Extensions/ResourceNotFoundException.cs        |  65 +--------
 MediaBrowser.Common/Hex.cs                         |  12 +-
 MediaBrowser.Common/IApplicationHost.cs            |  55 ++++----
 MediaBrowser.Common/MediaBrowser.Common.csproj     |  17 ++-
 MediaBrowser.Common/Net/CustomHeaderNames.cs       |   1 +
 MediaBrowser.Common/Net/HttpRequestOptions.cs      |  28 ++--
 MediaBrowser.Common/Net/HttpResponseInfo.cs        |  32 ++---
 MediaBrowser.Common/Net/IHttpClient.cs             |   4 +-
 MediaBrowser.Common/Net/INetworkManager.cs         |  11 +-
 MediaBrowser.Common/Plugins/BasePlugin.cs          | 150 ++++++++++-----------
 MediaBrowser.Common/Plugins/IPlugin.cs             |  29 ++--
 MediaBrowser.Common/Plugins/IPluginAssembly.cs     |  14 ++
 MediaBrowser.Common/Progress/ActionableProgress.cs |   1 +
 .../Providers/SubtitleConfigurationFactory.cs      |   1 +
 MediaBrowser.Common/System/OperatingSystem.cs      |   1 +
 .../Updates/IInstallationManager.cs                |  10 +-
 .../Updates/InstallationEventArgs.cs               |   1 +
 .../Updates/InstallationFailedEventArgs.cs         |   1 +
 .../Authentication/AuthenticationResult.cs         |   7 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |   1 -
 jellyfin.ruleset                                   |  12 +-
 99 files changed, 394 insertions(+), 291 deletions(-)
 create mode 100644 MediaBrowser.Common/Extensions/MethodNotAllowedException.cs
 create mode 100644 MediaBrowser.Common/Extensions/RateLimitExceededException.cs
 create mode 100644 MediaBrowser.Common/Plugins/IPluginAssembly.cs

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

diff --git a/Emby.Naming/Emby.Naming.csproj b/Emby.Naming/Emby.Naming.csproj
index 7258beaf4..3be5bbbaf 100644
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -23,7 +23,7 @@
 
   <!-- Code analysers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
index 64692c370..d3c87edff 100644
--- a/Emby.Photos/Emby.Photos.csproj
+++ b/Emby.Photos/Emby.Photos.csproj
@@ -22,9 +22,10 @@
 
   <!-- Code analysers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
index b622a3167..ac8af66a2 100644
--- a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
+++ b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Activity/ActivityManager.cs b/Emby.Server.Implementations/Activity/ActivityManager.cs
index a30e93912..b03c4d182 100644
--- a/Emby.Server.Implementations/Activity/ActivityManager.cs
+++ b/Emby.Server.Implementations/Activity/ActivityManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 7be72319e..633343bb6 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 8c625539a..ae979682e 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
@@ -180,11 +181,7 @@ namespace Emby.Server.Implementations
         /// Gets the plugins.
         /// </summary>
         /// <value>The plugins.</value>
-        public IPlugin[] Plugins
-        {
-            get => _plugins;
-            protected set => _plugins = value;
-        }
+        public IReadOnlyList<IPlugin> Plugins => _plugins;
 
         /// <summary>
         /// Gets or sets the logger factory.
@@ -1051,7 +1048,7 @@ namespace Emby.Server.Implementations
             }
 
             ConfigurationManager.AddParts(GetExports<IConfigurationFactory>());
-            Plugins = GetExports<IPlugin>()
+            _plugins = GetExports<IPlugin>()
                         .Select(LoadPlugin)
                         .Where(i => i != null)
                         .ToArray();
@@ -1683,9 +1680,9 @@ namespace Emby.Server.Implementations
         /// <param name="plugin">The plugin.</param>
         public void RemovePlugin(IPlugin plugin)
         {
-            var list = Plugins.ToList();
+            var list = _plugins.ToList();
             list.Remove(plugin);
-            Plugins = list.ToArray();
+            _plugins = list.ToArray();
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
index 93000ae12..15aee63a0 100644
--- a/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
+++ b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
diff --git a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs b/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
index 6016fed07..aae416b37 100644
--- a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs b/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
index 62aeb9bcb..fe64f1b15 100644
--- a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
+++ b/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index 6e1baddfe..de2e123af 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
index 2712fc8c5..36e0e5e26 100644
--- a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index 5774c0415..039e2c138 100644
--- a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
index 1fa556ec9..8006b8694 100644
--- a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
+++ b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Collections/CollectionManager.cs b/Emby.Server.Implementations/Collections/CollectionManager.cs
index 2b8a5bdc5..5a25b5d3e 100644
--- a/Emby.Server.Implementations/Collections/CollectionManager.cs
+++ b/Emby.Server.Implementations/Collections/CollectionManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
index 776074b72..de83b023d 100644
--- a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
+++ b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
@@ -121,7 +121,7 @@ namespace Emby.Server.Implementations.Cryptography
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
             if (_disposed)
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 0654132f4..b7f643819 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index 2a8f2d6b3..8a5387e9b 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Threading;
diff --git a/Emby.Server.Implementations/Data/ManagedConnection.cs b/Emby.Server.Implementations/Data/ManagedConnection.cs
index 5c094ddd2..2c2f19cd3 100644
--- a/Emby.Server.Implementations/Data/ManagedConnection.cs
+++ b/Emby.Server.Implementations/Data/ManagedConnection.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index d474f1c6b..8087419ce 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index c87793072..55c24ccc0 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 22955850a..f6c37e4e5 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index a042320c9..c82c93ffc 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index f0d43e665..ff75efa59 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index 2393f1f45..ef7317050 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
index bfa49ac5f..f8b754151 100644
--- a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
+++ b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Diagnostics;
diff --git a/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs b/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
index 02ad3c1a8..219f73c78 100644
--- a/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
+++ b/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using MediaBrowser.Model.Diagnostics;
 
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 3d622b3fc..fcf0360c7 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index fde4d7059..5ca508776 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -29,10 +29,10 @@
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
     <PackageReference Include="Mono.Nat" Version="2.0.0" />
     <PackageReference Include="ServiceStack.Text.Core" Version="5.7.0" />
     <PackageReference Include="sharpcompress" Version="0.24.0" />
@@ -52,10 +52,10 @@
 
   <!-- Code analysers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7" />
-    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
diff --git a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
index d69b0909d..a6eb1152f 100644
--- a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index e290c62e1..4e4ef3be0 100644
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index 5f938e59a..f85d52dbc 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
index dbb3503c4..e0aa18e89 100644
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index e431da148..3e22080fc 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/FileWriter.cs b/Emby.Server.Implementations/HttpServer/FileWriter.cs
index c1c8c3eb3..1795651fd 100644
--- a/Emby.Server.Implementations/HttpServer/FileWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/FileWriter.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 2aefc9fe5..b0126f7fa 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
@@ -218,7 +219,6 @@ namespace Emby.Server.Implementations.HttpServer
                 case FileNotFoundException _:
                 case ResourceNotFoundException _: return 404;
                 case MethodNotAllowedException _: return 405;
-                case RemoteServiceUnavailableException _: return 502;
                 default: return 500;
             }
         }
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index a62b4e7af..cefcaa835 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/IHttpListener.cs b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
index 501593725..1c3496e5d 100644
--- a/Emby.Server.Implementations/HttpServer/IHttpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Threading;
diff --git a/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs b/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
index 8b9028f6b..7cb113a58 100644
--- a/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
index 58421aaf1..03b5b748d 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index 129faeaab..e8884bca0 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
index 166952c64..a6a0f5b03 100644
--- a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Controller.Entities;
diff --git a/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs b/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
index 3150f3367..5be144452 100644
--- a/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
+++ b/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 namespace Emby.Server.Implementations.IO
 {
diff --git a/Emby.Server.Implementations/IO/FileRefresher.cs b/Emby.Server.Implementations/IO/FileRefresher.cs
index 4b5b11f01..cf92ddbcd 100644
--- a/Emby.Server.Implementations/IO/FileRefresher.cs
+++ b/Emby.Server.Implementations/IO/FileRefresher.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/IO/LibraryMonitor.cs b/Emby.Server.Implementations/IO/LibraryMonitor.cs
index b1fb8cc63..7777efc3b 100644
--- a/Emby.Server.Implementations/IO/LibraryMonitor.cs
+++ b/Emby.Server.Implementations/IO/LibraryMonitor.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 442fbabd1..d8da0888e 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs b/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
index e6696b8c4..574b63ae6 100644
--- a/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
+++ b/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/IO/StreamHelper.cs b/Emby.Server.Implementations/IO/StreamHelper.cs
index 40b397edc..c99018e40 100644
--- a/Emby.Server.Implementations/IO/StreamHelper.cs
+++ b/Emby.Server.Implementations/IO/StreamHelper.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Buffers;
diff --git a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
index fd50f156a..acf3a3b23 100644
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
index 94f60ea62..ab036eca7 100644
--- a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
+++ b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
@@ -70,9 +70,9 @@ namespace Emby.Server.Implementations.Library
                 byte[] calculatedHash = _cryptographyProvider.ComputeHash(
                     readyHash.Id,
                     passwordbytes,
-                    readyHash.Salt);
+                    readyHash.Salt.ToArray());
 
-                if (calculatedHash.SequenceEqual(readyHash.Hash))
+                if (readyHash.Hash.SequenceEqual(calculatedHash))
                 {
                     success = true;
                 }
@@ -148,17 +148,18 @@ namespace Emby.Server.Implementations.Library
 
             // TODO: make use of iterations parameter?
             PasswordHash passwordHash = PasswordHash.Parse(user.Password);
+            var salt = passwordHash.Salt.ToArray();
             return new PasswordHash(
                 passwordHash.Id,
                 _cryptographyProvider.ComputeHash(
                     passwordHash.Id,
                     Encoding.UTF8.GetBytes(str),
-                    passwordHash.Salt),
-                passwordHash.Salt,
+                    salt),
+                salt,
                 passwordHash.Parameters.ToDictionary(x => x.Key, y => y.Value)).ToString();
         }
 
-        public byte[] GetHashed(User user, string str)
+        public ReadOnlySpan<byte> GetHashed(User user, string str)
         {
             if (string.IsNullOrEmpty(user.Password))
             {
@@ -170,7 +171,7 @@ namespace Emby.Server.Implementations.Library
             return _cryptographyProvider.ComputeHash(
                     passwordHash.Id,
                     Encoding.UTF8.GetBytes(str),
-                    passwordHash.Salt);
+                    passwordHash.Salt.ToArray());
         }
     }
 }
diff --git a/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs b/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
index 9a7186898..3eb64c29c 100644
--- a/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
+++ b/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 6942088fe..d8ef8192a 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index ed7d8aa40..f28f4a538 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 22193c997..0899832a7 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
index 6b9f4d052..1652ad974 100644
--- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs
+++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/MusicManager.cs b/Emby.Server.Implementations/Library/MusicManager.cs
index 1ec578371..29af6670b 100644
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index 9d4bd9e59..7e3b27a12 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index c4bb861b8..43302bb3f 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
index 0b93ebeb8..1e2e0704c 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
index a71ae8250..e1eb23652 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
index a68562fc2..5e672f221 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
index 1030ed39d..eca60b133 100644
--- a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 7cc9eabc8..e39d85bc9 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
index 62268fce9..6404d6476 100644
--- a/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs
index 11d6c737a..76ae14720 100644
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index 48d33c26c..5d4f17861 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 85bfa154a..c7f6de24f 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
@@ -480,7 +481,7 @@ namespace Emby.Server.Implementations.Library
                 var hash = _cryptoProvider.ComputeHash(
                     passwordHash.Id,
                     Encoding.UTF8.GetBytes(password),
-                    passwordHash.Salt);
+                    passwordHash.Salt.ToArray());
                 success = passwordHash.Hash.SequenceEqual(hash);
             }
 
diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
index 322819b05..935deb71c 100644
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Jellyfin.Api/Jellyfin.Api.csproj b/Jellyfin.Api/Jellyfin.Api.csproj
index a2818b45d..f4e5337de 100644
--- a/Jellyfin.Api/Jellyfin.Api.csproj
+++ b/Jellyfin.Api/Jellyfin.Api.csproj
@@ -19,7 +19,7 @@
 
   <!-- Code analysers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 110028176..63410f606 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -24,13 +24,13 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
-  
+
   <!-- Code analyzers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7" />
-    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -39,8 +39,8 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.6.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
diff --git a/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs b/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
index 344aecf53..828415c18 100644
--- a/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
+++ b/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Common/Configuration/IConfigurationFactory.cs b/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
index 4c4060096..9b4ed772d 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Common/Configuration/IConfigurationManager.cs b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
index caf2edd83..7773596af 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationManager.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Common/Cryptography/PasswordHash.cs b/MediaBrowser.Common/Cryptography/PasswordHash.cs
index 19b8be47a..3477c1c04 100644
--- a/MediaBrowser.Common/Cryptography/PasswordHash.cs
+++ b/MediaBrowser.Common/Cryptography/PasswordHash.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
@@ -15,24 +16,24 @@ namespace MediaBrowser.Common.Cryptography
     public class PasswordHash
     {
         private readonly Dictionary<string, string> _parameters;
+        private readonly byte[] _salt;
+        private readonly byte[] _hash;
 
         public PasswordHash(string id, byte[] hash)
             : this(id, hash, Array.Empty<byte>())
         {
-
         }
 
         public PasswordHash(string id, byte[] hash, byte[] salt)
             : this(id, hash, salt, new Dictionary<string, string>())
         {
-
         }
 
         public PasswordHash(string id, byte[] hash, byte[] salt, Dictionary<string, string> parameters)
         {
             Id = id;
-            Hash = hash;
-            Salt = salt;
+            _hash = hash;
+            _salt = salt;
             _parameters = parameters;
         }
 
@@ -45,25 +46,24 @@ namespace MediaBrowser.Common.Cryptography
         /// <summary>
         /// Gets the additional parameters used by the hash function.
         /// </summary>
-        /// <value></value>
         public IReadOnlyDictionary<string, string> Parameters => _parameters;
 
         /// <summary>
         /// Gets the salt used for hashing the password.
         /// </summary>
         /// <value>Returns the salt used for hashing the password.</value>
-        public byte[] Salt { get; }
+        public ReadOnlySpan<byte> Salt => _salt;
 
         /// <summary>
         /// Gets the hashed password.
         /// </summary>
         /// <value>Return the hashed password.</value>
-        public byte[] Hash { get; }
+        public ReadOnlySpan<byte> Hash => _hash;
 
         public static PasswordHash Parse(string hashString)
         {
-            string[] splitted = hashString.Split('$');
             // The string should at least contain the hash function and the hash itself
+            string[] splitted = hashString.Split('$');
             if (splitted.Length < 3)
             {
                 throw new ArgumentException("String doesn't contain enough segments", nameof(hashString));
@@ -77,7 +77,7 @@ namespace MediaBrowser.Common.Cryptography
 
             // Optional parameters
             Dictionary<string, string> parameters = new Dictionary<string, string>();
-            if (splitted[index].IndexOf('=') != -1)
+            if (splitted[index].IndexOf('=', StringComparison.Ordinal) != -1)
             {
                 foreach (string paramset in splitted[index++].Split(','))
                 {
@@ -98,6 +98,7 @@ namespace MediaBrowser.Common.Cryptography
 
             byte[] hash;
             byte[] salt;
+
             // Check if the string also contains a salt
             if (splitted.Length - index == 2)
             {
@@ -141,14 +142,14 @@ namespace MediaBrowser.Common.Cryptography
                 .Append(Id);
             SerializeParameters(str);
 
-            if (Salt.Length != 0)
+            if (_salt.Length != 0)
             {
                 str.Append('$')
-                    .Append(Hex.Encode(Salt, false));
+                    .Append(Hex.Encode(_salt, false));
             }
 
             return str.Append('$')
-                .Append(Hex.Encode(Hash, false)).ToString();
+                .Append(Hex.Encode(_hash, false)).ToString();
         }
     }
 }
diff --git a/MediaBrowser.Common/Events/EventHelper.cs b/MediaBrowser.Common/Events/EventHelper.cs
index b67315df6..c9d3226ac 100644
--- a/MediaBrowser.Common/Events/EventHelper.cs
+++ b/MediaBrowser.Common/Events/EventHelper.cs
@@ -1,15 +1,13 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Common.Events
 {
-    // TODO: @bond Remove
     /// <summary>
-    /// Class EventHelper
+    /// Class EventHelper.
     /// </summary>
+    // TODO: @bond Remove
     public static class EventHelper
     {
         /// <summary>
@@ -40,7 +38,7 @@ namespace MediaBrowser.Common.Events
         /// <summary>
         /// Queues the event.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T">Argument type for the <c>handler</c>.</typeparam>
         /// <param name="handler">The handler.</param>
         /// <param name="sender">The sender.</param>
         /// <param name="args">The args.</param>
diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs
index 33473c2be..08964420e 100644
--- a/MediaBrowser.Common/Extensions/BaseExtensions.cs
+++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs
@@ -1,12 +1,12 @@
 using System;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Security.Cryptography;
 
 namespace MediaBrowser.Common.Extensions
 {
     /// <summary>
-    /// Class BaseExtensions
+    /// Class BaseExtensions.
     /// </summary>
     public static class BaseExtensions
     {
@@ -30,10 +30,13 @@ namespace MediaBrowser.Common.Extensions
         /// <returns><see cref="Guid" />.</returns>
         public static Guid GetMD5(this string str)
         {
+#pragma warning disable CA5351
             using (var provider = MD5.Create())
             {
                 return new Guid(provider.ComputeHash(Encoding.Unicode.GetBytes(str)));
             }
+
+#pragma warning restore CA5351
         }
     }
 }
diff --git a/MediaBrowser.Common/Extensions/CopyToExtensions.cs b/MediaBrowser.Common/Extensions/CopyToExtensions.cs
index 78a73f07e..2ecbc6539 100644
--- a/MediaBrowser.Common/Extensions/CopyToExtensions.cs
+++ b/MediaBrowser.Common/Extensions/CopyToExtensions.cs
@@ -5,7 +5,7 @@ namespace MediaBrowser.Common.Extensions
     /// <summary>
     /// Provides <c>CopyTo</c> extensions methods for <see cref="IReadOnlyList{T}" />.
     /// </summary>
-    public static class CollectionExtensions
+    public static class CopyToExtensions
     {
         /// <summary>
         /// Copies all the elements of the current collection to the specified list
@@ -14,7 +14,7 @@ namespace MediaBrowser.Common.Extensions
         /// <param name="source">The current collection that is the source of the elements.</param>
         /// <param name="destination">The list that is the destination of the elements copied from the current collection.</param>
         /// <param name="index">A 32-bit integer that represents the index in <c>destination</c> at which copying begins.</param>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T">The type of the array.</typeparam>
         public static void CopyTo<T>(this IReadOnlyList<T> source, IList<T> destination, int index = 0)
         {
             for (int i = 0; i < source.Count; i++)
diff --git a/MediaBrowser.Common/Extensions/MethodNotAllowedException.cs b/MediaBrowser.Common/Extensions/MethodNotAllowedException.cs
new file mode 100644
index 000000000..48e758ee4
--- /dev/null
+++ b/MediaBrowser.Common/Extensions/MethodNotAllowedException.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace MediaBrowser.Common.Extensions
+{
+    /// <summary>
+    /// Class MethodNotAllowedException.
+    /// </summary>
+    public class MethodNotAllowedException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
+        /// </summary>
+        public MethodNotAllowedException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        public MethodNotAllowedException(string message)
+            : base(message)
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.Common/Extensions/RateLimitExceededException.cs b/MediaBrowser.Common/Extensions/RateLimitExceededException.cs
new file mode 100644
index 000000000..4e5d4e9ca
--- /dev/null
+++ b/MediaBrowser.Common/Extensions/RateLimitExceededException.cs
@@ -0,0 +1,26 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
+using System;
+
+namespace MediaBrowser.Common.Extensions
+{
+    public class RateLimitExceededException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RateLimitExceededException" /> class.
+        /// </summary>
+        public RateLimitExceededException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RateLimitExceededException" /> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        public RateLimitExceededException(string message)
+            : base(message)
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs b/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs
index 9b064a40d..22130c5a1 100644
--- a/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs
+++ b/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs
@@ -1,11 +1,9 @@
-#pragma warning disable CS1591
-
 using System;
 
 namespace MediaBrowser.Common.Extensions
 {
     /// <summary>
-    /// Class ResourceNotFoundException
+    /// Class ResourceNotFoundException.
     /// </summary>
     public class ResourceNotFoundException : Exception
     {
@@ -14,7 +12,6 @@ namespace MediaBrowser.Common.Extensions
         /// </summary>
         public ResourceNotFoundException()
         {
-
         }
 
         /// <summary>
@@ -24,66 +21,6 @@ namespace MediaBrowser.Common.Extensions
         public ResourceNotFoundException(string message)
             : base(message)
         {
-
-        }
-    }
-
-    /// <summary>
-    /// Class MethodNotAllowedException
-    /// </summary>
-    public class MethodNotAllowedException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
-        /// </summary>
-        public MethodNotAllowedException()
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public MethodNotAllowedException(string message)
-            : base(message)
-        {
-
-        }
-    }
-
-    public class RemoteServiceUnavailableException : Exception
-    {
-        public RemoteServiceUnavailableException()
-        {
-
-        }
-
-        public RemoteServiceUnavailableException(string message)
-            : base(message)
-        {
-
-        }
-    }
-
-    public class RateLimitExceededException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RateLimitExceededException" /> class.
-        /// </summary>
-        public RateLimitExceededException()
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RateLimitExceededException" /> class.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public RateLimitExceededException(string message)
-            : base(message)
-        {
-
         }
     }
 }
diff --git a/MediaBrowser.Common/Hex.cs b/MediaBrowser.Common/Hex.cs
index b2d9aea3a..863192809 100644
--- a/MediaBrowser.Common/Hex.cs
+++ b/MediaBrowser.Common/Hex.cs
@@ -14,11 +14,11 @@ namespace MediaBrowser.Common
         internal const int LastHexSymbol = 0x66; // 102: f
 
         /// <summary>
-        /// Map from an ASCII char to its hex value shifted,
+        /// Gets an map from an ASCII char to its hex value shifted,
         /// e.g. <c>b</c> -> 11. 0xFF means it's not a hex symbol.
         /// </summary>
-        /// <value></value>
-        internal static ReadOnlySpan<byte> HexLookup => new byte[] {
+        internal static ReadOnlySpan<byte> HexLookup => new byte[]
+        {
             0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
             0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
             0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -29,10 +29,10 @@ namespace MediaBrowser.Common
         };
 
         /// <summary>
-        /// Encodes <c>bytes</c> as a hex string.
+        /// Encodes each element of the specified bytes as its hexadecimal string representation.
         /// </summary>
-        /// <param name="bytes"></param>
-        /// <param name="lowercase"></param>
+        /// <param name="bytes">An array of bytes.</param>
+        /// <param name="lowercase"><c>true</c> to use lowercase hexadecimal characters; otherwise <c>false</c>.</param>
         /// <returns><c>bytes</c> as a hex string.</returns>
         public static string Encode(ReadOnlySpan<byte> bytes, bool lowercase = true)
         {
diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs
index 6668e98aa..68a24aaba 100644
--- a/MediaBrowser.Common/IApplicationHost.cs
+++ b/MediaBrowser.Common/IApplicationHost.cs
@@ -8,10 +8,15 @@ using Microsoft.Extensions.DependencyInjection;
 namespace MediaBrowser.Common
 {
     /// <summary>
-    /// An interface to be implemented by the applications hosting a kernel
+    /// An interface to be implemented by the applications hosting a kernel.
     /// </summary>
     public interface IApplicationHost
     {
+        /// <summary>
+        /// Occurs when [has pending restart changed].
+        /// </summary>
+        event EventHandler HasPendingRestartChanged;
+
         /// <summary>
         /// Gets the name.
         /// </summary>
@@ -25,13 +30,13 @@ namespace MediaBrowser.Common
         string SystemId { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this instance has pending kernel reload.
+        /// Gets a value indicating whether this instance has pending kernel reload.
         /// </summary>
         /// <value><c>true</c> if this instance has pending kernel reload; otherwise, <c>false</c>.</value>
         bool HasPendingRestart { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this instance is currently shutting down.
+        /// Gets a value indicating whether this instance is currently shutting down.
         /// </summary>
         /// <value><c>true</c> if this instance is shutting down; otherwise, <c>false</c>.</value>
         bool IsShuttingDown { get; }
@@ -43,26 +48,11 @@ namespace MediaBrowser.Common
         bool CanSelfRestart { get; }
 
         /// <summary>
-        /// Get the version class of the system.
+        /// Gets the version class of the system.
         /// </summary>
         /// <value><see cref="PackageVersionClass.Release" /> or <see cref="PackageVersionClass.Beta" />.</value>
         PackageVersionClass SystemUpdateLevel { get; }
 
-        /// <summary>
-        /// Occurs when [has pending restart changed].
-        /// </summary>
-        event EventHandler HasPendingRestartChanged;
-
-        /// <summary>
-        /// Notifies the pending restart.
-        /// </summary>
-        void NotifyPendingRestart();
-
-        /// <summary>
-        /// Restarts this instance.
-        /// </summary>
-        void Restart();
-
         /// <summary>
         /// Gets the application version.
         /// </summary>
@@ -87,6 +77,22 @@ namespace MediaBrowser.Common
         /// </summary>
         string ApplicationUserAgentAddress { get; }
 
+        /// <summary>
+        /// Gets the plugins.
+        /// </summary>
+        /// <value>The plugins.</value>
+        IReadOnlyList<IPlugin> Plugins { get; }
+
+        /// <summary>
+        /// Notifies the pending restart.
+        /// </summary>
+        void NotifyPendingRestart();
+
+        /// <summary>
+        /// Restarts this instance.
+        /// </summary>
+        void Restart();
+
         /// <summary>
         /// Gets the exports.
         /// </summary>
@@ -98,21 +104,16 @@ namespace MediaBrowser.Common
         /// <summary>
         /// Resolves this instance.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T">The <c>Type</c>.</typeparam>
         /// <returns>``0.</returns>
         T Resolve<T>();
 
         /// <summary>
         /// Shuts down.
         /// </summary>
+        /// <returns>A task.</returns>
         Task Shutdown();
 
-        /// <summary>
-        /// Gets the plugins.
-        /// </summary>
-        /// <value>The plugins.</value>
-        IPlugin[] Plugins { get; }
-
         /// <summary>
         /// Removes the plugin.
         /// </summary>
@@ -122,6 +123,8 @@ namespace MediaBrowser.Common
         /// <summary>
         /// Inits this instance.
         /// </summary>
+        /// <param name="serviceCollection">The service collection.</param>
+        /// <returns>A task.</returns>
         Task InitAsync(IServiceCollection serviceCollection);
 
         /// <summary>
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 889fbfa5a..567fcdda1 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,9 +27,16 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- We need at least C# 7.1 for the "default literal" feature-->
-    <LangVersion>latest</LangVersion>
+  <!-- Code analyzers-->
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <!-- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> -->
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> -->
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MediaBrowser.Common/Net/CustomHeaderNames.cs b/MediaBrowser.Common/Net/CustomHeaderNames.cs
index 5ca9897eb..8cc48c55f 100644
--- a/MediaBrowser.Common/Net/CustomHeaderNames.cs
+++ b/MediaBrowser.Common/Net/CustomHeaderNames.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 namespace MediaBrowser.Common.Net
 {
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index 18c4b181f..8207a45f3 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
@@ -8,10 +9,21 @@ using Microsoft.Net.Http.Headers;
 namespace MediaBrowser.Common.Net
 {
     /// <summary>
-    /// Class HttpRequestOptions
+    /// Class HttpRequestOptions.
     /// </summary>
     public class HttpRequestOptions
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpRequestOptions"/> class.
+        /// </summary>
+        public HttpRequestOptions()
+        {
+            RequestHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            CacheMode = CacheMode.None;
+            DecompressionMethod = CompressionMethod.Deflate;
+        }
+
         /// <summary>
         /// Gets or sets the URL.
         /// </summary>
@@ -71,14 +83,17 @@ namespace MediaBrowser.Common.Net
         public string RequestContentType { get; set; }
 
         public string RequestContent { get; set; }
+
         public byte[] RequestContentBytes { get; set; }
 
         public bool BufferContent { get; set; }
 
         public bool LogErrorResponseBody { get; set; }
+
         public bool EnableKeepAlive { get; set; }
 
         public CacheMode CacheMode { get; set; }
+
         public TimeSpan CacheLength { get; set; }
 
         public bool EnableDefaultUserAgent { get; set; }
@@ -89,17 +104,6 @@ namespace MediaBrowser.Common.Net
 
             return value;
         }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestOptions"/> class.
-        /// </summary>
-        public HttpRequestOptions()
-        {
-            RequestHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            CacheMode = CacheMode.None;
-            DecompressionMethod = CompressionMethod.Deflate;
-        }
     }
 
     public enum CacheMode
diff --git a/MediaBrowser.Common/Net/HttpResponseInfo.cs b/MediaBrowser.Common/Net/HttpResponseInfo.cs
index 0de034b0e..d711ad64a 100644
--- a/MediaBrowser.Common/Net/HttpResponseInfo.cs
+++ b/MediaBrowser.Common/Net/HttpResponseInfo.cs
@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 using System.IO;
 using System.Net;
@@ -8,10 +6,25 @@ using System.Net.Http.Headers;
 namespace MediaBrowser.Common.Net
 {
     /// <summary>
-    /// Class HttpResponseInfo
+    /// Class HttpResponseInfo.
     /// </summary>
     public class HttpResponseInfo : IDisposable
     {
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+        public HttpResponseInfo()
+        {
+        }
+
+        public HttpResponseInfo(HttpResponseHeaders headers, HttpContentHeaders contentHeader)
+        {
+            Headers = headers;
+            ContentHeaders = contentHeader;
+        }
+
+#pragma warning restore CS1591
+#pragma warning restore SA1600
+
         /// <summary>
         /// Gets or sets the type of the content.
         /// </summary>
@@ -60,21 +73,10 @@ namespace MediaBrowser.Common.Net
         /// <value>The content headers.</value>
         public HttpContentHeaders ContentHeaders { get; set; }
 
-        public HttpResponseInfo()
-        {
-
-        }
-
-        public HttpResponseInfo(HttpResponseHeaders headers, HttpContentHeaders contentHeader)
-        {
-            Headers = headers;
-            ContentHeaders = contentHeader;
-        }
-
         /// <inheritdoc />
         public void Dispose()
         {
-            // Only IDisposable for backwards compatibility
+            // backwards compatibility
         }
     }
 }
diff --git a/MediaBrowser.Common/Net/IHttpClient.cs b/MediaBrowser.Common/Net/IHttpClient.cs
index 23ba34173..534e22edd 100644
--- a/MediaBrowser.Common/Net/IHttpClient.cs
+++ b/MediaBrowser.Common/Net/IHttpClient.cs
@@ -1,12 +1,12 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
 using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace MediaBrowser.Common.Net
 {
     /// <summary>
-    /// Interface IHttpClient
+    /// Interface IHttpClient.
     /// </summary>
     public interface IHttpClient
     {
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 0b99dc910..6bd7dd1d6 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
@@ -11,20 +12,20 @@ namespace MediaBrowser.Common.Net
     {
         event EventHandler NetworkChanged;
 
+        Func<string[]> LocalSubnetsFn { get; set; }
+
         /// <summary>
-        /// Gets a random port number that is currently available
+        /// Gets a random port number that is currently available.
         /// </summary>
         /// <returns>System.Int32.</returns>
         int GetRandomUnusedTcpPort();
 
         int GetRandomUnusedUdpPort();
 
-        Func<string[]> LocalSubnetsFn { get; set; }
-
         /// <summary>
-        /// Returns MAC Address from first Network Card in Computer
+        /// Returns the MAC Address from first Network Card in Computer.
         /// </summary>
-        /// <returns>[string] MAC Address</returns>
+        /// <returns>The MAC Address.</returns>
         List<PhysicalAddress> GetMacAddresses();
 
         /// <summary>
diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index 6ef891d66..25519ccc0 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -1,4 +1,4 @@
-#pragma warning disable CS1591
+#pragma warning disable SA1402
 
 using System;
 using System.IO;
@@ -8,10 +8,13 @@ using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Common.Plugins
 {
+    /// <summary>
+    /// Provides a common base class for all plugins.
+    /// </summary>
     public abstract class BasePlugin : IPlugin, IPluginAssembly
     {
         /// <summary>
-        /// Gets the name of the plugin
+        /// Gets the name of the plugin.
         /// </summary>
         /// <value>The name.</value>
         public abstract string Name { get; }
@@ -29,17 +32,23 @@ namespace MediaBrowser.Common.Plugins
         public virtual Guid Id { get; private set; }
 
         /// <summary>
-        /// Gets the plugin version
+        /// Gets the plugin version.
         /// </summary>
         /// <value>The version.</value>
         public Version Version { get; private set; }
 
         /// <summary>
-        /// Gets the path to the assembly file
+        /// Gets the path to the assembly file.
         /// </summary>
         /// <value>The assembly file path.</value>
         public string AssemblyFilePath { get; private set; }
 
+        /// <summary>
+        /// Gets the full path to the data folder, where the plugin can store any miscellaneous files needed.
+        /// </summary>
+        /// <value>The data folder path.</value>
+        public string DataFolderPath { get; private set; }
+
         /// <summary>
         /// Gets the plugin info.
         /// </summary>
@@ -62,9 +71,9 @@ namespace MediaBrowser.Common.Plugins
         /// </summary>
         public virtual void OnUninstalling()
         {
-
         }
 
+        /// <inheritdoc />
         public void SetAttributes(string assemblyFilePath, string dataFolderPath, Version assemblyVersion)
         {
             AssemblyFilePath = assemblyFilePath;
@@ -72,25 +81,48 @@ namespace MediaBrowser.Common.Plugins
             Version = assemblyVersion;
         }
 
+        /// <inheritdoc />
         public void SetId(Guid assemblyId)
         {
             Id = assemblyId;
         }
-
-        /// <summary>
-        /// Gets the full path to the data folder, where the plugin can store any miscellaneous files needed
-        /// </summary>
-        /// <value>The data folder path.</value>
-        public string DataFolderPath { get; private set; }
     }
 
     /// <summary>
-    /// Provides a common base class for all plugins
+    /// Provides a common base class for all plugins.
     /// </summary>
     /// <typeparam name="TConfigurationType">The type of the T configuration type.</typeparam>
     public abstract class BasePlugin<TConfigurationType> : BasePlugin, IHasPluginConfiguration
         where TConfigurationType : BasePluginConfiguration
     {
+        /// <summary>
+        /// The _configuration sync lock.
+        /// </summary>
+        private readonly object _configurationSyncLock = new object();
+
+        /// <summary>
+        /// The _save lock.
+        /// </summary>
+        private readonly object _configurationSaveLock = new object();
+
+        private Action<string> _directoryCreateFn;
+
+        /// <summary>
+        /// The _configuration.
+        /// </summary>
+        private TConfigurationType _configuration;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BasePlugin{TConfigurationType}" /> class.
+        /// </summary>
+        /// <param name="applicationPaths">The application paths.</param>
+        /// <param name="xmlSerializer">The XML serializer.</param>
+        protected BasePlugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer)
+        {
+            ApplicationPaths = applicationPaths;
+            XmlSerializer = xmlSerializer;
+        }
+
         /// <summary>
         /// Gets the application paths.
         /// </summary>
@@ -104,34 +136,19 @@ namespace MediaBrowser.Common.Plugins
         protected IXmlSerializer XmlSerializer { get; private set; }
 
         /// <summary>
-        /// Gets the type of configuration this plugin uses
+        /// Gets the type of configuration this plugin uses.
         /// </summary>
         /// <value>The type of the configuration.</value>
         public Type ConfigurationType => typeof(TConfigurationType);
 
-        private Action<string> _directoryCreateFn;
-        public void SetStartupInfo(Action<string> directoryCreateFn)
-        {
-            // hack alert, until the .net core transition is complete
-            _directoryCreateFn = directoryCreateFn;
-        }
-
         /// <summary>
-        /// Gets the name the assembly file
+        /// Gets the name the assembly file.
         /// </summary>
         /// <value>The name of the assembly file.</value>
         protected string AssemblyFileName => Path.GetFileName(AssemblyFilePath);
 
         /// <summary>
-        /// The _configuration sync lock
-        /// </summary>
-        private readonly object _configurationSyncLock = new object();
-        /// <summary>
-        /// The _configuration
-        /// </summary>
-        private TConfigurationType _configuration;
-        /// <summary>
-        /// Gets the plugin's configuration
+        /// Gets or sets the plugin's configuration.
         /// </summary>
         /// <value>The configuration.</value>
         public TConfigurationType Configuration
@@ -149,55 +166,54 @@ namespace MediaBrowser.Common.Plugins
                         }
                     }
                 }
+
                 return _configuration;
             }
-            protected set => _configuration = value;
-        }
 
-        private TConfigurationType LoadConfiguration()
-        {
-            var path = ConfigurationFilePath;
-
-            try
-            {
-                return (TConfigurationType)XmlSerializer.DeserializeFromFile(typeof(TConfigurationType), path);
-            }
-            catch
-            {
-                return (TConfigurationType)Activator.CreateInstance(typeof(TConfigurationType));
-            }
+            protected set => _configuration = value;
         }
 
         /// <summary>
-        /// Gets the name of the configuration file. Subclasses should override
+        /// Gets the name of the configuration file. Subclasses should override.
         /// </summary>
         /// <value>The name of the configuration file.</value>
         public virtual string ConfigurationFileName => Path.ChangeExtension(AssemblyFileName, ".xml");
 
         /// <summary>
-        /// Gets the full path to the configuration file
+        /// Gets the full path to the configuration file.
         /// </summary>
         /// <value>The configuration file path.</value>
         public string ConfigurationFilePath => Path.Combine(ApplicationPaths.PluginConfigurationsPath, ConfigurationFileName);
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="BasePlugin{TConfigurationType}" /> class.
+        /// Gets the plugin's configuration.
         /// </summary>
-        /// <param name="applicationPaths">The application paths.</param>
-        /// <param name="xmlSerializer">The XML serializer.</param>
-        protected BasePlugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer)
+        /// <value>The configuration.</value>
+        BasePluginConfiguration IHasPluginConfiguration.Configuration => Configuration;
+
+        /// <inheritdoc />
+        public void SetStartupInfo(Action<string> directoryCreateFn)
         {
-            ApplicationPaths = applicationPaths;
-            XmlSerializer = xmlSerializer;
+            // hack alert, until the .net core transition is complete
+            _directoryCreateFn = directoryCreateFn;
         }
 
-        /// <summary>
-        /// The _save lock
-        /// </summary>
-        private readonly object _configurationSaveLock = new object();
+        private TConfigurationType LoadConfiguration()
+        {
+            var path = ConfigurationFilePath;
+
+            try
+            {
+                return (TConfigurationType)XmlSerializer.DeserializeFromFile(typeof(TConfigurationType), path);
+            }
+            catch
+            {
+                return (TConfigurationType)Activator.CreateInstance(typeof(TConfigurationType));
+            }
+        }
 
         /// <summary>
-        /// Saves the current configuration to the file system
+        /// Saves the current configuration to the file system.
         /// </summary>
         public virtual void SaveConfiguration()
         {
@@ -209,12 +225,7 @@ namespace MediaBrowser.Common.Plugins
             }
         }
 
-        /// <summary>
-        /// Completely overwrites the current configuration with a new copy
-        /// Returns true or false indicating success or failure
-        /// </summary>
-        /// <param name="configuration">The configuration.</param>
-        /// <exception cref="ArgumentNullException">configuration</exception>
+        /// <inheritdoc />
         public virtual void UpdateConfiguration(BasePluginConfiguration configuration)
         {
             if (configuration == null)
@@ -227,12 +238,7 @@ namespace MediaBrowser.Common.Plugins
             SaveConfiguration();
         }
 
-        /// <summary>
-        /// Gets the plugin's configuration
-        /// </summary>
-        /// <value>The configuration.</value>
-        BasePluginConfiguration IHasPluginConfiguration.Configuration => Configuration;
-
+        /// <inheritdoc />
         public override PluginInfo GetPluginInfo()
         {
             var info = base.GetPluginInfo();
@@ -242,10 +248,4 @@ namespace MediaBrowser.Common.Plugins
             return info;
         }
     }
-
-    public interface IPluginAssembly
-    {
-        void SetAttributes(string assemblyFilePath, string dataFolderPath, Version assemblyVersion);
-        void SetId(Guid assemblyId);
-    }
 }
diff --git a/MediaBrowser.Common/Plugins/IPlugin.cs b/MediaBrowser.Common/Plugins/IPlugin.cs
index 7bd90c964..001ca8be8 100644
--- a/MediaBrowser.Common/Plugins/IPlugin.cs
+++ b/MediaBrowser.Common/Plugins/IPlugin.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Plugins;
@@ -6,12 +7,12 @@ using MediaBrowser.Model.Plugins;
 namespace MediaBrowser.Common.Plugins
 {
     /// <summary>
-    /// Interface IPlugin
+    /// Interface IPlugin.
     /// </summary>
     public interface IPlugin
     {
         /// <summary>
-        /// Gets the name of the plugin
+        /// Gets the name of the plugin.
         /// </summary>
         /// <value>The name.</value>
         string Name { get; }
@@ -29,19 +30,19 @@ namespace MediaBrowser.Common.Plugins
         Guid Id { get; }
 
         /// <summary>
-        /// Gets the plugin version
+        /// Gets the plugin version.
         /// </summary>
         /// <value>The version.</value>
         Version Version { get; }
 
         /// <summary>
-        /// Gets the path to the assembly file
+        /// Gets the path to the assembly file.
         /// </summary>
         /// <value>The assembly file path.</value>
         string AssemblyFilePath { get; }
 
         /// <summary>
-        /// Gets the full path to the data folder, where the plugin can store any miscellaneous files needed
+        /// Gets the full path to the data folder, where the plugin can store any miscellaneous files needed.
         /// </summary>
         /// <value>The data folder path.</value>
         string DataFolderPath { get; }
@@ -61,24 +62,24 @@ namespace MediaBrowser.Common.Plugins
     public interface IHasPluginConfiguration
     {
         /// <summary>
-        /// Gets the type of configuration this plugin uses
+        /// Gets the type of configuration this plugin uses.
         /// </summary>
         /// <value>The type of the configuration.</value>
         Type ConfigurationType { get; }
 
         /// <summary>
-        /// Completely overwrites the current configuration with a new copy
-        /// Returns true or false indicating success or failure
+        /// Gets the plugin's configuration.
         /// </summary>
-        /// <param name="configuration">The configuration.</param>
-        /// <exception cref="ArgumentNullException">configuration</exception>
-        void UpdateConfiguration(BasePluginConfiguration configuration);
+        /// <value>The configuration.</value>
+        BasePluginConfiguration Configuration { get; }
 
         /// <summary>
-        /// Gets the plugin's configuration
+        /// Completely overwrites the current configuration with a new copy
+        /// Returns true or false indicating success or failure.
         /// </summary>
-        /// <value>The configuration.</value>
-        BasePluginConfiguration Configuration { get; }
+        /// <param name="configuration">The configuration.</param>
+        /// <exception cref="ArgumentNullException"><c>configuration</c> is <c>null</c>.</exception>
+        void UpdateConfiguration(BasePluginConfiguration configuration);
 
         void SetStartupInfo(Action<string> directoryCreateFn);
     }
diff --git a/MediaBrowser.Common/Plugins/IPluginAssembly.cs b/MediaBrowser.Common/Plugins/IPluginAssembly.cs
new file mode 100644
index 000000000..388ac61ab
--- /dev/null
+++ b/MediaBrowser.Common/Plugins/IPluginAssembly.cs
@@ -0,0 +1,14 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
+using System;
+
+namespace MediaBrowser.Common.Plugins
+{
+    public interface IPluginAssembly
+    {
+        void SetAttributes(string assemblyFilePath, string dataFolderPath, Version assemblyVersion);
+
+        void SetId(Guid assemblyId);
+    }
+}
diff --git a/MediaBrowser.Common/Progress/ActionableProgress.cs b/MediaBrowser.Common/Progress/ActionableProgress.cs
index af69055aa..92141ba52 100644
--- a/MediaBrowser.Common/Progress/ActionableProgress.cs
+++ b/MediaBrowser.Common/Progress/ActionableProgress.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs b/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs
index 0445397ad..a6422e2c8 100644
--- a/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs
+++ b/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
diff --git a/MediaBrowser.Common/System/OperatingSystem.cs b/MediaBrowser.Common/System/OperatingSystem.cs
index 7d38ddb6e..f23af4799 100644
--- a/MediaBrowser.Common/System/OperatingSystem.cs
+++ b/MediaBrowser.Common/System/OperatingSystem.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs
index e49812f15..a09c1916c 100644
--- a/MediaBrowser.Common/Updates/IInstallationManager.cs
+++ b/MediaBrowser.Common/Updates/IInstallationManager.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
@@ -103,17 +104,16 @@ namespace MediaBrowser.Common.Updates
         Task InstallPackage(PackageVersionInfo package, CancellationToken cancellationToken = default);
 
         /// <summary>
-        /// Uninstalls a plugin
+        /// Uninstalls a plugin.
         /// </summary>
         /// <param name="plugin">The plugin.</param>
-        /// <exception cref="ArgumentException"></exception>
         void UninstallPlugin(IPlugin plugin);
 
         /// <summary>
-        /// Cancels the installation
+        /// Cancels the installation.
         /// </summary>
-        /// <param name="id">The id of the package that is being installed</param>
-        /// <returns>Returns true if the install was cancelled</returns>
+        /// <param name="id">The id of the package that is being installed.</param>
+        /// <returns>Returns true if the install was cancelled.</returns>
         bool CancelInstallation(Guid id);
     }
 }
diff --git a/MediaBrowser.Common/Updates/InstallationEventArgs.cs b/MediaBrowser.Common/Updates/InstallationEventArgs.cs
index 36e124ddf..8bbb231ce 100644
--- a/MediaBrowser.Common/Updates/InstallationEventArgs.cs
+++ b/MediaBrowser.Common/Updates/InstallationEventArgs.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using MediaBrowser.Model.Updates;
 
diff --git a/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs b/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs
index 46f10c84f..c8967f9db 100644
--- a/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs
+++ b/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
index 3c65156e3..5248ea4c1 100644
--- a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
+++ b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
@@ -1,14 +1,19 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
 
-
 namespace MediaBrowser.Controller.Authentication
 {
     public class AuthenticationResult
     {
         public UserDto User { get; set; }
+
         public SessionInfo SessionInfo { get; set; }
+
         public string AccessToken { get; set; }
+
         public string ServerId { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 1fd706857..cf8f03002 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -19,7 +19,6 @@ using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Library;
diff --git a/jellyfin.ruleset b/jellyfin.ruleset
index 75b5573b6..b6f5cf01b 100644
--- a/jellyfin.ruleset
+++ b/jellyfin.ruleset
@@ -31,8 +31,12 @@
   <Rules AnalyzerId="Microsoft.CodeAnalysis.FxCopAnalyzers" RuleNamespace="Microsoft.Design">
     <!-- disable warning CA1031: Do not catch general exception types -->
     <Rule Id="CA1031" Action="Info" />
+    <!-- disable warning CA1032: Implement standard exception constructors -->
+    <Rule Id="CA1032" Action="Info" />
     <!-- disable warning CA1062: Validate arguments of public methods -->
     <Rule Id="CA1062" Action="Info" />
+    <!-- disable warning CA1716: Identifiers should not match keywords -->
+    <Rule Id="CA1716" Action="Info" />
     <!-- disable warning CA1720: Identifiers should not contain type names -->
     <Rule Id="CA1720" Action="Info" />
     <!-- disable warning CA1812: internal class that is apparently never instantiated.
@@ -41,14 +45,18 @@
     <Rule Id="CA1812" Action="Info" />
     <!-- disable warning CA1822: Member does not access instance data and can be marked as static -->
     <Rule Id="CA1822" Action="Info" />
+    <!-- disable warning CA2000: Dispose objects before losing scope -->
+    <Rule Id="CA2000" Action="Info" />
 
     <!-- disable warning CA1054: Change the type of parameter url from string to System.Uri -->
     <Rule Id="CA1054" Action="None" />
+    <!-- disable warning CA1055: URI return values should not be strings -->
+    <Rule Id="CA1055" Action="None" />
+    <!-- disable warning CA1056: URI properties should not be strings -->
+    <Rule Id="CA1056" Action="None" />
     <!-- disable warning CA1303: Do not pass literals as localized parameters -->
     <Rule Id="CA1303" Action="None" />
     <!-- disable warning CA1308: Normalize strings to uppercase -->
     <Rule Id="CA1308" Action="None" />
-    <!-- disable warning CA2000: Dispose objects before losing scope -->
-    <Rule Id="CA2000" Action="None" />
   </Rules>
 </RuleSet>
-- 
cgit v1.2.3


From a253fa616da3fd982ca2190b69d25853893665f1 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Thu, 26 Dec 2019 23:09:00 +0100
Subject: Fix build and address comments

---
 Emby.Server.Implementations/ApplicationHost.cs     |  2 +-
 .../Data/SqliteItemRepository.cs                   | 34 ++++----
 .../Library/MediaSourceManager.cs                  |  9 --
 Jellyfin.Api/Controllers/StartupController.cs      |  1 -
 MediaBrowser.Api/Attachments/AttachmentService.cs  | 19 ++---
 .../Library/IMediaSourceManager.cs                 | 11 +--
 .../MediaEncoding/IAttachmentExtractor.cs          |  4 +-
 .../Attachments/AttachmentExtractor.cs             | 97 +++++++++++-----------
 .../Encoder/EncodingUtils.cs                       |  2 +-
 9 files changed, 82 insertions(+), 97 deletions(-)

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

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 7c3f59af2..c5ac27ed4 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -878,7 +878,7 @@ namespace Emby.Server.Implementations
             serviceCollection.AddSingleton(typeof(IResourceFileManager), typeof(ResourceFileManager));
             serviceCollection.AddSingleton<EncodingHelper>();
 
-            serviceCollection.AddSingleton(typeof(MediaBrowser.Controller.MediaEncoding.IAttachmentExtractor),typeof(MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor));
+            serviceCollection.AddSingleton(typeof(IAttachmentExtractor), typeof(MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor));
 
             _displayPreferencesRepository.Initialize();
 
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 2206816a5..91ca8477d 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -55,8 +55,8 @@ namespace Emby.Server.Implementations.Data
             queryPrefixText.Append("insert into mediaattachments (");
             foreach (var column in _mediaAttachmentSaveColumns)
             {
-                queryPrefixText.Append(column);
-                queryPrefixText.Append(',');
+                queryPrefixText.Append(column)
+                    .Append(',');
             }
 
             queryPrefixText.Length -= 1;
@@ -449,6 +449,7 @@ namespace Emby.Server.Implementations.Data
             "Filename",
             "MIMEType"
         };
+
         private static readonly string _mediaAttachmentInsertPrefix;
 
         private static string GetSaveItemCommandText()
@@ -6208,7 +6209,10 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
             return list;
         }
 
-        public void SaveMediaAttachments(Guid id, List<MediaAttachment> attachments, CancellationToken cancellationToken)
+        public void SaveMediaAttachments(
+            Guid id,
+            List<MediaAttachment> attachments,
+            CancellationToken cancellationToken)
         {
             CheckDisposed();
             if (id == Guid.Empty)
@@ -6237,24 +6241,22 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
             }
         }
 
-        private void InsertMediaAttachments(byte[] idBlob, List<MediaAttachment> attachments, IDatabaseConnection db, CancellationToken cancellationToken)
+        private void InsertMediaAttachments(
+            byte[] idBlob,
+            List<MediaAttachment> attachments,
+            IDatabaseConnection db,
+            CancellationToken cancellationToken)
         {
-            var startIndex = 0;
-            var insertAtOnce = 10;
+            const int InsertAtOnce = 10;
 
-            while (startIndex < attachments.Count)
+            for (var startIndex = 0; startIndex < attachments.Count; startIndex += InsertAtOnce)
             {
                 var insertText = new StringBuilder(_mediaAttachmentInsertPrefix);
 
-                var endIndex = Math.Min(attachments.Count, startIndex + insertAtOnce);
+                var endIndex = Math.Min(attachments.Count, startIndex + InsertAtOnce);
 
                 for (var i = startIndex; i < endIndex; i++)
                 {
-                    if (i != startIndex)
-                    {
-                        insertText.Append(',');
-                    }
-
                     var index = i.ToString(CultureInfo.InvariantCulture);
                     insertText.Append("(@ItemId, ");
 
@@ -6265,9 +6267,11 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
                     insertText.Length -= 1;
 
-                    insertText.Append(")");
+                    insertText.Append("),");
                 }
 
+                insertText.Length--;
+
                 cancellationToken.ThrowIfCancellationRequested();
 
                 using (var statement = PrepareStatement(db, insertText.ToString()))
@@ -6291,8 +6295,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
                     statement.Reset();
                     statement.MoveNext();
                 }
-
-                startIndex += insertAtOnce;
             }
         }
 
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 4eff2807c..ba1564d1f 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -136,15 +136,6 @@ namespace Emby.Server.Implementations.Library
             return _itemRepo.GetMediaAttachments(query);
         }
 
-        /// <inheritdoc />
-        public List<MediaAttachment> GetMediaAttachments(string mediaSourceId)
-        {
-            return GetMediaAttachments(new MediaAttachmentQuery
-            {
-                ItemId = new Guid(mediaSourceId)
-            });
-        }
-
         /// <inheritdoc />
         public List<MediaAttachment> GetMediaAttachments(Guid itemId)
         {
diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs
index 1014c8c56..afc9b8f3d 100644
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -96,7 +96,6 @@ namespace Jellyfin.Api.Controllers
         public StartupUserDto GetFirstUser()
         {
             var user = _userManager.Users.First();
-
             return new StartupUserDto
             {
                 Name = user.Name,
diff --git a/MediaBrowser.Api/Attachments/AttachmentService.cs b/MediaBrowser.Api/Attachments/AttachmentService.cs
index 1ebfaa14b..ef09951b6 100644
--- a/MediaBrowser.Api/Attachments/AttachmentService.cs
+++ b/MediaBrowser.Api/Attachments/AttachmentService.cs
@@ -1,22 +1,14 @@
 using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
-using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
 
 namespace MediaBrowser.Api.Attachments
 {
@@ -38,7 +30,13 @@ namespace MediaBrowser.Api.Attachments
         private readonly ILibraryManager _libraryManager;
         private readonly IAttachmentExtractor _attachmentExtractor;
 
-        public AttachmentService(ILibraryManager libraryManager, IAttachmentExtractor attachmentExtractor)
+        public AttachmentService(
+            ILogger<AttachmentService> logger,
+            IServerConfigurationManager serverConfigurationManager,
+            IHttpResultFactory httpResultFactory,
+            ILibraryManager libraryManager,
+            IAttachmentExtractor attachmentExtractor)
+            : base(logger, serverConfigurationManager, httpResultFactory)
         {
             _libraryManager = libraryManager;
             _attachmentExtractor = attachmentExtractor;
@@ -46,7 +44,6 @@ namespace MediaBrowser.Api.Attachments
 
         public async Task<object> Get(GetAttachment request)
         {
-            var item = (Video)_libraryManager.GetItemById(request.Id);
             var (attachment, attachmentStream) = await GetAttachment(request).ConfigureAwait(false);
             var mime = string.IsNullOrWhiteSpace(attachment.MIMEType) ? "application/octet-stream" : attachment.MIMEType;
 
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
index dda8d397a..09e6fda88 100644
--- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -41,21 +41,14 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Gets the media attachments.
         /// </summary>
-        /// <param name="">The item identifier.</param>
+        /// <param name="itemId">The item identifier.</param>
         /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
         List<MediaAttachment> GetMediaAttachments(Guid itemId);
 
         /// <summary>
         /// Gets the media attachments.
         /// </summary>
-        /// <param name="">The The media source identifier.</param>
-        /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
-
-        List<MediaAttachment> GetMediaAttachments(string mediaSourceId);
-        /// <summary>
-        /// Gets the media attachments.
-        /// </summary>
-        /// <param name="">The query.</param>
+        /// <param name="query">The query.</param>
         /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
         List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query);
 
diff --git a/MediaBrowser.Controller/MediaEncoding/IAttachmentExtractor.cs b/MediaBrowser.Controller/MediaEncoding/IAttachmentExtractor.cs
index 59c0a3f21..7c7e84de6 100644
--- a/MediaBrowser.Controller/MediaEncoding/IAttachmentExtractor.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IAttachmentExtractor.cs
@@ -2,14 +2,14 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.MediaEncoding
 {
     public interface IAttachmentExtractor
     {
-        Task<(MediaAttachment attachment, Stream stream)> GetAttachment(BaseItem item,
+        Task<(MediaAttachment attachment, Stream stream)> GetAttachment(
+            BaseItem item,
             string mediaSourceId,
             int attachmentStreamIndex,
             CancellationToken cancellationToken);
diff --git a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
index cb22343c4..c371e8b94 100644
--- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
+++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
@@ -4,44 +4,41 @@ using System.Collections.Concurrent;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
-using UtfUnknown;
 
 namespace MediaBrowser.MediaEncoding.Attachments
 {
-    public class AttachmentExtractor : IAttachmentExtractor
+    public class AttachmentExtractor : IAttachmentExtractor, IDisposable
     {
-        private readonly ILibraryManager _libraryManager;
         private readonly ILogger _logger;
         private readonly IApplicationPaths _appPaths;
         private readonly IFileSystem _fileSystem;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IMediaSourceManager _mediaSourceManager;
 
+        private readonly ConcurrentDictionary<string, SemaphoreSlim> _semaphoreLocks =
+            new ConcurrentDictionary<string, SemaphoreSlim>();
+
+        private bool _disposed = false;
+
         public AttachmentExtractor(
-            ILibraryManager libraryManager,
             ILogger<AttachmentExtractor> logger,
             IApplicationPaths appPaths,
             IFileSystem fileSystem,
             IMediaEncoder mediaEncoder,
             IMediaSourceManager mediaSourceManager)
         {
-            _libraryManager = libraryManager;
             _logger = logger;
             _appPaths = appPaths;
             _fileSystem = fileSystem;
@@ -49,8 +46,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
             _mediaSourceManager = mediaSourceManager;
         }
 
-        private string AttachmentCachePath => Path.Combine(_appPaths.DataPath, "attachments");
-
+        /// <inheritdoc />
         public async Task<(MediaAttachment attachment, Stream stream)> GetAttachment(BaseItem item, string mediaSourceId, int attachmentStreamIndex, CancellationToken cancellationToken)
         {
             if (item == null)
@@ -70,12 +66,14 @@ namespace MediaBrowser.MediaEncoding.Attachments
             {
                 throw new ResourceNotFoundException($"MediaSource {mediaSourceId} not found");
             }
+
             var mediaAttachment = mediaSource.MediaAttachments
                 .FirstOrDefault(i => i.Index == attachmentStreamIndex);
             if (mediaAttachment == null)
             {
                 throw new ResourceNotFoundException($"MediaSource {mediaSourceId} has no attachment with stream index {attachmentStreamIndex}");
             }
+
             var attachmentStream = await GetAttachmentStream(mediaSource, mediaAttachment, cancellationToken)
                     .ConfigureAwait(false);
 
@@ -87,49 +85,32 @@ namespace MediaBrowser.MediaEncoding.Attachments
             MediaAttachment mediaAttachment,
             CancellationToken cancellationToken)
         {
-            var inputFiles = new[] { mediaSource.Path };
-            var attachmentPath = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, mediaAttachment, cancellationToken).ConfigureAwait(false);
-            var stream = await GetAttachmentStream(attachmentPath, cancellationToken).ConfigureAwait(false);
-            return stream;
+            var attachmentPath = await GetReadableFile(mediaSource.Path, mediaSource.Path, mediaSource.Protocol, mediaAttachment, cancellationToken).ConfigureAwait(false);
+            return File.OpenRead(attachmentPath);
         }
 
-        private async Task<Stream> GetAttachmentStream(
-            string path,
-            CancellationToken cancellationToken)
-        {
-            return File.OpenRead(path);
-        }
-
-        private async Task<String> GetReadableFile(
+        private async Task<string> GetReadableFile(
             string mediaPath,
-            string[] inputFiles,
+            string inputFile,
             MediaProtocol protocol,
             MediaAttachment mediaAttachment,
             CancellationToken cancellationToken)
         {
             var outputPath = GetAttachmentCachePath(mediaPath, protocol, mediaAttachment.Index);
-            await ExtractAttachment(inputFiles, protocol, mediaAttachment.Index, outputPath, cancellationToken)
+            await ExtractAttachment(inputFile, protocol, mediaAttachment.Index, outputPath, cancellationToken)
                 .ConfigureAwait(false);
 
             return outputPath;
         }
 
-        private readonly ConcurrentDictionary<string, SemaphoreSlim> _semaphoreLocks =
-            new ConcurrentDictionary<string, SemaphoreSlim>();
-
-        private SemaphoreSlim GetLock(string filename)
-        {
-            return _semaphoreLocks.GetOrAdd(filename, key => new SemaphoreSlim(1, 1));
-        }
-
         private async Task ExtractAttachment(
-            string[] inputFiles,
+            string inputFile,
             MediaProtocol protocol,
             int attachmentStreamIndex,
             string outputPath,
             CancellationToken cancellationToken)
         {
-            var semaphore = GetLock(outputPath);
+            var semaphore = _semaphoreLocks.GetOrAdd(outputPath, key => new SemaphoreSlim(1, 1));
 
             await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
@@ -137,7 +118,11 @@ namespace MediaBrowser.MediaEncoding.Attachments
             {
                 if (!File.Exists(outputPath))
                 {
-                    await ExtractAttachmentInternal(_mediaEncoder.GetInputArgument(inputFiles, protocol), attachmentStreamIndex, outputPath, cancellationToken).ConfigureAwait(false);
+                    await ExtractAttachmentInternal(
+                        _mediaEncoder.GetInputArgument(new[] { inputFile }, protocol),
+                        attachmentStreamIndex,
+                        outputPath,
+                        cancellationToken).ConfigureAwait(false);
                 }
             }
             finally
@@ -186,16 +171,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
 
             _logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments);
 
-            try
-            {
-                process.Start();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error starting ffmpeg");
-
-                throw;
-            }
+            process.Start();
 
             var processTcs = new TaskCompletionSource<bool>();
             process.EnableRaisingEvents = true;
@@ -216,6 +192,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
                     _logger.LogError(ex, "Error killing attachment extraction process");
                 }
             }
+
             var exitCode = ranToCompletion ? process.ExitCode : -1;
 
             process.Dispose();
@@ -270,9 +247,35 @@ namespace MediaBrowser.MediaEncoding.Attachments
             {
                 filename = (mediaPath + attachmentStreamIndex.ToString(CultureInfo.InvariantCulture)).GetMD5().ToString("D");
             }
+
             var prefix = filename.Substring(0, 1);
-            return Path.Combine(AttachmentCachePath, prefix, filename);
+            return Path.Combine(_appPaths.DataPath, "attachments", prefix, filename);
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+
+            }
+
+            _disposed = true;
+        }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
index d4aede572..c5da42089 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
@@ -43,7 +43,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns>System.String.</returns>
-        private static string GetFileInputArgument(string path)
+        public static string GetFileInputArgument(string path)
         {
             if (path.IndexOf("://") != -1)
             {
-- 
cgit v1.2.3


From abf03f7d3ad14f026fd439f522403353a7ecec86 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sat, 11 Jan 2020 21:31:35 +0100
Subject: Clean up some more

---
 Emby.Naming/Video/CleanDateTimeParser.cs            | 19 +++++--------------
 Emby.Naming/Video/VideoResolver.cs                  |  2 +-
 .../Library/LibraryManager.cs                       | 21 ++++++---------------
 3 files changed, 12 insertions(+), 30 deletions(-)

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

diff --git a/Emby.Naming/Video/CleanDateTimeParser.cs b/Emby.Naming/Video/CleanDateTimeParser.cs
index 84a14a54f..6c74c07d5 100644
--- a/Emby.Naming/Video/CleanDateTimeParser.cs
+++ b/Emby.Naming/Video/CleanDateTimeParser.cs
@@ -2,33 +2,24 @@
 #pragma warning disable SA1600
 #nullable enable
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.Text.RegularExpressions;
-using Emby.Naming.Common;
 
 namespace Emby.Naming.Video
 {
     /// <summary>
     /// <see href="http://kodi.wiki/view/Advancedsettings.xml#video" />.
     /// </summary>
-    public class CleanDateTimeParser
+    public static class CleanDateTimeParser
     {
-        private readonly NamingOptions _options;
-
-        public CleanDateTimeParser(NamingOptions options)
+        public static CleanDateTimeResult Clean(string name, IReadOnlyList<Regex> cleanDateTimeRegexes)
         {
-            _options = options;
-        }
-
-        public CleanDateTimeResult Clean(string name)
-        {
-            var regexes = _options.CleanDateTimeRegexes;
-            var len = regexes.Length;
-
             CleanDateTimeResult result = new CleanDateTimeResult(name);
+            var len = cleanDateTimeRegexes.Count;
             for (int i = 0; i < len; i++)
             {
-                if (TryClean(name, regexes[i], ref result))
+                if (TryClean(name, cleanDateTimeRegexes[i], ref result))
                 {
                     return result;
                 }
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 76e0a5a0e..f93db2486 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -138,7 +138,7 @@ namespace Emby.Naming.Video
 
         public CleanDateTimeResult CleanDateTime(string name)
         {
-            return new CleanDateTimeParser(_options).Clean(name);
+            return CleanDateTimeParser.Clean(name, _options.CleanDateTimeRegexes);
         }
     }
 }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index ae3cdece9..6fb623554 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -36,7 +36,6 @@ using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Net;
@@ -54,6 +53,9 @@ namespace Emby.Server.Implementations.Library
     /// </summary>
     public class LibraryManager : ILibraryManager
     {
+        private NamingOptions _namingOptions;
+        private string[] _videoFileExtensions;
+
         /// <summary>
         /// Gets or sets the postscan tasks.
         /// </summary>
@@ -2508,21 +2510,11 @@ namespace Emby.Server.Implementations.Library
         }
 
         public NamingOptions GetNamingOptions()
-        {
-            return GetNamingOptionsInternal();
-        }
-
-        private NamingOptions _namingOptions;
-        private string[] _videoFileExtensions;
-
-        private NamingOptions GetNamingOptionsInternal()
         {
             if (_namingOptions == null)
             {
-                var options = new NamingOptions();
-
-                _namingOptions = options;
-                _videoFileExtensions = _namingOptions.VideoFileExtensions.ToArray();
+                _namingOptions = new NamingOptions();
+                _videoFileExtensions = _namingOptions.VideoFileExtensions;
             }
 
             return _namingOptions;
@@ -2533,11 +2525,10 @@ namespace Emby.Server.Implementations.Library
             var resolver = new VideoResolver(GetNamingOptions());
 
             var result = resolver.CleanDateTime(name);
-            var cleanName = resolver.CleanString(result.Name);
 
             return new ItemLookupInfo
             {
-                Name = cleanName.Name,
+                Name = resolver.TryCleanString(result.Name, out var newName) ? newName.ToString() : result.Name,
                 Year = result.Year
             };
         }
-- 
cgit v1.2.3


From dc62e436c43362f2193415f4c81280c6c1a8560c Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 22 Jan 2020 22:18:56 +0100
Subject: Clean up Emby.Naming

---
 Emby.Naming/Audio/AlbumParser.cs                   |  11 +-
 Emby.Naming/Audio/MultiPartResult.cs               |  26 -----
 Emby.Naming/AudioBook/AudioBookFileInfo.cs         |   2 +-
 Emby.Naming/AudioBook/AudioBookListResolver.cs     |  19 +--
 Emby.Naming/Common/EpisodeExpression.cs            |  36 +++---
 Emby.Naming/Common/NamingOptions.cs                |  83 ++++++-------
 Emby.Naming/Emby.Naming.csproj                     |   5 +-
 Emby.Naming/TV/EpisodePathParser.cs                |   5 +-
 Emby.Naming/TV/EpisodeResolver.cs                  |  20 +---
 Emby.Naming/TV/SeasonPathParser.cs                 |  39 ++++---
 Emby.Naming/Video/StackResolver.cs                 |  21 ++--
 Emby.Naming/Video/StackResult.cs                   |  17 ---
 Emby.Naming/Video/StubResolver.cs                  |  20 ++--
 Emby.Naming/Video/VideoFileInfo.cs                 |   2 +-
 Emby.Naming/Video/VideoInfo.cs                     |  18 +--
 Emby.Naming/Video/VideoListResolver.cs             |  43 ++++---
 Emby.Naming/Video/VideoResolver.cs                 |  21 ++--
 .../Library/LibraryManager.cs                      |   2 +-
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  |  20 +---
 .../Library/Resolvers/Movies/MovieResolver.cs      |  73 ++++++------
 .../Library/Resolvers/TV/SeasonResolver.cs         |  21 ++--
 .../Library/Resolvers/TV/SeriesResolver.cs         |   2 +-
 Jellyfin.Server/Jellyfin.Server.csproj             |   3 -
 .../Music/MultiDiscAlbumTests.cs                   |   2 +-
 .../Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs  |   3 +-
 tests/Jellyfin.Naming.Tests/Video/StackTests.cs    | 130 ++++++++++-----------
 tests/Jellyfin.Naming.Tests/Video/StubTests.cs     |  10 +-
 27 files changed, 287 insertions(+), 367 deletions(-)
 delete mode 100644 Emby.Naming/Audio/MultiPartResult.cs
 delete mode 100644 Emby.Naming/Video/StackResult.cs

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

diff --git a/Emby.Naming/Audio/AlbumParser.cs b/Emby.Naming/Audio/AlbumParser.cs
index 4975b8e19..b807816eb 100644
--- a/Emby.Naming/Audio/AlbumParser.cs
+++ b/Emby.Naming/Audio/AlbumParser.cs
@@ -19,15 +19,13 @@ namespace Emby.Naming.Audio
             _options = options;
         }
 
-        public MultiPartResult ParseMultiPart(string path)
+        public bool IsMultiPart(string path)
         {
-            var result = new MultiPartResult();
-
             var filename = Path.GetFileName(path);
 
             if (string.IsNullOrEmpty(filename))
             {
-                return result;
+                return false;
             }
 
             // TODO: Move this logic into options object
@@ -57,12 +55,11 @@ namespace Emby.Naming.Audio
 
                 if (int.TryParse(tmp, NumberStyles.Integer, CultureInfo.InvariantCulture, out _))
                 {
-                    result.IsMultiPart = true;
-                    break;
+                    return true;
                 }
             }
 
-            return result;
+            return false;
         }
     }
 }
diff --git a/Emby.Naming/Audio/MultiPartResult.cs b/Emby.Naming/Audio/MultiPartResult.cs
deleted file mode 100644
index 8f68d97fa..000000000
--- a/Emby.Naming/Audio/MultiPartResult.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma warning disable CS1591
-#pragma warning disable SA1600
-
-namespace Emby.Naming.Audio
-{
-    public class MultiPartResult
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the part.
-        /// </summary>
-        /// <value>The part.</value>
-        public string Part { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is multi part.
-        /// </summary>
-        /// <value><c>true</c> if this instance is multi part; otherwise, <c>false</c>.</value>
-        public bool IsMultiPart { get; set; }
-    }
-}
diff --git a/Emby.Naming/AudioBook/AudioBookFileInfo.cs b/Emby.Naming/AudioBook/AudioBookFileInfo.cs
index 769e3d7fa..0bc6ec7e4 100644
--- a/Emby.Naming/AudioBook/AudioBookFileInfo.cs
+++ b/Emby.Naming/AudioBook/AudioBookFileInfo.cs
@@ -32,7 +32,7 @@ namespace Emby.Naming.AudioBook
         public int? ChapterNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets the type.
+        /// Gets or sets a value indicating whether this instance is a directory.
         /// </summary>
         /// <value>The type.</value>
         public bool IsDirectory { get; set; }
diff --git a/Emby.Naming/AudioBook/AudioBookListResolver.cs b/Emby.Naming/AudioBook/AudioBookListResolver.cs
index 97f359285..835e83a08 100644
--- a/Emby.Naming/AudioBook/AudioBookListResolver.cs
+++ b/Emby.Naming/AudioBook/AudioBookListResolver.cs
@@ -39,9 +39,7 @@ namespace Emby.Naming.AudioBook
             var stackResult = new StackResolver(_options)
                 .ResolveAudioBooks(metadata);
 
-            var list = new List<AudioBookInfo>();
-
-            foreach (var stack in stackResult.Stacks)
+            foreach (var stack in stackResult)
             {
                 var stackFiles = stack.Files.Select(i => audioBookResolver.Resolve(i, stack.IsDirectoryStack)).ToList();
                 stackFiles.Sort();
@@ -50,20 +48,9 @@ namespace Emby.Naming.AudioBook
                     Files = stackFiles,
                     Name = stack.Name
                 };
-                list.Add(info);
-            }
-
-            // Whatever files are left, just add them
-            /*list.AddRange(remainingFiles.Select(i => new AudioBookInfo
-            {
-                Files = new List<AudioBookFileInfo> { i },
-                Name = i.,
-                Year = i.Year
-            }));*/
-
-            var orderedList = list.OrderBy(i => i.Name);
 
-            return orderedList;
+                yield return info;
+            }
         }
     }
 }
diff --git a/Emby.Naming/Common/EpisodeExpression.cs b/Emby.Naming/Common/EpisodeExpression.cs
index 30a74fb65..f60f7e84b 100644
--- a/Emby.Naming/Common/EpisodeExpression.cs
+++ b/Emby.Naming/Common/EpisodeExpression.cs
@@ -11,6 +11,24 @@ namespace Emby.Naming.Common
         private string _expression;
         private Regex _regex;
 
+        public EpisodeExpression(string expression, bool byDate)
+        {
+            Expression = expression;
+            IsByDate = byDate;
+            DateTimeFormats = Array.Empty<string>();
+            SupportsAbsoluteEpisodeNumbers = true;
+        }
+
+        public EpisodeExpression(string expression)
+            : this(expression, false)
+        {
+        }
+
+        public EpisodeExpression()
+            : this(null)
+        {
+        }
+
         public string Expression
         {
             get => _expression;
@@ -32,23 +50,5 @@ namespace Emby.Naming.Common
         public string[] DateTimeFormats { get; set; }
 
         public Regex Regex => _regex ?? (_regex = new Regex(Expression, RegexOptions.IgnoreCase | RegexOptions.Compiled));
-
-        public EpisodeExpression(string expression, bool byDate)
-        {
-            Expression = expression;
-            IsByDate = byDate;
-            DateTimeFormats = Array.Empty<string>();
-            SupportsAbsoluteEpisodeNumbers = true;
-        }
-
-        public EpisodeExpression(string expression)
-            : this(expression, false)
-        {
-        }
-
-        public EpisodeExpression()
-            : this(null)
-        {
-        }
     }
 }
diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index 9ce503b8e..1554e61d8 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -11,46 +11,6 @@ namespace Emby.Naming.Common
 {
     public class NamingOptions
     {
-        public string[] AudioFileExtensions { get; set; }
-
-        public string[] AlbumStackingPrefixes { get; set; }
-
-        public string[] SubtitleFileExtensions { get; set; }
-
-        public char[] SubtitleFlagDelimiters { get; set; }
-
-        public string[] SubtitleForcedFlags { get; set; }
-
-        public string[] SubtitleDefaultFlags { get; set; }
-
-        public EpisodeExpression[] EpisodeExpressions { get; set; }
-
-        public string[] EpisodeWithoutSeasonExpressions { get; set; }
-
-        public string[] EpisodeMultiPartExpressions { get; set; }
-
-        public string[] VideoFileExtensions { get; set; }
-
-        public string[] StubFileExtensions { get; set; }
-
-        public string[] AudioBookPartsExpressions { get; set; }
-
-        public StubTypeRule[] StubTypes { get; set; }
-
-        public char[] VideoFlagDelimiters { get; set; }
-
-        public Format3DRule[] Format3DRules { get; set; }
-
-        public string[] VideoFileStackingExpressions { get; set; }
-
-        public string[] CleanDateTimes { get; set; }
-
-        public string[] CleanStrings { get; set; }
-
-        public EpisodeExpression[] MultipleEpisodeExpressions { get; set; }
-
-        public ExtraRule[] VideoExtraRules { get; set; }
-
         public NamingOptions()
         {
             VideoFileExtensions = new[]
@@ -681,11 +641,54 @@ namespace Emby.Naming.Common
             Compile();
         }
 
+        public string[] AudioFileExtensions { get; set; }
+
+        public string[] AlbumStackingPrefixes { get; set; }
+
+        public string[] SubtitleFileExtensions { get; set; }
+
+        public char[] SubtitleFlagDelimiters { get; set; }
+
+        public string[] SubtitleForcedFlags { get; set; }
+
+        public string[] SubtitleDefaultFlags { get; set; }
+
+        public EpisodeExpression[] EpisodeExpressions { get; set; }
+
+        public string[] EpisodeWithoutSeasonExpressions { get; set; }
+
+        public string[] EpisodeMultiPartExpressions { get; set; }
+
+        public string[] VideoFileExtensions { get; set; }
+
+        public string[] StubFileExtensions { get; set; }
+
+        public string[] AudioBookPartsExpressions { get; set; }
+
+        public StubTypeRule[] StubTypes { get; set; }
+
+        public char[] VideoFlagDelimiters { get; set; }
+
+        public Format3DRule[] Format3DRules { get; set; }
+
+        public string[] VideoFileStackingExpressions { get; set; }
+
+        public string[] CleanDateTimes { get; set; }
+
+        public string[] CleanStrings { get; set; }
+
+        public EpisodeExpression[] MultipleEpisodeExpressions { get; set; }
+
+        public ExtraRule[] VideoExtraRules { get; set; }
+
         public Regex[] VideoFileStackingRegexes { get; private set; }
+
         public Regex[] CleanDateTimeRegexes { get; private set; }
+
         public Regex[] CleanStringRegexes { get; private set; }
 
         public Regex[] EpisodeWithoutSeasonRegexes { get; private set; }
+
         public Regex[] EpisodeMultiPartRegexes { get; private set; }
 
         public void Compile()
diff --git a/Emby.Naming/Emby.Naming.csproj b/Emby.Naming/Emby.Naming.csproj
index 900b9694c..4e08170a4 100644
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -4,9 +4,6 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
@@ -27,7 +24,7 @@
 
   <!-- Code Analyzers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <!-- TODO: <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> -->
     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
diff --git a/Emby.Naming/TV/EpisodePathParser.cs b/Emby.Naming/TV/EpisodePathParser.cs
index 6b557d2e1..b97b3137b 100644
--- a/Emby.Naming/TV/EpisodePathParser.cs
+++ b/Emby.Naming/TV/EpisodePathParser.cs
@@ -1,5 +1,6 @@
 #pragma warning disable CS1591
 #pragma warning disable SA1600
+#nullable enable
 
 using System;
 using System.Collections.Generic;
@@ -28,7 +29,7 @@ namespace Emby.Naming.TV
                 path += ".mp4";
             }
 
-            EpisodePathParserResult result = null;
+            EpisodePathParserResult? result = null;
 
             foreach (var expression in _options.EpisodeExpressions)
             {
@@ -136,7 +137,7 @@ namespace Emby.Naming.TV
                         // It avoids erroneous parsing of something like "series-s09e14-1080p.mkv" as a multi-episode from E14 to E108
                         int nextIndex = endingNumberGroup.Index + endingNumberGroup.Length;
                         if (nextIndex >= name.Length
-                            || "0123456789iIpP".IndexOf(name[nextIndex]) == -1)
+                            || !"0123456789iIpP".Contains(name[nextIndex], StringComparison.Ordinal))
                         {
                             if (int.TryParse(endingNumberGroup.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out num))
                             {
diff --git a/Emby.Naming/TV/EpisodeResolver.cs b/Emby.Naming/TV/EpisodeResolver.cs
index 5e115fc75..57659ee13 100644
--- a/Emby.Naming/TV/EpisodeResolver.cs
+++ b/Emby.Naming/TV/EpisodeResolver.cs
@@ -1,5 +1,6 @@
 #pragma warning disable CS1591
 #pragma warning disable SA1600
+#nullable enable
 
 using System;
 using System.IO;
@@ -18,7 +19,7 @@ namespace Emby.Naming.TV
             _options = options;
         }
 
-        public EpisodeInfo Resolve(
+        public EpisodeInfo? Resolve(
             string path,
             bool isDirectory,
             bool? isNamed = null,
@@ -26,14 +27,9 @@ namespace Emby.Naming.TV
             bool? supportsAbsoluteNumbers = null,
             bool fillExtendedInfo = true)
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-
             bool isStub = false;
-            string container = null;
-            string stubType = null;
+            string? container = null;
+            string? stubType = null;
 
             if (!isDirectory)
             {
@@ -41,17 +37,13 @@ namespace Emby.Naming.TV
                 // Check supported extensions
                 if (!_options.VideoFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
                 {
-                    var stubResult = StubResolver.ResolveFile(path, _options);
-
-                    isStub = stubResult.IsStub;
-
                     // It's not supported. Check stub extensions
-                    if (!isStub)
+                    if (!StubResolver.TryResolveFile(path, _options, out stubType))
                     {
                         return null;
                     }
 
-                    stubType = stubResult.StubType;
+                    isStub = true;
                 }
 
                 container = extension.TrimStart('.');
diff --git a/Emby.Naming/TV/SeasonPathParser.cs b/Emby.Naming/TV/SeasonPathParser.cs
index e5f90e966..7715a16a4 100644
--- a/Emby.Naming/TV/SeasonPathParser.cs
+++ b/Emby.Naming/TV/SeasonPathParser.cs
@@ -8,9 +8,24 @@ using System.Linq;
 
 namespace Emby.Naming.TV
 {
-    public class SeasonPathParser
+    public static class SeasonPathParser
     {
-        public SeasonPathParserResult Parse(string path, bool supportSpecialAliases, bool supportNumericSeasonFolders)
+        /// <summary>
+        /// A season folder must contain one of these somewhere in the name.
+        /// </summary>
+        private static readonly string[] _seasonFolderNames =
+        {
+            "season",
+            "sæson",
+            "temporada",
+            "saison",
+            "staffel",
+            "series",
+            "сезон",
+            "stagione"
+        };
+
+        public static SeasonPathParserResult Parse(string path, bool supportSpecialAliases, bool supportNumericSeasonFolders)
         {
             var result = new SeasonPathParserResult();
 
@@ -27,21 +42,6 @@ namespace Emby.Naming.TV
             return result;
         }
 
-        /// <summary>
-        /// A season folder must contain one of these somewhere in the name.
-        /// </summary>
-        private static readonly string[] _seasonFolderNames =
-        {
-            "season",
-            "sæson",
-            "temporada",
-            "saison",
-            "staffel",
-            "series",
-            "сезон",
-            "stagione"
-        };
-
         /// <summary>
         /// Gets the season number from path.
         /// </summary>
@@ -150,6 +150,7 @@ namespace Emby.Naming.TV
                         {
                             numericStart = i;
                         }
+
                         length++;
                     }
                 }
@@ -161,11 +162,11 @@ namespace Emby.Naming.TV
                 }
 
                 var currentChar = path[i];
-                if (currentChar.Equals('('))
+                if (currentChar == '(')
                 {
                     hasOpenParenth = true;
                 }
-                else if (currentChar.Equals(')'))
+                else if (currentChar == ')')
                 {
                     hasOpenParenth = false;
                 }
diff --git a/Emby.Naming/Video/StackResolver.cs b/Emby.Naming/Video/StackResolver.cs
index e7a769ae6..8f210fa45 100644
--- a/Emby.Naming/Video/StackResolver.cs
+++ b/Emby.Naming/Video/StackResolver.cs
@@ -20,7 +20,7 @@ namespace Emby.Naming.Video
             _options = options;
         }
 
-        public StackResult ResolveDirectories(IEnumerable<string> files)
+        public IEnumerable<FileStack> ResolveDirectories(IEnumerable<string> files)
         {
             return Resolve(files.Select(i => new FileSystemMetadata
             {
@@ -29,7 +29,7 @@ namespace Emby.Naming.Video
             }));
         }
 
-        public StackResult ResolveFiles(IEnumerable<string> files)
+        public IEnumerable<FileStack> ResolveFiles(IEnumerable<string> files)
         {
             return Resolve(files.Select(i => new FileSystemMetadata
             {
@@ -38,9 +38,8 @@ namespace Emby.Naming.Video
             }));
         }
 
-        public StackResult ResolveAudioBooks(IEnumerable<FileSystemMetadata> files)
+        public IEnumerable<FileStack> ResolveAudioBooks(IEnumerable<FileSystemMetadata> files)
         {
-            var result = new StackResult();
             foreach (var directory in files.GroupBy(file => file.IsDirectory ? file.FullName : Path.GetDirectoryName(file.FullName)))
             {
                 var stack = new FileStack()
@@ -58,20 +57,16 @@ namespace Emby.Naming.Video
                     stack.Files.Add(file.FullName);
                 }
 
-                result.Stacks.Add(stack);
+                yield return stack;
             }
-
-            return result;
         }
 
-        public StackResult Resolve(IEnumerable<FileSystemMetadata> files)
+        public IEnumerable<FileStack> Resolve(IEnumerable<FileSystemMetadata> files)
         {
-            var result = new StackResult();
-
             var resolver = new VideoResolver(_options);
 
             var list = files
-                .Where(i => i.IsDirectory || (resolver.IsVideoFile(i.FullName) || resolver.IsStubFile(i.FullName)))
+                .Where(i => i.IsDirectory || resolver.IsVideoFile(i.FullName) || resolver.IsStubFile(i.FullName))
                 .OrderBy(i => i.FullName)
                 .ToList();
 
@@ -191,14 +186,12 @@ namespace Emby.Naming.Video
 
                     if (stack.Files.Count > 1)
                     {
-                        result.Stacks.Add(stack);
+                        yield return stack;
                         i += stack.Files.Count - 1;
                         break;
                     }
                 }
             }
-
-            return result;
         }
 
         private string GetRegexInput(FileSystemMetadata file)
diff --git a/Emby.Naming/Video/StackResult.cs b/Emby.Naming/Video/StackResult.cs
deleted file mode 100644
index 31ef2d69c..000000000
--- a/Emby.Naming/Video/StackResult.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma warning disable CS1591
-#pragma warning disable SA1600
-
-using System.Collections.Generic;
-
-namespace Emby.Naming.Video
-{
-    public class StackResult
-    {
-        public List<FileStack> Stacks { get; set; }
-
-        public StackResult()
-        {
-            Stacks = new List<FileStack>();
-        }
-    }
-}
diff --git a/Emby.Naming/Video/StubResolver.cs b/Emby.Naming/Video/StubResolver.cs
index 95868e89d..4024d6d59 100644
--- a/Emby.Naming/Video/StubResolver.cs
+++ b/Emby.Naming/Video/StubResolver.cs
@@ -1,5 +1,6 @@
 #pragma warning disable CS1591
 #pragma warning disable SA1600
+#nullable enable
 
 using System;
 using System.IO;
@@ -10,25 +11,22 @@ namespace Emby.Naming.Video
 {
     public static class StubResolver
     {
-        public static StubResult ResolveFile(string path, NamingOptions options)
+        public static bool TryResolveFile(string path, NamingOptions options, out string? stubType)
         {
+            stubType = default;
+
             if (path == null)
             {
-                return default;
+                return false;
             }
 
             var extension = Path.GetExtension(path);
 
             if (!options.StubFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
             {
-                return default;
+                return false;
             }
 
-            var result = new StubResult()
-            {
-                IsStub = true
-            };
-
             path = Path.GetFileNameWithoutExtension(path);
             var token = Path.GetExtension(path).TrimStart('.');
 
@@ -36,12 +34,12 @@ namespace Emby.Naming.Video
             {
                 if (string.Equals(rule.Token, token, StringComparison.OrdinalIgnoreCase))
                 {
-                    result.StubType = rule.StubType;
-                    break;
+                    stubType = rule.StubType;
+                    return true;
                 }
             }
 
-            return result;
+            return true;
         }
     }
 }
diff --git a/Emby.Naming/Video/VideoFileInfo.cs b/Emby.Naming/Video/VideoFileInfo.cs
index 90c798da1..aa4f3a35c 100644
--- a/Emby.Naming/Video/VideoFileInfo.cs
+++ b/Emby.Naming/Video/VideoFileInfo.cs
@@ -68,7 +68,7 @@ namespace Emby.Naming.Video
         public string StubType { get; set; }
 
         /// <summary>
-        /// Gets or sets the type.
+        /// Gets or sets a value indicating whether this instance is a directory.
         /// </summary>
         /// <value>The type.</value>
         public bool IsDirectory { get; set; }
diff --git a/Emby.Naming/Video/VideoInfo.cs b/Emby.Naming/Video/VideoInfo.cs
index a585bb99a..ea74c40e2 100644
--- a/Emby.Naming/Video/VideoInfo.cs
+++ b/Emby.Naming/Video/VideoInfo.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace Emby.Naming.Video
@@ -10,11 +11,14 @@ namespace Emby.Naming.Video
         /// <summary>
         /// Initializes a new instance of the <see cref="VideoInfo" /> class.
         /// </summary>
-        public VideoInfo()
+        /// <param name="name">The name.</param>
+        public VideoInfo(string name)
         {
-            Files = new List<VideoFileInfo>();
-            Extras = new List<VideoFileInfo>();
-            AlternateVersions = new List<VideoFileInfo>();
+            Name = name;
+
+            Files = Array.Empty<VideoFileInfo>();
+            Extras = Array.Empty<VideoFileInfo>();
+            AlternateVersions = Array.Empty<VideoFileInfo>();
         }
 
         /// <summary>
@@ -33,18 +37,18 @@ namespace Emby.Naming.Video
         /// Gets or sets the files.
         /// </summary>
         /// <value>The files.</value>
-        public List<VideoFileInfo> Files { get; set; }
+        public IReadOnlyList<VideoFileInfo> Files { get; set; }
 
         /// <summary>
         /// Gets or sets the extras.
         /// </summary>
         /// <value>The extras.</value>
-        public List<VideoFileInfo> Extras { get; set; }
+        public IReadOnlyList<VideoFileInfo> Extras { get; set; }
 
         /// <summary>
         /// Gets or sets the alternate versions.
         /// </summary>
         /// <value>The alternate versions.</value>
-        public List<VideoFileInfo> AlternateVersions { get; set; }
+        public IReadOnlyList<VideoFileInfo> AlternateVersions { get; set; }
     }
 }
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index 87498000c..136658353 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -41,20 +41,19 @@ namespace Emby.Naming.Video
                 });
 
             var stackResult = new StackResolver(_options)
-                .Resolve(nonExtras);
+                .Resolve(nonExtras).ToList();
 
             var remainingFiles = videoInfos
-                .Where(i => !stackResult.Stacks.Any(s => s.ContainsFile(i.Path, i.IsDirectory)))
+                .Where(i => !stackResult.Any(s => s.ContainsFile(i.Path, i.IsDirectory)))
                 .ToList();
 
             var list = new List<VideoInfo>();
 
-            foreach (var stack in stackResult.Stacks)
+            foreach (var stack in stackResult)
             {
-                var info = new VideoInfo
+                var info = new VideoInfo(stack.Name)
                 {
-                    Files = stack.Files.Select(i => videoResolver.Resolve(i, stack.IsDirectoryStack)).ToList(),
-                    Name = stack.Name
+                    Files = stack.Files.Select(i => videoResolver.Resolve(i, stack.IsDirectoryStack)).ToList()
                 };
 
                 info.Year = info.Files[0].Year;
@@ -85,10 +84,9 @@ namespace Emby.Naming.Video
 
             foreach (var media in standaloneMedia)
             {
-                var info = new VideoInfo
+                var info = new VideoInfo(media.Name)
                 {
-                    Files = new List<VideoFileInfo> { media },
-                    Name = media.Name
+                    Files = new List<VideoFileInfo> { media }
                 };
 
                 info.Year = info.Files[0].Year;
@@ -128,7 +126,8 @@ namespace Emby.Naming.Video
                             .Except(extras)
                             .ToList();
 
-                        info.Extras.AddRange(extras);
+                        extras.AddRange(info.Extras);
+                        info.Extras = extras;
                     }
                 }
 
@@ -141,7 +140,8 @@ namespace Emby.Naming.Video
                     .Except(extrasByFileName)
                     .ToList();
 
-                info.Extras.AddRange(extrasByFileName);
+                extrasByFileName.AddRange(info.Extras);
+                info.Extras = extrasByFileName;
             }
 
             // If there's only one video, accept all trailers
@@ -152,7 +152,8 @@ namespace Emby.Naming.Video
                     .Where(i => i.ExtraType == ExtraType.Trailer)
                     .ToList();
 
-                list[0].Extras.AddRange(trailers);
+                trailers.AddRange(list[0].Extras);
+                list[0].Extras = trailers;
 
                 remainingFiles = remainingFiles
                     .Except(trailers)
@@ -160,14 +161,13 @@ namespace Emby.Naming.Video
             }
 
             // Whatever files are left, just add them
-            list.AddRange(remainingFiles.Select(i => new VideoInfo
+            list.AddRange(remainingFiles.Select(i => new VideoInfo(i.Name)
             {
                 Files = new List<VideoFileInfo> { i },
-                Name = i.Name,
                 Year = i.Year
             }));
 
-            return list.OrderBy(i => i.Name);
+            return list;
         }
 
         private IEnumerable<VideoInfo> GetVideosGroupedByVersion(List<VideoInfo> videos)
@@ -191,9 +191,18 @@ namespace Emby.Naming.Video
 
                 list.Add(ordered[0]);
 
-                list[0].AlternateVersions = ordered.Skip(1).Select(i => i.Files[0]).ToList();
+                var alternateVersionsLen = ordered.Count - 1;
+                var alternateVersions = new VideoFileInfo[alternateVersionsLen];
+                for (int i = 0; i < alternateVersionsLen; i++)
+                {
+                    alternateVersions[i] = ordered[i + 1].Files[0];
+                }
+
+                list[0].AlternateVersions = alternateVersions;
                 list[0].Name = folderName;
-                list[0].Extras.AddRange(ordered.Skip(1).SelectMany(i => i.Extras));
+                var extras = ordered.Skip(1).SelectMany(i => i.Extras).ToList();
+                extras.AddRange(list[0].Extras);
+                list[0].Extras = extras;
 
                 return list;
             }
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index f93db2486..699bbe40a 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -1,5 +1,6 @@
 #pragma warning disable CS1591
 #pragma warning disable SA1600
+#nullable enable
 
 using System;
 using System.IO;
@@ -22,7 +23,7 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns>VideoFileInfo.</returns>
-        public VideoFileInfo ResolveDirectory(string path)
+        public VideoFileInfo? ResolveDirectory(string path)
         {
             return Resolve(path, true);
         }
@@ -32,7 +33,7 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns>VideoFileInfo.</returns>
-        public VideoFileInfo ResolveFile(string path)
+        public VideoFileInfo? ResolveFile(string path)
         {
             return Resolve(path, false);
         }
@@ -42,10 +43,10 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <param name="path">The path.</param>
         /// <param name="isDirectory">if set to <c>true</c> [is folder].</param>
-        /// <param name="parseName">Whether or not the name should be parsed for info</param>
+        /// <param name="parseName">Whether or not the name should be parsed for info.</param>
         /// <returns>VideoFileInfo.</returns>
         /// <exception cref="ArgumentNullException"><c>path</c> is <c>null</c>.</exception>
-        public VideoFileInfo Resolve(string path, bool isDirectory, bool parseName = true)
+        public VideoFileInfo? Resolve(string path, bool isDirectory, bool parseName = true)
         {
             if (string.IsNullOrEmpty(path))
             {
@@ -53,8 +54,8 @@ namespace Emby.Naming.Video
             }
 
             bool isStub = false;
-            string container = null;
-            string stubType = null;
+            string? container = null;
+            string? stubType = null;
 
             if (!isDirectory)
             {
@@ -63,17 +64,13 @@ namespace Emby.Naming.Video
                 // Check supported extensions
                 if (!_options.VideoFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
                 {
-                    var stubResult = StubResolver.ResolveFile(path, _options);
-
-                    isStub = stubResult.IsStub;
-
                     // It's not supported. Check stub extensions
-                    if (!isStub)
+                    if (!StubResolver.TryResolveFile(path, _options, out stubType))
                     {
                         return null;
                     }
 
-                    stubType = stubResult.StubType;
+                    isStub = true;
                 }
 
                 container = extension.TrimStart('.');
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 6fb623554..5c04631da 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2384,7 +2384,7 @@ namespace Emby.Server.Implementations.Library
 
         public int? GetSeasonNumberFromPath(string path)
         {
-            return new SeasonPathParser().Parse(path, true, true).SeasonNumber;
+            return SeasonPathParser.Parse(path, true, true).SeasonNumber;
         }
 
         public bool FillMissingEpisodeNumbersFromPath(Episode episode, bool forceRefresh)
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 4a2d210d5..9f858f98d 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -76,7 +76,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         }
 
         /// <summary>
-        /// Determine if the supplied file data points to a music album
+        /// Determine if the supplied file data points to a music album.
         /// </summary>
         public bool IsMusicAlbum(string path, IDirectoryService directoryService, LibraryOptions libraryOptions)
         {
@@ -84,7 +84,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         }
 
         /// <summary>
-        /// Determine if the supplied resolve args should be considered a music album
+        /// Determine if the supplied resolve args should be considered a music album.
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns><c>true</c> if [is music album] [the specified args]; otherwise, <c>false</c>.</returns>
@@ -104,7 +104,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         }
 
         /// <summary>
-        /// Determine if the supplied list contains what we should consider music
+        /// Determine if the supplied list contains what we should consider music.
         /// </summary>
         private bool ContainsMusic(
             IEnumerable<FileSystemMetadata> list,
@@ -118,6 +118,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             var discSubfolderCount = 0;
             var notMultiDisc = false;
 
+            var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
+            var parser = new AlbumParser(namingOptions);
             foreach (var fileSystemInfo in list)
             {
                 if (fileSystemInfo.IsDirectory)
@@ -134,7 +136,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
                         if (hasMusic)
                         {
-                            if (IsMultiDiscFolder(path, libraryOptions))
+                            if (parser.IsMultiPart(path))
                             {
                                 logger.LogDebug("Found multi-disc folder: " + path);
                                 discSubfolderCount++;
@@ -165,15 +167,5 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
             return discSubfolderCount > 0;
         }
-
-        private bool IsMultiDiscFolder(string path, LibraryOptions libraryOptions)
-        {
-            var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
-
-            var parser = new AlbumParser(namingOptions);
-            var result = parser.ParseMultiPart(path);
-
-            return result.IsMultiPart;
-        }
     }
 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 6c7690055..08db168bc 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -21,6 +21,28 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
     /// </summary>
     public class MovieResolver : BaseVideoResolver<Video>, IMultiItemResolver
     {
+        private string[] _validCollectionTypes = new[]
+        {
+                CollectionType.Movies,
+                CollectionType.HomeVideos,
+                CollectionType.MusicVideos,
+                CollectionType.Movies,
+                CollectionType.Photos
+        };
+
+        private readonly IImageProcessor _imageProcessor;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovieResolver"/> class.
+        /// </summary>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="imageProcessor">The image processor.</param>
+        public MovieResolver(ILibraryManager libraryManager, IImageProcessor imageProcessor)
+            : base(libraryManager)
+        {
+            _imageProcessor = imageProcessor;
+        }
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
@@ -144,7 +166,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
             foreach (var video in resolverResult)
             {
-                var firstVideo = video.Files.First();
+                var firstVideo = video.Files[0];
 
                 var videoItem = new T
                 {
@@ -230,7 +252,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     // Owned items will be caught by the plain video resolver
                     if (args.Parent == null)
                     {
-                        //return FindMovie<Video>(args.Path, args.Parent, files, args.DirectoryService, collectionType);
+                        // return FindMovie<Video>(args.Path, args.Parent, files, args.DirectoryService, collectionType);
                         return null;
                     }
 
@@ -275,7 +297,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             {
                 item = ResolveVideo<Movie>(args, true);
             }
-
             else if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
             {
@@ -319,7 +340,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
         {
             if (item is Movie || item is MusicVideo)
             {
-                //we need to only look at the name of this actual item (not parents)
+                // We need to only look at the name of this actual item (not parents)
                 var justName = item.IsInMixedFolder ? Path.GetFileName(item.Path) : Path.GetFileName(item.ContainingFolderPath);
 
                 if (!string.IsNullOrEmpty(justName))
@@ -347,9 +368,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
         }
 
         /// <summary>
-        /// Finds a movie based on a child file system entries
+        /// Finds a movie based on a child file system entries.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
         /// <returns>Movie.</returns>
         private T FindMovie<T>(ItemResolveArgs args, string path, Folder parent, List<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, string collectionType, bool parseName)
             where T : Video, new()
@@ -377,6 +397,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                         Set3DFormat(movie);
                         return movie;
                     }
+
                     if (IsBluRayDirectory(child.FullName, filename, directoryService))
                     {
                         var movie = new T
@@ -407,9 +428,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             // TODO: Allow GetMultiDiscMovie in here
-            const bool supportsMultiVersion = true;
+            const bool SupportsMultiVersion = true;
 
-            var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
+            var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, SupportsMultiVersion, collectionType, parseName) ??
                 new MultiItemResolverResult();
 
             if (result.Items.Count == 1)
@@ -437,7 +458,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
         /// <summary>
         /// Gets the multi disc movie.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
         /// <param name="multiDiscFolders">The folders.</param>
         /// <param name="directoryService">The directory service.</param>
         /// <returns>``0.</returns>
@@ -451,7 +471,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 var subFileEntries = directoryService.GetFileSystemEntries(i);
 
                 var subfolders = subFileEntries
-                 .Where(e => e.IsDirectory)
+                    .Where(e => e.IsDirectory)
                     .ToList();
 
                 if (subfolders.Any(s => IsDvdDirectory(s.FullName, s.Name, directoryService)))
@@ -459,6 +479,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     videoTypes.Add(VideoType.Dvd);
                     return true;
                 }
+
                 if (subfolders.Any(s => IsBluRayDirectory(s.FullName, s.Name, directoryService)))
                 {
                     videoTypes.Add(VideoType.BluRay);
@@ -476,7 +497,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 }
 
                 return false;
-
             }).OrderBy(i => i).ToList();
 
             // If different video types were found, don't allow this
@@ -491,11 +511,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
-            var resolver = new StackResolver(namingOptions);
 
-            var result = resolver.ResolveDirectories(folderPaths);
+            var result = new StackResolver(namingOptions).ResolveDirectories(folderPaths).ToList();
 
-            if (result.Stacks.Count != 1)
+            if (result.Count != 1)
             {
                 return null;
             }
@@ -508,7 +527,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
                 VideoType = videoTypes[0],
 
-                Name = result.Stacks[0].Name
+                Name = result[0].Name
             };
 
             SetIsoType(returnVideo);
@@ -516,15 +535,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             return returnVideo;
         }
 
-        private string[] ValidCollectionTypes = new[]
-        {
-                CollectionType.Movies,
-                CollectionType.HomeVideos,
-                CollectionType.MusicVideos,
-                CollectionType.Movies,
-                CollectionType.Photos
-        };
-
         private bool IsInvalid(Folder parent, string collectionType)
         {
             if (parent != null)
@@ -540,20 +550,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 return false;
             }
 
-            return !ValidCollectionTypes.Contains(collectionType, StringComparer.OrdinalIgnoreCase);
-        }
-
-        private IImageProcessor _imageProcessor;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MovieResolver"/> class.
-        /// </summary>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="imageProcessor">The image processor.</param>
-        public MovieResolver(ILibraryManager libraryManager, IImageProcessor imageProcessor)
-            : base(libraryManager)
-        {
-            _imageProcessor = imageProcessor;
+            return !_validCollectionTypes.Contains(collectionType, StringComparer.OrdinalIgnoreCase);
         }
     }
 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index 3b9e48d97..3e88c0287 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -9,17 +9,12 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.Library.Resolvers.TV
 {
     /// <summary>
-    /// Class SeasonResolver
+    /// Class SeasonResolver.
     /// </summary>
     public class SeasonResolver : FolderResolver<Season>
     {
-        /// <summary>
-        /// The _config
-        /// </summary>
         private readonly IServerConfigurationManager _config;
-
         private readonly ILibraryManager _libraryManager;
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
         private readonly ILocalizationManager _localization;
         private readonly ILogger _logger;
 
@@ -45,14 +40,13 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// <returns>Season.</returns>
         protected override Season Resolve(ItemResolveArgs args)
         {
-            if (args.Parent is Series && args.IsDirectory)
+            if (args.Parent is Series series && args.IsDirectory)
             {
                 var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
-                var series = ((Series)args.Parent);
 
                 var path = args.Path;
 
-                var seasonParserResult = new SeasonPathParser().Parse(path, true, true);
+                var seasonParserResult = SeasonPathParser.Parse(path, true, true);
 
                 var season = new Season
                 {
@@ -74,7 +68,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                     {
                         if (episodeInfo.EpisodeNumber.HasValue && episodeInfo.SeasonNumber.HasValue)
                         {
-                            _logger.LogDebug("Found folder underneath series with episode number: {0}. Season {1}. Episode {2}",
+                            _logger.LogDebug(
+                                "Found folder underneath series with episode number: {0}. Season {1}. Episode {2}",
                                 path,
                                 episodeInfo.SeasonNumber.Value,
                                 episodeInfo.EpisodeNumber.Value);
@@ -90,7 +85,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                     season.Name = seasonNumber == 0 ?
                         args.LibraryOptions.SeasonZeroDisplayName :
-                        string.Format(_localization.GetLocalizedString("NameSeasonNumber"), seasonNumber.ToString(UsCulture), args.GetLibraryOptions().PreferredMetadataLanguage);
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            _localization.GetLocalizedString("NameSeasonNumber"),
+                            seasonNumber,
+                            args.GetLibraryOptions().PreferredMetadataLanguage);
 
                 }
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index e39d85bc9..4ee30b475 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -203,7 +203,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// <returns><c>true</c> if [is season folder] [the specified path]; otherwise, <c>false</c>.</returns>
         private static bool IsSeasonFolder(string path, bool isTvContentType, ILibraryManager libraryManager)
         {
-            var seasonNumber = new SeasonPathParser().Parse(path, isTvContentType, isTvContentType).SeasonNumber;
+            var seasonNumber = SeasonPathParser.Parse(path, isTvContentType, isTvContentType).SeasonNumber;
 
             return seasonNumber.HasValue;
         }
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 62bf5b0fb..2492ee214 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -6,9 +6,6 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
index a79e2cf61..9a4b0b542 100644
--- a/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
@@ -60,7 +60,7 @@ namespace Jellyfin.Naming.Tests.Music
         {
             var parser = new AlbumParser(new NamingOptions());
 
-            return parser.ParseMultiPart(path).IsMultiPart;
+            return parser.IsMultiPart(path);
         }
     }
 }
diff --git a/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs b/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
index ffa8d3483..df683fc34 100644
--- a/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
@@ -103,8 +103,7 @@ namespace Jellyfin.Naming.Tests.TV
 
         private int? GetSeasonNumberFromPath(string path)
         {
-            var result = new SeasonPathParser()
-                .Parse(path, true, true);
+            var result = SeasonPathParser.Parse(path, true, true);
 
             return result.SeasonNumber;
         }
diff --git a/tests/Jellyfin.Naming.Tests/Video/StackTests.cs b/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
index 5c121d738..3e0cbaf0c 100644
--- a/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
@@ -1,4 +1,5 @@
-using Emby.Naming.Common;
+using System.Linq;
+using Emby.Naming.Common;
 using Emby.Naming.Video;
 using MediaBrowser.Model.IO;
 using Xunit;
@@ -21,10 +22,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
-            TestStackInfo(result.Stacks[0], "Bad Boys (2006)", 4);
+            Assert.Single(result);
+            TestStackInfo(result[0], "Bad Boys (2006)", 4);
         }
 
         [Fact]
@@ -38,9 +39,9 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Empty(result.Stacks);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -54,9 +55,9 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Empty(result.Stacks);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -70,9 +71,9 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Empty(result.Stacks);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -86,9 +87,9 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Empty(result.Stacks);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -102,9 +103,8 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
-
-            Assert.Empty(result.Stacks);
+            var result = resolver.ResolveFiles(files).ToList();
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -119,9 +119,9 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Empty(result.Stacks);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -135,10 +135,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
-            TestStackInfo(result.Stacks[0], "300 2006", 2);
+            Assert.Single(result);
+            TestStackInfo(result[0], "300 2006", 2);
         }
 
         [Fact]
@@ -155,10 +155,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
-            TestStackInfo(result.Stacks[0], "Bad Boys (2006).stv.unrated.multi.1080p.bluray.x264-rough", 4);
+            Assert.Single(result);
+            TestStackInfo(result[0], "Bad Boys (2006).stv.unrated.multi.1080p.bluray.x264-rough", 4);
         }
 
         [Fact]
@@ -175,9 +175,9 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Empty(result.Stacks);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -194,10 +194,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
-            TestStackInfo(result.Stacks[0], "300 (2006)", 4);
+            Assert.Single(result);
+            TestStackInfo(result[0], "300 (2006)", 4);
         }
 
         [Fact]
@@ -214,10 +214,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
-            TestStackInfo(result.Stacks[0], "Bad Boys (2006)", 3);
+            Assert.Single(result);
+            TestStackInfo(result[0], "Bad Boys (2006)", 3);
         }
 
         [Fact]
@@ -238,11 +238,11 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Equal(2, result.Stacks.Count);
-            TestStackInfo(result.Stacks[1], "Bad Boys (2006)", 4);
-            TestStackInfo(result.Stacks[0], "300 (2006)", 3);
+            Assert.Equal(2, result.Count);
+            TestStackInfo(result[1], "Bad Boys (2006)", 4);
+            TestStackInfo(result[0], "300 (2006)", 3);
         }
 
         [Fact]
@@ -256,10 +256,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveDirectories(files);
+            var result = resolver.ResolveDirectories(files).ToList();
 
-            Assert.Single(result.Stacks);
-            TestStackInfo(result.Stacks[0], "blah blah", 2);
+            Assert.Single(result);
+            TestStackInfo(result[0], "blah blah", 2);
         }
 
         [Fact]
@@ -275,11 +275,11 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
+            Assert.Single(result);
 
-            TestStackInfo(result.Stacks[0], "300", 3);
+            TestStackInfo(result[0], "300", 3);
         }
 
         [Fact]
@@ -297,12 +297,12 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Equal(2, result.Stacks.Count);
+            Assert.Equal(2, result.Count);
 
-            TestStackInfo(result.Stacks[0], "300", 2);
-            TestStackInfo(result.Stacks[1], "Avengers", 3);
+            TestStackInfo(result[0], "300", 2);
+            TestStackInfo(result[1], "Avengers", 3);
         }
 
         [Fact]
@@ -328,13 +328,13 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Equal(3, result.Stacks.Count);
+            Assert.Equal(3, result.Count);
 
-            TestStackInfo(result.Stacks[0], "300 (2006)", 4);
-            TestStackInfo(result.Stacks[1], "300", 3);
-            TestStackInfo(result.Stacks[2], "Bad Boys (2006)", 4);
+            TestStackInfo(result[0], "300 (2006)", 4);
+            TestStackInfo(result[1], "300", 3);
+            TestStackInfo(result[2], "Bad Boys (2006)", 4);
         }
 
         [Fact]
@@ -354,11 +354,11 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
+            Assert.Single(result);
 
-            TestStackInfo(result.Stacks[0], "300 (2006)", 4);
+            TestStackInfo(result[0], "300 (2006)", 4);
         }
 
         [Fact]
@@ -375,11 +375,11 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.Resolve(files);
+            var result = resolver.Resolve(files).ToList();
 
-            Assert.Equal(2, result.Stacks.Count);
-            TestStackInfo(result.Stacks[0], "300 (2006)", 3);
-            TestStackInfo(result.Stacks[1], "Bad Boys (2006)", 2);
+            Assert.Equal(2, result.Count);
+            TestStackInfo(result[0], "300 (2006)", 3);
+            TestStackInfo(result[1], "Bad Boys (2006)", 2);
         }
 
         [Fact]
@@ -397,9 +397,9 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Empty(result.Stacks);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -414,10 +414,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveFiles(files);
+            var result = resolver.ResolveFiles(files).ToList();
 
-            Assert.Single(result.Stacks);
-            Assert.Equal(2, result.Stacks[0].Files.Count);
+            Assert.Single(result);
+            Assert.Equal(2, result[0].Files.Count);
         }
 
         [Fact]
@@ -432,10 +432,10 @@ namespace Jellyfin.Naming.Tests.Video
 
             var resolver = GetResolver();
 
-            var result = resolver.ResolveDirectories(files);
+            var result = resolver.ResolveDirectories(files).ToList();
 
-            Assert.Single(result.Stacks);
-            Assert.Equal(2, result.Stacks[0].Files.Count);
+            Assert.Single(result);
+            Assert.Equal(2, result[0].Files.Count);
         }
 
         private void TestStackInfo(FileStack stack, string name, int fileCount)
diff --git a/tests/Jellyfin.Naming.Tests/Video/StubTests.cs b/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
index 96fa8c5a5..c06bb6bf9 100644
--- a/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
@@ -38,17 +38,17 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var options = new NamingOptions();
 
-            var resultStubType = StubResolver.ResolveFile(path, options);
+            var isStubResult = StubResolver.TryResolveFile(path, options, out var stubTypeResult);
 
-            Assert.Equal(isStub, resultStubType.IsStub);
+            Assert.Equal(isStub, isStubResult);
 
-            if (stubType == null)
+            if (isStub)
             {
-                Assert.Null(resultStubType.StubType);
+                Assert.Equal(stubType, stubTypeResult);
             }
             else
             {
-                Assert.Equal(stubType, resultStubType.StubType, true);
+                Assert.Null(stubTypeResult);
             }
         }
     }
-- 
cgit v1.2.3


From acc1846e3e40f800f3f2605c010d492e2612ee31 Mon Sep 17 00:00:00 2001
From: Bond_009 <Bond.009@outlook.com>
Date: Fri, 31 Jan 2020 22:56:24 +0100
Subject: Allow changing capitalization of usernames

---
 Emby.Server.Implementations/Library/UserManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 656eeb145..fcf3ccede 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -667,7 +667,7 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentException("Invalid username", nameof(newName));
             }
 
-            if (user.Name.Equals(newName, StringComparison.OrdinalIgnoreCase))
+            if (user.Name.Equals(newName, StringComparison.Ordinal))
             {
                 throw new ArgumentException("The new and old names must be different.");
             }
-- 
cgit v1.2.3


From afe9ed977b9b1fe83cb0132ddf753040a4bb95e3 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 1 Feb 2020 22:44:27 +0900
Subject: improve scan progress and fix a few bugs

---
 .../Library/LibraryManager.cs                      | 22 ++++++++++------------
 Emby.Server.Implementations/Library/UserManager.cs |  5 +++--
 .../Session/SessionManager.cs                      | 18 +++++++++++-------
 MediaBrowser.Api/Session/SessionsService.cs        |  4 ++--
 MediaBrowser.Api/UserService.cs                    |  4 ++--
 MediaBrowser.Controller/Session/SessionInfo.cs     | 10 ++--------
 6 files changed, 30 insertions(+), 33 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 6fb623554..9d244b74c 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -710,10 +710,10 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Creates the root media folder
+        /// Creates the root media folder.
         /// </summary>
         /// <returns>AggregateFolder.</returns>
-        /// <exception cref="InvalidOperationException">Cannot create the root folder until plugins have loaded</exception>
+        /// <exception cref="InvalidOperationException">Cannot create the root folder until plugins have loaded.</exception>
         public AggregateFolder CreateRootFolder()
         {
             var rootFolderPath = ConfigurationManager.ApplicationPaths.RootFolderPath;
@@ -824,7 +824,6 @@ namespace Emby.Server.Implementations.Library
         {
             // If this returns multiple items it could be tricky figuring out which one is correct.
             // In most cases, the newest one will be and the others obsolete but not yet cleaned up
-
             if (string.IsNullOrEmpty(path))
             {
                 throw new ArgumentNullException(nameof(path));
@@ -844,7 +843,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Person
+        /// Gets the person.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{Person}.</returns>
@@ -854,7 +853,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Studio
+        /// Gets the studio.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{Studio}.</returns>
@@ -879,7 +878,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Genre
+        /// Gets the genre.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{Genre}.</returns>
@@ -889,7 +888,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets the genre.
+        /// Gets the music genre.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{MusicGenre}.</returns>
@@ -899,7 +898,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Year
+        /// Gets the year.
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>Task{Year}.</returns>
@@ -1076,9 +1075,9 @@ namespace Emby.Server.Implementations.Library
 
             var innerProgress = new ActionableProgress<double>();
 
-            innerProgress.RegisterAction(pct => progress.Report(pct * .96));
+            innerProgress.RegisterAction(pct => progress.Report(pct * pct * 0.96));
 
-            // Now validate the entire media library
+            // validate the entire media library
             await RootFolder.ValidateChildren(innerProgress, cancellationToken, new MetadataRefreshOptions(new DirectoryService(_fileSystem)), recursive: true).ConfigureAwait(false);
 
             progress.Report(96);
@@ -1087,7 +1086,6 @@ namespace Emby.Server.Implementations.Library
 
             innerProgress.RegisterAction(pct => progress.Report(96 + (pct * .04)));
 
-            // Run post-scan tasks
             await RunPostScanTasks(innerProgress, cancellationToken).ConfigureAwait(false);
 
             progress.Report(100);
@@ -1138,7 +1136,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Error running postscan task");
+                    _logger.LogError(ex, "Error running post-scan task");
                 }
 
                 numComplete++;
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 656eeb145..a5d7153d7 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -291,10 +291,11 @@ namespace Emby.Server.Implementations.Library
                     && authenticationProvider != null
                     && !(authenticationProvider is DefaultAuthenticationProvider))
                 {
-                    // We should trust the user that the authprovider says, not what was typed
+                    // trust the username returned by the authentication provider
                     username = updatedUsername;
 
-                    // Search the database for the user again; the authprovider might have created it
+                    // search the database for the user again
+                    // the authentication provider might have created it
                     user = Users
                         .FirstOrDefault(i => string.Equals(username, i.Name, StringComparison.OrdinalIgnoreCase));
 
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index b1d513dd4..72e4e151e 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -30,17 +30,17 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.Session
 {
     /// <summary>
-    /// Class SessionManager
+    /// Class SessionManager.
     /// </summary>
     public class SessionManager : ISessionManager, IDisposable
     {
         /// <summary>
-        /// The _user data repository
+        /// The user data repository.
         /// </summary>
         private readonly IUserDataManager _userDataManager;
 
         /// <summary>
-        /// The _logger
+        /// The logger.
         /// </summary>
         private readonly ILogger _logger;
 
@@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.Session
         private readonly IDeviceManager _deviceManager;
 
         /// <summary>
-        /// The _active connections
+        /// The active connections.
         /// </summary>
         private readonly ConcurrentDictionary<string, SessionInfo> _activeConnections =
             new ConcurrentDictionary<string, SessionInfo>(StringComparer.OrdinalIgnoreCase);
@@ -70,18 +70,23 @@ namespace Emby.Server.Implementations.Session
         /// Occurs when [playback start].
         /// </summary>
         public event EventHandler<PlaybackProgressEventArgs> PlaybackStart;
+
         /// <summary>
         /// Occurs when [playback progress].
         /// </summary>
         public event EventHandler<PlaybackProgressEventArgs> PlaybackProgress;
+
         /// <summary>
         /// Occurs when [playback stopped].
         /// </summary>
         public event EventHandler<PlaybackStopEventArgs> PlaybackStopped;
 
         public event EventHandler<SessionEventArgs> SessionStarted;
+
         public event EventHandler<SessionEventArgs> CapabilitiesChanged;
+
         public event EventHandler<SessionEventArgs> SessionEnded;
+
         public event EventHandler<SessionEventArgs> SessionActivity;
 
         public SessionManager(
@@ -924,7 +929,6 @@ namespace Emby.Server.Implementations.Session
                     ClientName = session.Client,
                     DeviceId = session.DeviceId,
                     Session = session
-
                 },
                 _logger);
         }
@@ -1610,7 +1614,7 @@ namespace Emby.Server.Implementations.Session
         private DtoOptions _itemInfoDtoOptions;
 
         /// <summary>
-        /// Converts a BaseItem to a BaseItemInfo
+        /// Converts a BaseItem to a BaseItemInfo.
         /// </summary>
         private BaseItemDto GetItemInfo(BaseItem item, MediaSourceInfo mediaSource)
         {
@@ -1680,7 +1684,7 @@ namespace Emby.Server.Implementations.Session
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting {0} image info", ex, type);
+                _logger.LogError("Error getting image information for {0}", ex, type);
                 return null;
             }
         }
diff --git a/MediaBrowser.Api/Session/SessionsService.cs b/MediaBrowser.Api/Session/SessionsService.cs
index 700861c55..9aa7b2c88 100644
--- a/MediaBrowser.Api/Session/SessionsService.cs
+++ b/MediaBrowser.Api/Session/SessionsService.cs
@@ -18,7 +18,7 @@ using Microsoft.Extensions.Logging;
 namespace MediaBrowser.Api.Session
 {
     /// <summary>
-    /// Class GetSessions
+    /// Class GetSessions.
     /// </summary>
     [Route("/Sessions", "GET", Summary = "Gets a list of sessions")]
     [Authenticated]
@@ -34,7 +34,7 @@ namespace MediaBrowser.Api.Session
     }
 
     /// <summary>
-    /// Class DisplayContent
+    /// Class DisplayContent.
     /// </summary>
     [Route("/Sessions/{Id}/Viewing", "POST", Summary = "Instructs a session to browse to an item or view")]
     [Authenticated]
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index e1b01b012..0d63c19b5 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -281,7 +281,6 @@ namespace MediaBrowser.Api
             {
                 IsHidden = false,
                 IsDisabled = false
-
             }, true, true);
         }
 
@@ -395,10 +394,11 @@ namespace MediaBrowser.Api
                 throw new MethodNotAllowedException("Hashed-only passwords are not valid for this API.");
             }
 
+            // password should always be null
             return Post(new AuthenticateUserByName
             {
                 Username = user.Name,
-                Password = null, // This should always be null
+                Password = null,
                 Pw = request.Pw
             });
         }
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index acda6a416..6e8385cf8 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -126,12 +126,6 @@ namespace MediaBrowser.Controller.Session
         [JsonIgnore]
         public ISessionController[] SessionControllers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the application icon URL.
-        /// </summary>
-        /// <value>The application icon URL.</value>
-        public string AppIconUrl { get; set; }
-
         /// <summary>
         /// Gets or sets the supported commands.
         /// </summary>
@@ -259,7 +253,7 @@ namespace MediaBrowser.Controller.Session
 
             foreach (var additionalUser in AdditionalUsers)
             {
-                if (userId.Equals(userId))
+                if (additionalUser.UserId.Equals(userId))
                 {
                     return true;
                 }
@@ -321,7 +315,7 @@ namespace MediaBrowser.Controller.Session
 
             var newPositionTicks = positionTicks + ProgressIncrement;
             var item = progressInfo.Item;
-            long? runtimeTicks = item == null ? null : item.RunTimeTicks;
+            long? runtimeTicks = item?.RunTimeTicks;
 
             // Don't report beyond the runtime
             if (runtimeTicks.HasValue && newPositionTicks >= runtimeTicks.Value)
-- 
cgit v1.2.3


From 692a9bfdd054b166a79e71f2a3191ac57c04a65f Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 1 Feb 2020 23:36:40 +0900
Subject: update some comments

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 2 +-
 Emby.Server.Implementations/Library/UserManager.cs    | 4 ++--
 MediaBrowser.Api/UserService.cs                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 9d244b74c..1ab376001 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1077,7 +1077,7 @@ namespace Emby.Server.Implementations.Library
 
             innerProgress.RegisterAction(pct => progress.Report(pct * pct * 0.96));
 
-            // validate the entire media library
+            // Validate the entire media library
             await RootFolder.ValidateChildren(innerProgress, cancellationToken, new MetadataRefreshOptions(new DirectoryService(_fileSystem)), recursive: true).ConfigureAwait(false);
 
             progress.Report(96);
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index a5d7153d7..9dbd48bfc 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -291,10 +291,10 @@ namespace Emby.Server.Implementations.Library
                     && authenticationProvider != null
                     && !(authenticationProvider is DefaultAuthenticationProvider))
                 {
-                    // trust the username returned by the authentication provider
+                    // Trust the username returned by the authentication provider
                     username = updatedUsername;
 
-                    // search the database for the user again
+                    // Search the database for the user again
                     // the authentication provider might have created it
                     user = Users
                         .FirstOrDefault(i => string.Equals(username, i.Name, StringComparison.OrdinalIgnoreCase));
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 0d63c19b5..ac140150b 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -394,7 +394,7 @@ namespace MediaBrowser.Api
                 throw new MethodNotAllowedException("Hashed-only passwords are not valid for this API.");
             }
 
-            // password should always be null
+            // Password should always be null
             return Post(new AuthenticateUserByName
             {
                 Username = user.Name,
-- 
cgit v1.2.3


From d7f199bb1c43b56cafe8876f620d7757da17d8cd Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Mon, 17 Feb 2020 14:56:31 +0100
Subject: #2407: Prefer MP4-Metadata for episodes

---
 .../Library/LibraryManager.cs                      | 25 ++++++++++++++++++++++
 .../Probing/ProbeResultNormalizer.cs               |  3 +++
 MediaBrowser.Model/Configuration/LibraryOptions.cs |  1 +
 MediaBrowser.Model/MediaInfo/MediaInfo.cs          |  1 +
 4 files changed, 30 insertions(+)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index d983c1dc6..c390d2b82 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -29,11 +29,13 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -2387,6 +2389,7 @@ namespace Emby.Server.Implementations.Library
 
         public bool FillMissingEpisodeNumbersFromPath(Episode episode, bool forceRefresh)
         {
+            var libraryOptions = GetLibraryOptions(episode);
             var series = episode.Series;
             bool? isAbsoluteNaming = series == null ? false : string.Equals(series.DisplayOrder, "absolute", StringComparison.OrdinalIgnoreCase);
             if (!isAbsoluteNaming.Value)
@@ -2408,6 +2411,28 @@ namespace Emby.Server.Implementations.Library
                 episodeInfo = new Naming.TV.EpisodeInfo();
             }
 
+            if (libraryOptions.EnableEmbeddedEpisodeInfos && episodeInfo.Container.ToLowerInvariant() == "mp4") {
+                // Read from metadata
+                IMediaEncoder mediaEncoder = _appHost.Resolve<IMediaEncoder>();
+                var task = mediaEncoder.GetMediaInfo(new MediaInfoRequest
+                {
+                    MediaSource = episode.GetMediaSources(false).First(),
+                    MediaType = DlnaProfileType.Video,
+                    ExtractChapters = false
+
+                }, CancellationToken.None);
+                task.Wait();
+                if (task.Result.ParentIndexNumber > 0) {
+                    episodeInfo.SeasonNumber = task.Result.ParentIndexNumber;
+                }
+                if (task.Result.IndexNumber > 0) {
+                    episodeInfo.EpisodeNumber = task.Result.IndexNumber;
+                }
+                if (!string.IsNullOrEmpty(task.Result.ShowName)) {
+                    episodeInfo.SeriesName = task.Result.ShowName;
+                }
+            }
+
             var changed = false;
 
             if (episodeInfo.IsByDate)
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index bd89c6cae..f8047af42 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -112,6 +112,9 @@ namespace MediaBrowser.MediaEncoding.Probing
                 info.Name = title;
             }
 
+            info.IndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "episode_sort");
+            info.ParentIndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "season_number");
+            info.ShowName = FFProbeHelpers.GetDictionaryValue(tags, "show_name");
             info.ProductionYear = FFProbeHelpers.GetDictionaryNumericValue(tags, "date");
 
             // Several different forms of retaildate
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index 3c99f9bb5..9d5d2b869 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -21,6 +21,7 @@ namespace MediaBrowser.Model.Configuration
         public bool ImportMissingEpisodes { get; set; }
         public bool EnableAutomaticSeriesGrouping { get; set; }
         public bool EnableEmbeddedTitles { get; set; }
+        public bool EnableEmbeddedEpisodeInfos { get; set; }
 
         public int AutomaticRefreshIntervalDays { get; set; }
 
diff --git a/MediaBrowser.Model/MediaInfo/MediaInfo.cs b/MediaBrowser.Model/MediaInfo/MediaInfo.cs
index 6ad766d39..237a2b36c 100644
--- a/MediaBrowser.Model/MediaInfo/MediaInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/MediaInfo.cs
@@ -36,6 +36,7 @@ namespace MediaBrowser.Model.MediaInfo
         /// <value>The studios.</value>
         public string[] Studios { get; set; }
         public string[] Genres { get; set; }
+        public string ShowName { get; set; }
         public int? IndexNumber { get; set; }
         public int? ParentIndexNumber { get; set; }
         public int? ProductionYear { get; set; }
-- 
cgit v1.2.3


From 5fed4d10abde3c2c7d0567c81dfd535e5d15a0f3 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 08:39:01 +0100
Subject: Only reading the result of GetMediaInfo if it completed successfully

---
 .../Library/LibraryManager.cs                      | 49 +++++++++++++---------
 1 file changed, 29 insertions(+), 20 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index c390d2b82..b32e98863 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2389,7 +2389,6 @@ namespace Emby.Server.Implementations.Library
 
         public bool FillMissingEpisodeNumbersFromPath(Episode episode, bool forceRefresh)
         {
-            var libraryOptions = GetLibraryOptions(episode);
             var series = episode.Series;
             bool? isAbsoluteNaming = series == null ? false : string.Equals(series.DisplayOrder, "absolute", StringComparison.OrdinalIgnoreCase);
             if (!isAbsoluteNaming.Value)
@@ -2411,27 +2410,37 @@ namespace Emby.Server.Implementations.Library
                 episodeInfo = new Naming.TV.EpisodeInfo();
             }
 
-            if (libraryOptions.EnableEmbeddedEpisodeInfos && episodeInfo.Container.ToLowerInvariant() == "mp4") {
-                // Read from metadata
-                IMediaEncoder mediaEncoder = _appHost.Resolve<IMediaEncoder>();
-                var task = mediaEncoder.GetMediaInfo(new MediaInfoRequest
-                {
-                    MediaSource = episode.GetMediaSources(false).First(),
-                    MediaType = DlnaProfileType.Video,
-                    ExtractChapters = false
-
-                }, CancellationToken.None);
-                task.Wait();
-                if (task.Result.ParentIndexNumber > 0) {
-                    episodeInfo.SeasonNumber = task.Result.ParentIndexNumber;
-                }
-                if (task.Result.IndexNumber > 0) {
-                    episodeInfo.EpisodeNumber = task.Result.IndexNumber;
-                }
-                if (!string.IsNullOrEmpty(task.Result.ShowName)) {
-                    episodeInfo.SeriesName = task.Result.ShowName;
+            try
+            {
+                var libraryOptions = GetLibraryOptions(episode);
+                if (libraryOptions.EnableEmbeddedEpisodeInfos && episodeInfo.Container.ToLowerInvariant() == "mp4") {
+                    // Read from metadata
+                    IMediaEncoder mediaEncoder = _appHost.Resolve<IMediaEncoder>();
+                    var task = mediaEncoder.GetMediaInfo(new MediaInfoRequest
+                    {
+                        MediaSource = episode.GetMediaSources(false).First(),
+                        MediaType = DlnaProfileType.Video,
+                        ExtractChapters = false
+
+                    }, CancellationToken.None);
+                    task.Wait();
+                    if (task.IsCompletedSuccessfully) {
+                        if (task.Result.ParentIndexNumber > 0) {
+                            episodeInfo.SeasonNumber = task.Result.ParentIndexNumber;
+                        }
+                        if (task.Result.IndexNumber > 0) {
+                            episodeInfo.EpisodeNumber = task.Result.IndexNumber;
+                        }
+                        if (!string.IsNullOrEmpty(task.Result.ShowName)) {
+                            episodeInfo.SeriesName = task.Result.ShowName;
+                        }
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error reading the episode informations with ffprobe. Episode: {episodeInfo}", episodeInfo.Path);
+            }
 
             var changed = false;
 
-- 
cgit v1.2.3


From 39b6d6586f3a788860bf361dec0087ea35191687 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 13:37:36 +0100
Subject: Update Emby.Server.Implementations/Library/LibraryManager.cs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index b32e98863..a2d7f93c2 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2413,7 +2413,8 @@ namespace Emby.Server.Implementations.Library
             try
             {
                 var libraryOptions = GetLibraryOptions(episode);
-                if (libraryOptions.EnableEmbeddedEpisodeInfos && episodeInfo.Container.ToLowerInvariant() == "mp4") {
+                if (libraryOptions.EnableEmbeddedEpisodeInfos && string.Equals(episodeInfo.Container, "mp4", StringComparison.OrdinalIgnoreCase))
+                {
                     // Read from metadata
                     IMediaEncoder mediaEncoder = _appHost.Resolve<IMediaEncoder>();
                     var task = mediaEncoder.GetMediaInfo(new MediaInfoRequest
-- 
cgit v1.2.3


From 4d0ee3f6cc4657ce0acb707873c64b86416c8a56 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 13:39:51 +0100
Subject: Update Emby.Server.Implementations/Library/LibraryManager.cs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index a2d7f93c2..12e3c661e 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2429,6 +2429,7 @@ namespace Emby.Server.Implementations.Library
                         if (task.Result.ParentIndexNumber > 0) {
                             episodeInfo.SeasonNumber = task.Result.ParentIndexNumber;
                         }
+
                         if (task.Result.IndexNumber > 0) {
                             episodeInfo.EpisodeNumber = task.Result.IndexNumber;
                         }
-- 
cgit v1.2.3


From 70053266855048deca0d8cefd2eaae020f7bbf95 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 13:40:06 +0100
Subject: Update Emby.Server.Implementations/Library/LibraryManager.cs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 12e3c661e..37bb6741d 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2433,6 +2433,7 @@ namespace Emby.Server.Implementations.Library
                         if (task.Result.IndexNumber > 0) {
                             episodeInfo.EpisodeNumber = task.Result.IndexNumber;
                         }
+
                         if (!string.IsNullOrEmpty(task.Result.ShowName)) {
                             episodeInfo.SeriesName = task.Result.ShowName;
                         }
-- 
cgit v1.2.3


From b16ba7d9854dbda4e908908d4790d68a05cd9453 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 13:40:27 +0100
Subject: Update Emby.Server.Implementations/Library/LibraryManager.cs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 37bb6741d..1f526ff1c 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2422,7 +2422,6 @@ namespace Emby.Server.Implementations.Library
                         MediaSource = episode.GetMediaSources(false).First(),
                         MediaType = DlnaProfileType.Video,
                         ExtractChapters = false
-
                     }, CancellationToken.None);
                     task.Wait();
                     if (task.IsCompletedSuccessfully) {
-- 
cgit v1.2.3


From 0f2ee2686da4b38496dcc9c0578c82849174b22b Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 16:06:30 +0100
Subject: Constructor of the LibraryManager takes the mediaEncoder as parameter

---
 Emby.Server.Implementations/ApplicationHost.cs     | 24 +++++++++---------
 .../Library/LibraryManager.cs                      | 29 +++++++++++-----------
 2 files changed, 26 insertions(+), 27 deletions(-)

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

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 0837db251..ceec972e5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -755,7 +755,18 @@ namespace Emby.Server.Implementations
 
             serviceCollection.AddSingleton(UserManager);
 
-            LibraryManager = new LibraryManager(this, LoggerFactory, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager, () => UserViewManager);
+            MediaEncoder = new MediaBrowser.MediaEncoding.Encoder.MediaEncoder(
+                LoggerFactory.CreateLogger<MediaBrowser.MediaEncoding.Encoder.MediaEncoder>(),
+                ServerConfigurationManager,
+                FileSystemManager,
+                ProcessFactory,
+                LocalizationManager,
+                () => SubtitleEncoder,
+                _configuration,
+                StartupOptions.FFmpegPath);
+            serviceCollection.AddSingleton(MediaEncoder);
+
+            LibraryManager = new LibraryManager(this, LoggerFactory, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager, () => UserViewManager, MediaEncoder);
             serviceCollection.AddSingleton(LibraryManager);
 
             var musicManager = new MusicManager(LibraryManager);
@@ -833,17 +844,6 @@ namespace Emby.Server.Implementations
             ChapterManager = new ChapterManager(LibraryManager, LoggerFactory, ServerConfigurationManager, ItemRepository);
             serviceCollection.AddSingleton(ChapterManager);
 
-            MediaEncoder = new MediaBrowser.MediaEncoding.Encoder.MediaEncoder(
-                LoggerFactory.CreateLogger<MediaBrowser.MediaEncoding.Encoder.MediaEncoder>(),
-                ServerConfigurationManager,
-                FileSystemManager,
-                ProcessFactory,
-                LocalizationManager,
-                () => SubtitleEncoder,
-                _configuration,
-                StartupOptions.FFmpegPath);
-            serviceCollection.AddSingleton(MediaEncoder);
-
             EncodingManager = new MediaEncoder.EncodingManager(FileSystemManager, LoggerFactory, MediaEncoder, ChapterManager, LibraryManager);
             serviceCollection.AddSingleton(EncodingManager);
 
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 1f526ff1c..cd098739f 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -143,6 +143,7 @@ namespace Emby.Server.Implementations.Library
         public bool IsScanRunning { get; private set; }
 
         private IServerApplicationHost _appHost;
+        private IMediaEncoder _mediaEncoder;
 
         /// <summary>
         /// The _library items cache
@@ -176,7 +177,8 @@ namespace Emby.Server.Implementations.Library
             Func<ILibraryMonitor> libraryMonitorFactory,
             IFileSystem fileSystem,
             Func<IProviderManager> providerManagerFactory,
-            Func<IUserViewManager> userviewManager)
+            Func<IUserViewManager> userviewManager,
+            IMediaEncoder mediaEncoder)
         {
             _appHost = appHost;
             _logger = loggerFactory.CreateLogger(nameof(LibraryManager));
@@ -188,6 +190,7 @@ namespace Emby.Server.Implementations.Library
             _fileSystem = fileSystem;
             _providerManagerFactory = providerManagerFactory;
             _userviewManager = userviewManager;
+            _mediaEncoder = mediaEncoder;
 
             _libraryItemsCache = new ConcurrentDictionary<Guid, BaseItem>();
 
@@ -2416,26 +2419,22 @@ namespace Emby.Server.Implementations.Library
                 if (libraryOptions.EnableEmbeddedEpisodeInfos && string.Equals(episodeInfo.Container, "mp4", StringComparison.OrdinalIgnoreCase))
                 {
                     // Read from metadata
-                    IMediaEncoder mediaEncoder = _appHost.Resolve<IMediaEncoder>();
-                    var task = mediaEncoder.GetMediaInfo(new MediaInfoRequest
+                    var mediaInfo = _mediaEncoder.GetMediaInfo(new MediaInfoRequest
                     {
                         MediaSource = episode.GetMediaSources(false).First(),
                         MediaType = DlnaProfileType.Video,
                         ExtractChapters = false
-                    }, CancellationToken.None);
-                    task.Wait();
-                    if (task.IsCompletedSuccessfully) {
-                        if (task.Result.ParentIndexNumber > 0) {
-                            episodeInfo.SeasonNumber = task.Result.ParentIndexNumber;
-                        }
+                    }, CancellationToken.None).GetAwaiter().GetResult();
+                    if (mediaInfo.ParentIndexNumber > 0) {
+                        episodeInfo.SeasonNumber = mediaInfo.ParentIndexNumber;
+                    }
 
-                        if (task.Result.IndexNumber > 0) {
-                            episodeInfo.EpisodeNumber = task.Result.IndexNumber;
-                        }
+                    if (mediaInfo.IndexNumber > 0) {
+                        episodeInfo.EpisodeNumber = mediaInfo.IndexNumber;
+                    }
 
-                        if (!string.IsNullOrEmpty(task.Result.ShowName)) {
-                            episodeInfo.SeriesName = task.Result.ShowName;
-                        }
+                    if (!string.IsNullOrEmpty(mediaInfo.ShowName)) {
+                        episodeInfo.SeriesName = mediaInfo.ShowName;
                     }
                 }
             }
-- 
cgit v1.2.3


From d6971581d6777ca2ac1f22a5d1e61ada65c76baf Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 17:46:50 +0100
Subject: Update Emby.Server.Implementations/Library/LibraryManager.cs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index cd098739f..e851998c2 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2421,7 +2421,7 @@ namespace Emby.Server.Implementations.Library
                     // Read from metadata
                     var mediaInfo = _mediaEncoder.GetMediaInfo(new MediaInfoRequest
                     {
-                        MediaSource = episode.GetMediaSources(false).First(),
+                        MediaSource = episode.GetMediaSources(false)[0],
                         MediaType = DlnaProfileType.Video,
                         ExtractChapters = false
                     }, CancellationToken.None).GetAwaiter().GetResult();
-- 
cgit v1.2.3


From f4d0fa8dc8bd1d027664b290d9924a7c80c66bf0 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 18:58:28 +0100
Subject: Update Emby.Server.Implementations/Library/LibraryManager.cs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index e851998c2..9a1a38365 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2440,7 +2440,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error reading the episode informations with ffprobe. Episode: {episodeInfo}", episodeInfo.Path);
+                _logger.LogError(ex, "Error reading the episode informations with ffprobe. Episode: {EpisodeInfo}", episodeInfo.Path);
             }
 
             var changed = false;
-- 
cgit v1.2.3


From 3d9dc595549d7b6b53d9aee716a83eaf59db5186 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 19:03:42 +0100
Subject: Omitting the parameter ExtraChapters

---
 Emby.Server.Implementations/Library/LibraryManager.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 9a1a38365..1fdf8887c 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2422,8 +2422,7 @@ namespace Emby.Server.Implementations.Library
                     var mediaInfo = _mediaEncoder.GetMediaInfo(new MediaInfoRequest
                     {
                         MediaSource = episode.GetMediaSources(false)[0],
-                        MediaType = DlnaProfileType.Video,
-                        ExtractChapters = false
+                        MediaType = DlnaProfileType.Video
                     }, CancellationToken.None).GetAwaiter().GetResult();
                     if (mediaInfo.ParentIndexNumber > 0) {
                         episodeInfo.SeasonNumber = mediaInfo.ParentIndexNumber;
-- 
cgit v1.2.3


From a9e744bea0af2578b79acbd96cd5f5f90fbfd9c4 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 19:41:10 +0100
Subject: Curly braces on new lines

---
 Emby.Server.Implementations/Library/LibraryManager.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 1fdf8887c..841f6321a 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2424,15 +2424,18 @@ namespace Emby.Server.Implementations.Library
                         MediaSource = episode.GetMediaSources(false)[0],
                         MediaType = DlnaProfileType.Video
                     }, CancellationToken.None).GetAwaiter().GetResult();
-                    if (mediaInfo.ParentIndexNumber > 0) {
+                    if (mediaInfo.ParentIndexNumber > 0)
+                    {
                         episodeInfo.SeasonNumber = mediaInfo.ParentIndexNumber;
                     }
 
-                    if (mediaInfo.IndexNumber > 0) {
+                    if (mediaInfo.IndexNumber > 0)
+                    {
                         episodeInfo.EpisodeNumber = mediaInfo.IndexNumber;
                     }
 
-                    if (!string.IsNullOrEmpty(mediaInfo.ShowName)) {
+                    if (!string.IsNullOrEmpty(mediaInfo.ShowName))
+                    {
                         episodeInfo.SeriesName = mediaInfo.ShowName;
                     }
                 }
-- 
cgit v1.2.3


From 3bd7633cbf451f4ab540229c72bf13b9433b7a45 Mon Sep 17 00:00:00 2001
From: Ulrich Wagner <ulrich.wagner@viaregio-services.de>
Date: Wed, 19 Feb 2020 19:47:03 +0100
Subject: Update Emby.Server.Implementations/Library/LibraryManager.cs

Co-Authored-By: Bond-009 <bond.009@outlook.com>
---
 Emby.Server.Implementations/Library/LibraryManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 841f6321a..55566ed51 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.Library
         public bool IsScanRunning { get; private set; }
 
         private IServerApplicationHost _appHost;
-        private IMediaEncoder _mediaEncoder;
+        private readonly IMediaEncoder _mediaEncoder;
 
         /// <summary>
         /// The _library items cache
-- 
cgit v1.2.3


From adc9fc282cf94adbfb48b3680246105b55d24ff5 Mon Sep 17 00:00:00 2001
From: Bond_009 <Bond.009@outlook.com>
Date: Wed, 19 Feb 2020 21:56:35 +0100
Subject: Minor improvements

---
 Emby.Naming/Audio/AudioFileParser.cs               | 13 ++---
 Emby.Naming/TV/SeasonPathParser.cs                 | 44 +++++++++--------
 Emby.Naming/Video/ExtraResolver.cs                 |  2 +-
 Emby.Naming/Video/StackResolver.cs                 |  4 +-
 .../Data/SqliteItemRepository.cs                   | 49 +++++++++----------
 .../Devices/DeviceManager.cs                       | 15 ++----
 .../Library/LibraryManager.cs                      | 57 ++++++++++------------
 .../Library/Resolvers/Audio/AudioResolver.cs       |  6 +--
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  | 12 ++---
 .../Library/Resolvers/Audio/MusicArtistResolver.cs |  7 ++-
 .../Library/Resolvers/BaseVideoResolver.cs         |  3 +-
 .../Library/Resolvers/Movies/MovieResolver.cs      | 14 +++---
 .../Library/Resolvers/PhotoAlbumResolver.cs        |  3 +-
 .../Library/Resolvers/PhotoResolver.cs             | 12 ++---
 .../Library/Resolvers/TV/SeriesResolver.cs         | 18 +------
 MediaBrowser.Controller/Library/ILibraryManager.cs |  6 +--
 MediaBrowser.Model/Querying/QueryResult.cs         |  6 +++
 17 files changed, 122 insertions(+), 149 deletions(-)

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

diff --git a/Emby.Naming/Audio/AudioFileParser.cs b/Emby.Naming/Audio/AudioFileParser.cs
index 9f21e93dc..748622102 100644
--- a/Emby.Naming/Audio/AudioFileParser.cs
+++ b/Emby.Naming/Audio/AudioFileParser.cs
@@ -8,19 +8,12 @@ using Emby.Naming.Common;
 
 namespace Emby.Naming.Audio
 {
-    public class AudioFileParser
+    public static class AudioFileParser
     {
-        private readonly NamingOptions _options;
-
-        public AudioFileParser(NamingOptions options)
-        {
-            _options = options;
-        }
-
-        public bool IsAudioFile(string path)
+        public static bool IsAudioFile(string path, NamingOptions options)
         {
             var extension = Path.GetExtension(path) ?? string.Empty;
-            return _options.AudioFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase);
+            return options.AudioFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase);
         }
     }
 }
diff --git a/Emby.Naming/TV/SeasonPathParser.cs b/Emby.Naming/TV/SeasonPathParser.cs
index 7715a16a4..79fdae573 100644
--- a/Emby.Naming/TV/SeasonPathParser.cs
+++ b/Emby.Naming/TV/SeasonPathParser.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 
 namespace Emby.Naming.TV
 {
@@ -29,14 +28,14 @@ namespace Emby.Naming.TV
         {
             var result = new SeasonPathParserResult();
 
-            var seasonNumberInfo = GetSeasonNumberFromPath(path, supportSpecialAliases, supportNumericSeasonFolders);
+            var (seasonNumber, isSeasonFolder) = GetSeasonNumberFromPath(path, supportSpecialAliases, supportNumericSeasonFolders);
 
-            result.SeasonNumber = seasonNumberInfo.seasonNumber;
+            result.SeasonNumber = seasonNumber;
 
             if (result.SeasonNumber.HasValue)
             {
                 result.Success = true;
-                result.IsSeasonFolder = seasonNumberInfo.isSeasonFolder;
+                result.IsSeasonFolder = isSeasonFolder;
             }
 
             return result;
@@ -90,12 +89,10 @@ namespace Emby.Naming.TV
             // Look for one of the season folder names
             foreach (var name in _seasonFolderNames)
             {
-                var index = filename.IndexOf(name, StringComparison.OrdinalIgnoreCase);
-
-                if (index != -1)
+                if (filename.Contains(name, StringComparison.OrdinalIgnoreCase))
                 {
                     var result = GetSeasonNumberFromPathSubstring(filename.Replace(name, " ", StringComparison.OrdinalIgnoreCase));
-                    if (result.Item1.HasValue)
+                    if (result.seasonNumber.HasValue)
                     {
                         return result;
                     }
@@ -105,25 +102,32 @@ namespace Emby.Naming.TV
             }
 
             var parts = filename.Split(new[] { '.', '_', ' ', '-' }, StringSplitOptions.RemoveEmptyEntries);
-            var resultNumber = parts.Select(GetSeasonNumberFromPart).FirstOrDefault(i => i.HasValue);
-            return (resultNumber, true);
+            for (int i = 0; i < parts.Length; i++)
+            {
+                if (TryGetSeasonNumberFromPart(parts[i], out int seasonNumber))
+                {
+                    return (seasonNumber, true);
+                }
+            }
+
+            return (null, true);
         }
 
-        private static int? GetSeasonNumberFromPart(string part)
+        private static bool TryGetSeasonNumberFromPart(ReadOnlySpan<char> part, out int seasonNumber)
         {
+            seasonNumber = 0;
             if (part.Length < 2 || !part.StartsWith("s", StringComparison.OrdinalIgnoreCase))
             {
-                return null;
+                return false;
             }
 
-            part = part.Substring(1);
-
-            if (int.TryParse(part, NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
+            if (int.TryParse(part.Slice(1), NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
             {
-                return value;
+                seasonNumber = value;
+                return true;
             }
 
-            return null;
+            return false;
         }
 
         /// <summary>
@@ -131,7 +135,7 @@ namespace Emby.Naming.TV
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns>System.Nullable{System.Int32}.</returns>
-        private static (int? seasonNumber, bool isSeasonFolder) GetSeasonNumberFromPathSubstring(string path)
+        private static (int? seasonNumber, bool isSeasonFolder) GetSeasonNumberFromPathSubstring(ReadOnlySpan<char> path)
         {
             var numericStart = -1;
             var length = 0;
@@ -142,7 +146,7 @@ namespace Emby.Naming.TV
             // Find out where the numbers start, and then keep going until they end
             for (var i = 0; i < path.Length; i++)
             {
-                if (char.IsNumber(path, i))
+                if (char.IsNumber(path[i]))
                 {
                     if (!hasOpenParenth)
                     {
@@ -177,7 +181,7 @@ namespace Emby.Naming.TV
                 return (null, isSeasonFolder);
             }
 
-            return (int.Parse(path.Substring(numericStart, length), CultureInfo.InvariantCulture), isSeasonFolder);
+            return (int.Parse(path.Slice(numericStart, length), provider: CultureInfo.InvariantCulture), isSeasonFolder);
         }
     }
 }
diff --git a/Emby.Naming/Video/ExtraResolver.cs b/Emby.Naming/Video/ExtraResolver.cs
index ea9a6d6c2..3e5d473ec 100644
--- a/Emby.Naming/Video/ExtraResolver.cs
+++ b/Emby.Naming/Video/ExtraResolver.cs
@@ -32,7 +32,7 @@ namespace Emby.Naming.Video
 
             if (rule.MediaType == MediaType.Audio)
             {
-                if (!new AudioFileParser(_options).IsAudioFile(path))
+                if (!AudioFileParser.IsAudioFile(path, _options))
                 {
                     return result;
                 }
diff --git a/Emby.Naming/Video/StackResolver.cs b/Emby.Naming/Video/StackResolver.cs
index 8f210fa45..b9afe998b 100644
--- a/Emby.Naming/Video/StackResolver.cs
+++ b/Emby.Naming/Video/StackResolver.cs
@@ -194,7 +194,7 @@ namespace Emby.Naming.Video
             }
         }
 
-        private string GetRegexInput(FileSystemMetadata file)
+        private static string GetRegexInput(FileSystemMetadata file)
         {
             // For directories, dummy up an extension otherwise the expressions will fail
             var input = !file.IsDirectory
@@ -204,7 +204,7 @@ namespace Emby.Naming.Video
             return Path.GetFileName(input);
         }
 
-        private Match FindMatch(FileSystemMetadata input, Regex regex, int offset)
+        private static Match FindMatch(FileSystemMetadata input, Regex regex, int offset)
         {
             var regexInput = GetRegexInput(input);
 
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index c514846e5..44f38504a 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -3521,20 +3521,6 @@ namespace Emby.Server.Implementations.Data
             }
 
             var includeTypes = query.IncludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray();
-            if (includeTypes.Length == 1)
-            {
-                whereClauses.Add("type=@type");
-                if (statement != null)
-                {
-                    statement.TryBind("@type", includeTypes[0]);
-                }
-            }
-            else if (includeTypes.Length > 1)
-            {
-                var inClause = string.Join(",", includeTypes.Select(i => "'" + i + "'"));
-                whereClauses.Add($"type in ({inClause})");
-            }
-
             // Only specify excluded types if no included types are specified
             if (includeTypes.Length == 0)
             {
@@ -3553,6 +3539,19 @@ namespace Emby.Server.Implementations.Data
                     whereClauses.Add($"type not in ({inClause})");
                 }
             }
+            else if (includeTypes.Length == 1)
+            {
+                whereClauses.Add("type=@type");
+                if (statement != null)
+                {
+                    statement.TryBind("@type", includeTypes[0]);
+                }
+            }
+            else if (includeTypes.Length > 1)
+            {
+                var inClause = string.Join(",", includeTypes.Select(i => "'" + i + "'"));
+                whereClauses.Add($"type in ({inClause})");
+            }
 
             if (query.ChannelIds.Length == 1)
             {
@@ -4927,7 +4926,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
         // Not crazy about having this all the way down here, but at least it's in one place
         readonly Dictionary<string, string[]> _types = GetTypeMapDictionary();
 
-        private IEnumerable<string> MapIncludeItemTypes(string value)
+        private string[] MapIncludeItemTypes(string value)
         {
             if (_types.TryGetValue(value, out string[] result))
             {
@@ -5611,32 +5610,32 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
             return counts;
         }
 
-        private List<Tuple<int, string>> GetItemValuesToSave(BaseItem item, List<string> inheritedTags)
+        private List<(int, string)> GetItemValuesToSave(BaseItem item, List<string> inheritedTags)
         {
-            var list = new List<Tuple<int, string>>();
+            var list = new List<(int, string)>();
 
             if (item is IHasArtist hasArtist)
             {
-                list.AddRange(hasArtist.Artists.Select(i => new Tuple<int, string>(0, i)));
+                list.AddRange(hasArtist.Artists.Select(i => (0, i)));
             }
 
             if (item is IHasAlbumArtist hasAlbumArtist)
             {
-                list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => new Tuple<int, string>(1, i)));
+                list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => (1, i)));
             }
 
-            list.AddRange(item.Genres.Select(i => new Tuple<int, string>(2, i)));
-            list.AddRange(item.Studios.Select(i => new Tuple<int, string>(3, i)));
-            list.AddRange(item.Tags.Select(i => new Tuple<int, string>(4, i)));
+            list.AddRange(item.Genres.Select(i => (2, i)));
+            list.AddRange(item.Studios.Select(i => (3, i)));
+            list.AddRange(item.Tags.Select(i => (4, i)));
 
             // keywords was 5
 
-            list.AddRange(inheritedTags.Select(i => new Tuple<int, string>(6, i)));
+            list.AddRange(inheritedTags.Select(i => (6, i)));
 
             return list;
         }
 
-        private void UpdateItemValues(Guid itemId, List<Tuple<int, string>> values, IDatabaseConnection db)
+        private void UpdateItemValues(Guid itemId, List<(int, string)> values, IDatabaseConnection db)
         {
             if (itemId.Equals(Guid.Empty))
             {
@@ -5658,7 +5657,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
             InsertItemValues(guidBlob, values, db);
         }
 
-        private void InsertItemValues(byte[] idBlob, List<Tuple<int, string>> values, IDatabaseConnection db)
+        private void InsertItemValues(byte[] idBlob, List<(int, string)> values, IDatabaseConnection db)
         {
             var startIndex = 0;
             var limit = 100;
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index 2bd0b840a..4f8f9f23b 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -142,11 +142,10 @@ namespace Emby.Server.Implementations.Devices
 
         public QueryResult<DeviceInfo> GetDevices(DeviceQuery query)
         {
-            var sessions = _authRepo.Get(new AuthenticationInfoQuery
+            IEnumerable<AuthenticationInfo> sessions = _authRepo.Get(new AuthenticationInfoQuery
             {
                 //UserId = query.UserId
                 HasUser = true
-
             }).Items;
 
             // TODO: DeviceQuery doesn't seem to be used from client. Not even Swagger.
@@ -154,23 +153,19 @@ namespace Emby.Server.Implementations.Devices
             {
                 var val = query.SupportsSync.Value;
 
-                sessions = sessions.Where(i => GetCapabilities(i.DeviceId).SupportsSync == val).ToArray();
+                sessions = sessions.Where(i => GetCapabilities(i.DeviceId).SupportsSync == val);
             }
 
             if (!query.UserId.Equals(Guid.Empty))
             {
                 var user = _userManager.GetUserById(query.UserId);
 
-                sessions = sessions.Where(i => CanAccessDevice(user, i.DeviceId)).ToArray();
+                sessions = sessions.Where(i => CanAccessDevice(user, i.DeviceId));
             }
 
             var array = sessions.Select(ToDeviceInfo).ToArray();
 
-            return new QueryResult<DeviceInfo>
-            {
-                Items = array,
-                TotalRecordCount = array.Length
-            };
+            return new QueryResult<DeviceInfo>(array);
         }
 
         private DeviceInfo ToDeviceInfo(AuthenticationInfo authInfo)
@@ -186,7 +181,7 @@ namespace Emby.Server.Implementations.Devices
                 LastUserName = authInfo.UserName,
                 Name = authInfo.DeviceName,
                 DateLastActivity = authInfo.DateLastActivity,
-                IconUrl = caps == null ? null : caps.IconUrl
+                IconUrl = caps?.IconUrl
             };
         }
 
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index d983c1dc6..8f3128245 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1169,7 +1169,6 @@ namespace Emby.Server.Implementations.Library
 
             return _fileSystem.GetDirectoryPaths(ConfigurationManager.ApplicationPaths.DefaultUserViewsPath)
                 .Select(dir => GetVirtualFolderInfo(dir, topLibraryFolders, refreshQueue))
-                .OrderBy(i => i.Name)
                 .ToList();
         }
 
@@ -1401,25 +1400,32 @@ namespace Emby.Server.Implementations.Library
 
         private void SetTopParentOrAncestorIds(InternalItemsQuery query)
         {
-            if (query.AncestorIds.Length == 0)
+            var ancestorIds = query.AncestorIds;
+            int len = ancestorIds.Length;
+            if (len == 0)
             {
                 return;
             }
 
-            var parents = query.AncestorIds.Select(i => GetItemById(i)).ToList();
-
-            if (parents.All(i => i is ICollectionFolder || i is UserView))
+            var parents = new BaseItem[len];
+            for (int i = 0; i < len; i++)
             {
-                // Optimize by querying against top level views
-                query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).ToArray();
-                query.AncestorIds = Array.Empty<Guid>();
-
-                // Prevent searching in all libraries due to empty filter
-                if (query.TopParentIds.Length == 0)
+                parents[i] = GetItemById(ancestorIds[i]);
+                if (!(parents[i] is ICollectionFolder || parents[i] is UserView))
                 {
-                    query.TopParentIds = new[] { Guid.NewGuid() };
+                    return;
                 }
             }
+
+            // Optimize by querying against top level views
+            query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).ToArray();
+            query.AncestorIds = Array.Empty<Guid>();
+
+            // Prevent searching in all libraries due to empty filter
+            if (query.TopParentIds.Length == 0)
+            {
+                query.TopParentIds = new[] { Guid.NewGuid() };
+            }
         }
 
         public QueryResult<(BaseItem, ItemCounts)> GetAlbumArtists(InternalItemsQuery query)
@@ -1580,7 +1586,7 @@ namespace Emby.Server.Implementations.Library
         public async Task<IEnumerable<Video>> GetIntros(BaseItem item, User user)
         {
             var tasks = IntroProviders
-                .OrderBy(i => i.GetType().Name.IndexOf("Default", StringComparison.OrdinalIgnoreCase) == -1 ? 0 : 1)
+                .OrderBy(i => i.GetType().Name.Contains("Default", StringComparison.OrdinalIgnoreCase) ? 1 : 0)
                 .Take(1)
                 .Select(i => GetIntros(i, item, user));
 
@@ -2358,33 +2364,22 @@ namespace Emby.Server.Implementations.Library
             new SubtitleResolver(BaseItem.LocalizationManager, _fileSystem).AddExternalSubtitleStreams(streams, videoPath, streams.Count, files);
         }
 
-        public bool IsVideoFile(string path, LibraryOptions libraryOptions)
+        /// <inheritdoc />
+        public bool IsVideoFile(string path)
         {
             var resolver = new VideoResolver(GetNamingOptions());
             return resolver.IsVideoFile(path);
         }
 
-        public bool IsVideoFile(string path)
-        {
-            return IsVideoFile(path, new LibraryOptions());
-        }
-
-        public bool IsAudioFile(string path, LibraryOptions libraryOptions)
-        {
-            var parser = new AudioFileParser(GetNamingOptions());
-            return parser.IsAudioFile(path);
-        }
-
+        /// <inheritdoc />
         public bool IsAudioFile(string path)
-        {
-            return IsAudioFile(path, new LibraryOptions());
-        }
+            => AudioFileParser.IsAudioFile(path, GetNamingOptions());
 
+        /// <inheritdoc />
         public int? GetSeasonNumberFromPath(string path)
-        {
-            return SeasonPathParser.Parse(path, true, true).SeasonNumber;
-        }
+            => SeasonPathParser.Parse(path, true, true).SeasonNumber;
 
+        /// <inheritdoc />
         public bool FillMissingEpisodeNumbersFromPath(Episode episode, bool forceRefresh)
         {
             var series = episode.Series;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index 7e3b27a12..524fb7c10 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -73,7 +73,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         {
             // Return audio if the path is a file and has a matching extension
 
-            var libraryOptions = args.GetLibraryOptions();
             var collectionType = args.GetCollectionType();
 
             var isBooksCollectionType = string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase);
@@ -92,7 +91,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 return FindAudio<AudioBook>(args, args.Path, args.Parent, files, args.DirectoryService, collectionType, false);
             }
 
-            if (LibraryManager.IsAudioFile(args.Path, libraryOptions))
+            if (LibraryManager.IsAudioFile(args.Path))
             {
                 var extension = Path.GetExtension(args.Path);
 
@@ -105,7 +104,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 var isMixedCollectionType = string.IsNullOrEmpty(collectionType);
 
                 // For conflicting extensions, give priority to videos
-                if (isMixedCollectionType && LibraryManager.IsVideoFile(args.Path, libraryOptions))
+                if (isMixedCollectionType && LibraryManager.IsVideoFile(args.Path))
                 {
                     return null;
                 }
@@ -121,7 +120,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 {
                     item = new MediaBrowser.Controller.Entities.Audio.Audio();
                 }
-
                 else if (isBooksCollectionType)
                 {
                     item = new AudioBook();
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 9f858f98d..85b1b6e32 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
@@ -78,9 +77,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         /// <summary>
         /// Determine if the supplied file data points to a music album.
         /// </summary>
-        public bool IsMusicAlbum(string path, IDirectoryService directoryService, LibraryOptions libraryOptions)
+        public bool IsMusicAlbum(string path, IDirectoryService directoryService)
         {
-            return ContainsMusic(directoryService.GetFileSystemEntries(path), true, directoryService, _logger, _fileSystem, libraryOptions, _libraryManager);
+            return ContainsMusic(directoryService.GetFileSystemEntries(path), true, directoryService, _logger, _fileSystem, _libraryManager);
         }
 
         /// <summary>
@@ -94,7 +93,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             if (args.IsDirectory)
             {
                 // if (args.Parent is MusicArtist) return true;  //saves us from testing children twice
-                if (ContainsMusic(args.FileSystemChildren, true, args.DirectoryService, _logger, _fileSystem, args.GetLibraryOptions(), _libraryManager))
+                if (ContainsMusic(args.FileSystemChildren, true, args.DirectoryService, _logger, _fileSystem, _libraryManager))
                 {
                     return true;
                 }
@@ -112,7 +111,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             IDirectoryService directoryService,
             ILogger logger,
             IFileSystem fileSystem,
-            LibraryOptions libraryOptions,
             ILibraryManager libraryManager)
         {
             var discSubfolderCount = 0;
@@ -132,7 +130,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                         }
 
                         var path = fileSystemInfo.FullName;
-                        var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryOptions, libraryManager);
+                        var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
 
                         if (hasMusic)
                         {
@@ -153,7 +151,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 {
                     var fullName = fileSystemInfo.FullName;
 
-                    if (libraryManager.IsAudioFile(fullName, libraryOptions))
+                    if (libraryManager.IsAudioFile(fullName))
                     {
                         return true;
                     }
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index ee7e84929..013fdbf13 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -80,14 +80,17 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             }
 
             // Avoid mis-identifying top folders
-            if (args.Parent.IsRoot) return null;
+            if (args.Parent.IsRoot)
+            {
+                return null;
+            }
 
             var directoryService = args.DirectoryService;
 
             var albumResolver = new MusicAlbumResolver(_logger, _fileSystem, _libraryManager);
 
             // If we contain an album assume we are an artist folder
-            return args.FileSystemChildren.Where(i => i.IsDirectory).Any(i => albumResolver.IsMusicAlbum(i.FullName, directoryService, args.GetLibraryOptions())) ? new MusicArtist() : null;
+            return args.FileSystemChildren.Where(i => i.IsDirectory).Any(i => albumResolver.IsMusicAlbum(i.FullName, directoryService)) ? new MusicArtist() : null;
         }
     }
 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index 43302bb3f..848cdb7bd 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -80,6 +80,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
                             };
                             break;
                         }
+
                         if (IsBluRayDirectory(child.FullName, filename, args.DirectoryService))
                         {
                             videoInfo = parser.ResolveDirectory(args.Path);
@@ -137,7 +138,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
                     return null;
                 }
 
-                if (LibraryManager.IsVideoFile(args.Path, args.GetLibraryOptions()) || videoInfo.IsStub)
+                if (LibraryManager.IsVideoFile(args.Path) || videoInfo.IsStub)
                 {
                     var path = args.Path;
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 08db168bc..cb67c8aa7 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -436,7 +436,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             if (result.Items.Count == 1)
             {
                 var videoPath = result.Items[0].Path;
-                var hasPhotos = photos.Any(i => !PhotoResolver.IsOwnedByResolvedMedia(LibraryManager, libraryOptions, videoPath, i.Name));
+                var hasPhotos = photos.Any(i => !PhotoResolver.IsOwnedByResolvedMedia(LibraryManager, videoPath, i.Name));
 
                 if (!hasPhotos)
                 {
@@ -446,8 +446,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     return movie;
                 }
             }
-
-            if (result.Items.Count == 0 && multiDiscFolders.Count > 0)
+            else if (result.Items.Count == 0 && multiDiscFolders.Count > 0)
             {
                 return GetMultiDiscMovie<T>(multiDiscFolders, directoryService);
             }
@@ -519,14 +518,15 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 return null;
             }
 
+            int additionalPartsLen = folderPaths.Count - 1;
+            var additionalParts = new string[additionalPartsLen];
+            folderPaths.CopyTo(1, additionalParts, 0, additionalPartsLen);
+
             var returnVideo = new T
             {
                 Path = folderPaths[0],
-
-                AdditionalParts = folderPaths.Skip(1).ToArray(),
-
+                AdditionalParts = additionalParts,
                 VideoType = videoTypes[0],
-
                 Name = result[0].Name
             };
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
index 4536b0aaa..3ac837057 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
@@ -63,13 +63,12 @@ namespace Emby.Server.Implementations.Library.Resolvers
             {
                 if (!file.IsDirectory && PhotoResolver.IsImageFile(file.FullName, _imageProcessor))
                 {
-                    var libraryOptions = args.GetLibraryOptions();
                     var filename = file.Name;
                     var ownedByMedia = false;
 
                     foreach (var siblingFile in files)
                     {
-                        if (PhotoResolver.IsOwnedByMedia(_libraryManager, libraryOptions, siblingFile.FullName, filename))
+                        if (PhotoResolver.IsOwnedByMedia(_libraryManager, siblingFile.FullName, filename))
                         {
                             ownedByMedia = true;
                             break;
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
index e1eb23652..8ad546f8e 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 
 namespace Emby.Server.Implementations.Library.Resolvers
@@ -57,11 +56,10 @@ namespace Emby.Server.Implementations.Library.Resolvers
 
                         // Make sure the image doesn't belong to a video file
                         var files = args.DirectoryService.GetFiles(Path.GetDirectoryName(args.Path));
-                        var libraryOptions = args.GetLibraryOptions();
 
                         foreach (var file in files)
                         {
-                            if (IsOwnedByMedia(_libraryManager, libraryOptions, file.FullName, filename))
+                            if (IsOwnedByMedia(_libraryManager, file.FullName, filename))
                             {
                                 return null;
                             }
@@ -78,17 +76,17 @@ namespace Emby.Server.Implementations.Library.Resolvers
             return null;
         }
 
-        internal static bool IsOwnedByMedia(ILibraryManager libraryManager, LibraryOptions libraryOptions, string file, string imageFilename)
+        internal static bool IsOwnedByMedia(ILibraryManager libraryManager, string file, string imageFilename)
         {
-            if (libraryManager.IsVideoFile(file, libraryOptions))
+            if (libraryManager.IsVideoFile(file))
             {
-                return IsOwnedByResolvedMedia(libraryManager, libraryOptions, file, imageFilename);
+                return IsOwnedByResolvedMedia(libraryManager, file, imageFilename);
             }
 
             return false;
         }
 
-        internal static bool IsOwnedByResolvedMedia(ILibraryManager libraryManager, LibraryOptions libraryOptions, string file, string imageFilename)
+        internal static bool IsOwnedByResolvedMedia(ILibraryManager libraryManager, string file, string imageFilename)
             => imageFilename.StartsWith(Path.GetFileNameWithoutExtension(file), StringComparison.OrdinalIgnoreCase);
 
         internal static bool IsImageFile(string path, IImageProcessor imageProcessor)
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 4ee30b475..b547fc8c9 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -102,7 +102,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                         return null;
                     }
 
-                    if (IsSeriesFolder(args.Path, args.FileSystemChildren, args.DirectoryService, _fileSystem, _logger, _libraryManager, args.GetLibraryOptions(), false))
+                    if (IsSeriesFolder(args.Path, args.FileSystemChildren, args.DirectoryService, _fileSystem, _logger, _libraryManager, false))
                     {
                         return new Series
                         {
@@ -123,24 +123,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
             IFileSystem fileSystem,
             ILogger logger,
             ILibraryManager libraryManager,
-            LibraryOptions libraryOptions,
             bool isTvContentType)
         {
             foreach (var child in fileSystemChildren)
             {
-                //if ((attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
-                //{
-                //    //logger.LogDebug("Igoring series file or folder marked hidden: {0}", child.FullName);
-                //    continue;
-                //}
-
-                // Can't enforce this because files saved by Bitcasa are always marked System
-                //if ((attributes & FileAttributes.System) == FileAttributes.System)
-                //{
-                //    logger.LogDebug("Igoring series subfolder marked system: {0}", child.FullName);
-                //    continue;
-                //}
-
                 if (child.IsDirectory)
                 {
                     if (IsSeasonFolder(child.FullName, isTvContentType, libraryManager))
@@ -152,7 +138,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                 else
                 {
                     string fullName = child.FullName;
-                    if (libraryManager.IsVideoFile(fullName, libraryOptions))
+                    if (libraryManager.IsVideoFile(fullName))
                     {
                         if (isTvContentType)
                         {
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 511356aa4..2e1c97f67 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -157,7 +157,8 @@ namespace MediaBrowser.Controller.Library
         /// <param name="introProviders">The intro providers.</param>
         /// <param name="itemComparers">The item comparers.</param>
         /// <param name="postscanTasks">The postscan tasks.</param>
-        void AddParts(IEnumerable<IResolverIgnoreRule> rules,
+        void AddParts(
+            IEnumerable<IResolverIgnoreRule> rules,
             IEnumerable<IItemResolver> resolvers,
             IEnumerable<IIntroProvider> introProviders,
             IEnumerable<IBaseItemComparer> itemComparers,
@@ -349,9 +350,6 @@ namespace MediaBrowser.Controller.Library
         /// <returns><c>true</c> if [is audio file] [the specified path]; otherwise, <c>false</c>.</returns>
         bool IsAudioFile(string path);
 
-        bool IsAudioFile(string path, LibraryOptions libraryOptions);
-        bool IsVideoFile(string path, LibraryOptions libraryOptions);
-
         /// <summary>
         /// Gets the season number from path.
         /// </summary>
diff --git a/MediaBrowser.Model/Querying/QueryResult.cs b/MediaBrowser.Model/Querying/QueryResult.cs
index ad89ae38d..5d4d6226b 100644
--- a/MediaBrowser.Model/Querying/QueryResult.cs
+++ b/MediaBrowser.Model/Querying/QueryResult.cs
@@ -30,5 +30,11 @@ namespace MediaBrowser.Model.Querying
         {
             Items = Array.Empty<T>();
         }
+
+        public QueryResult(IReadOnlyList<T> items)
+        {
+            Items = items;
+            TotalRecordCount = items.Count;
+        }
     }
 }
-- 
cgit v1.2.3


From 65a9d618ccfb5e015eb2dccf437e8795ac5350d5 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 22 Feb 2020 15:04:52 +0900
Subject: add config options for musicbrainz

---
 .../ConfigurationOptions.cs                        |   1 -
 .../Library/LibraryManager.cs                      |   3 +-
 .../Entities/Audio/MusicArtist.cs                  |   1 +
 MediaBrowser.Controller/Entities/Folder.cs         |   8 +-
 .../MediaBrowser.Providers.csproj                  |   5 +
 .../Music/MusicBrainzAlbumProvider.cs              | 800 ---------------------
 .../Music/MusicBrainzArtistProvider.cs             | 281 --------
 MediaBrowser.Providers/Music/MusicExternalIds.cs   |  95 ---
 .../Plugins/MusicBrainz/AlbumProvider.cs           | 799 ++++++++++++++++++++
 .../Plugins/MusicBrainz/ArtistProvider.cs          | 298 ++++++++
 .../Configuration/PluginConfiguration.cs           |  16 +
 .../Plugins/MusicBrainz/Configuration/config.html  |  69 ++
 .../Plugins/MusicBrainz/MusicBrainzExternalIds.cs  | 102 +++
 .../Plugins/MusicBrainz/Plugin.cs                  |  35 +
 14 files changed, 1330 insertions(+), 1183 deletions(-)
 delete mode 100644 MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
 delete mode 100644 MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
 create mode 100644 MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
 create mode 100644 MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
 create mode 100644 MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/PluginConfiguration.cs
 create mode 100644 MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/config.html
 create mode 100644 MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzExternalIds.cs
 create mode 100644 MediaBrowser.Providers/Plugins/MusicBrainz/Plugin.cs

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

diff --git a/Emby.Server.Implementations/ConfigurationOptions.cs b/Emby.Server.Implementations/ConfigurationOptions.cs
index 2ea7ff6e9..d0f3d6723 100644
--- a/Emby.Server.Implementations/ConfigurationOptions.cs
+++ b/Emby.Server.Implementations/ConfigurationOptions.cs
@@ -8,7 +8,6 @@ namespace Emby.Server.Implementations
         public static Dictionary<string, string> Configuration => new Dictionary<string, string>
         {
             { "HttpListenerHost:DefaultRedirectPath", "web/index.html" },
-            { "MusicBrainz:BaseUrl", "https://www.musicbrainz.org" },
             { FfmpegProbeSizeKey, "1G" },
             { FfmpegAnalyzeDurationKey, "200M" }
         };
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 55566ed51..8a66ffdaa 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -944,7 +944,6 @@ namespace Emby.Server.Implementations.Library
                     IncludeItemTypes = new[] { typeof(T).Name },
                     Name = name,
                     DtoOptions = options
-
                 }).Cast<MusicArtist>()
                 .OrderBy(i => i.IsAccessedByName ? 1 : 0)
                 .Cast<T>()
@@ -1080,7 +1079,7 @@ namespace Emby.Server.Implementations.Library
 
             var innerProgress = new ActionableProgress<double>();
 
-            innerProgress.RegisterAction(pct => progress.Report(pct * pct * 0.96));
+            innerProgress.RegisterAction(pct => progress.Report(pct * 0.96));
 
             // Validate the entire media library
             await RootFolder.ValidateChildren(innerProgress, cancellationToken, new MetadataRefreshOptions(new DirectoryService(_fileSystem)), recursive: true).ConfigureAwait(false);
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index efe0d3cf7..5e3056ccb 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -198,6 +198,7 @@ namespace MediaBrowser.Controller.Entities.Audio
                     return true;
                 }
             }
+
             return base.RequiresRefresh();
         }
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 07fbe6035..a892be7a9 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -322,10 +322,10 @@ namespace MediaBrowser.Controller.Entities
                     ProviderManager.OnRefreshProgress(this, 5);
                 }
 
-                //build a dictionary of the current children we have now by Id so we can compare quickly and easily
+                // Build a dictionary of the current children we have now by Id so we can compare quickly and easily
                 var currentChildren = GetActualChildrenDictionary();
 
-                //create a list for our validated children
+                // Create a list for our validated children
                 var newItems = new List<BaseItem>();
 
                 cancellationToken.ThrowIfCancellationRequested();
@@ -391,7 +391,7 @@ namespace MediaBrowser.Controller.Entities
                 var folder = this;
                 innerProgress.RegisterAction(p =>
                 {
-                    double newPct = .80 * p + 10;
+                    double newPct = 0.80 * p + 10;
                     progress.Report(newPct);
                     ProviderManager.OnRefreshProgress(folder, newPct);
                 });
@@ -421,7 +421,7 @@ namespace MediaBrowser.Controller.Entities
                 var folder = this;
                 innerProgress.RegisterAction(p =>
                 {
-                    double newPct = .10 * p + 90;
+                    double newPct = 0.10 * p + 90;
                     progress.Report(newPct);
                     if (recursive)
                     {
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 5593c5036..48c16b643 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -24,4 +24,9 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Plugins\MusicBrainz\Configuration\config.html" />
+    <EmbeddedResource Include="Plugins\MusicBrainz\Configuration\config.html" />
+  </ItemGroup>
+
 </Project>
diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
deleted file mode 100644
index 8e71b625e..000000000
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ /dev/null
@@ -1,800 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
-using MediaBrowser.Common;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Providers;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Providers.Music
-{
-    public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, AlbumInfo>, IHasOrder
-    {
-        /// <summary>
-        /// The Jellyfin user-agent is unrestricted but source IP must not exceed
-        /// one request per second, therefore we rate limit to avoid throttling.
-        /// Be prudent, use a value slightly above the minimun required.
-        /// https://musicbrainz.org/doc/XML_Web_Service/Rate_Limiting
-        /// </summary>
-        private const long MusicBrainzQueryIntervalMs = 1050u;
-
-        /// <summary>
-        /// For each single MB lookup/search, this is the maximum number of
-        /// attempts that shall be made whilst receiving a 503 Server
-        /// Unavailable (indicating throttled) response.
-        /// </summary>
-        private const uint MusicBrainzQueryAttempts = 5u;
-
-        internal static MusicBrainzAlbumProvider Current;
-
-        private readonly IHttpClient _httpClient;
-        private readonly IApplicationHost _appHost;
-        private readonly ILogger _logger;
-
-        private readonly string _musicBrainzBaseUrl;
-
-        private Stopwatch _stopWatchMusicBrainz = new Stopwatch();
-
-        public MusicBrainzAlbumProvider(
-            IHttpClient httpClient,
-            IApplicationHost appHost,
-            ILogger logger,
-            IConfiguration configuration)
-        {
-            _httpClient = httpClient;
-            _appHost = appHost;
-            _logger = logger;
-
-            _musicBrainzBaseUrl = configuration["MusicBrainz:BaseUrl"];
-
-            // Use a stopwatch to ensure we don't exceed the MusicBrainz rate limit
-            _stopWatchMusicBrainz.Start();
-
-            Current = this;
-        }
-
-        /// <inheritdoc />
-        public string Name => "MusicBrainz";
-
-        /// <inheritdoc />
-        public int Order => 0;
-
-        /// <inheritdoc />
-        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(AlbumInfo searchInfo, CancellationToken cancellationToken)
-        {
-            var releaseId = searchInfo.GetReleaseId();
-            var releaseGroupId = searchInfo.GetReleaseGroupId();
-
-            string url;
-
-            if (!string.IsNullOrEmpty(releaseId))
-            {
-                url = "/ws/2/release/?query=reid:" + releaseId.ToString(CultureInfo.InvariantCulture);
-            }
-            else if (!string.IsNullOrEmpty(releaseGroupId))
-            {
-                url = "/ws/2/release?release-group=" + releaseGroupId.ToString(CultureInfo.InvariantCulture);
-            }
-            else
-            {
-                var artistMusicBrainzId = searchInfo.GetMusicBrainzArtistId();
-
-                if (!string.IsNullOrWhiteSpace(artistMusicBrainzId))
-                {
-                    url = string.Format(
-                        CultureInfo.InvariantCulture,
-                        "/ws/2/release/?query=\"{0}\" AND arid:{1}",
-                        WebUtility.UrlEncode(searchInfo.Name),
-                        artistMusicBrainzId);
-                }
-                else
-                {
-                    // I'm sure there is a better way but for now it resolves search for 12" Mixes
-                    var queryName = searchInfo.Name.Replace("\"", string.Empty);
-
-                    url = string.Format(
-                        CultureInfo.InvariantCulture,
-                        "/ws/2/release/?query=\"{0}\" AND artist:\"{1}\"",
-                       WebUtility.UrlEncode(queryName),
-                       WebUtility.UrlEncode(searchInfo.GetAlbumArtist()));
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(url))
-            {
-                using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-                using (var stream = response.Content)
-                {
-                    return GetResultsFromResponse(stream);
-                }
-            }
-
-            return Enumerable.Empty<RemoteSearchResult>();
-        }
-
-        private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream)
-        {
-            using (var oReader = new StreamReader(stream, Encoding.UTF8))
-            {
-                var settings = new XmlReaderSettings()
-                {
-                    ValidationType = ValidationType.None,
-                    CheckCharacters = false,
-                    IgnoreProcessingInstructions = true,
-                    IgnoreComments = true
-                };
-
-                using (var reader = XmlReader.Create(oReader, settings))
-                {
-                    var results = ReleaseResult.Parse(reader);
-
-                    return results.Select(i =>
-                    {
-                        var result = new RemoteSearchResult
-                        {
-                            Name = i.Title,
-                            ProductionYear = i.Year
-                        };
-
-                        if (i.Artists.Count > 0)
-                        {
-                            result.AlbumArtist = new RemoteSearchResult
-                            {
-                                SearchProviderName = Name,
-                                Name = i.Artists[0].Item1
-                            };
-
-                            result.AlbumArtist.SetProviderId(MetadataProviders.MusicBrainzArtist, i.Artists[0].Item2);
-                        }
-
-                        if (!string.IsNullOrWhiteSpace(i.ReleaseId))
-                        {
-                            result.SetProviderId(MetadataProviders.MusicBrainzAlbum, i.ReleaseId);
-                        }
-
-                        if (!string.IsNullOrWhiteSpace(i.ReleaseGroupId))
-                        {
-                            result.SetProviderId(MetadataProviders.MusicBrainzReleaseGroup, i.ReleaseGroupId);
-                        }
-
-                        return result;
-
-                    });
-                }
-            }
-        }
-
-        /// <inheritdoc />
-        public async Task<MetadataResult<MusicAlbum>> GetMetadata(AlbumInfo id, CancellationToken cancellationToken)
-        {
-            var releaseId = id.GetReleaseId();
-            var releaseGroupId = id.GetReleaseGroupId();
-
-            var result = new MetadataResult<MusicAlbum>
-            {
-                Item = new MusicAlbum()
-            };
-
-            // If we have a release group Id but not a release Id...
-            if (string.IsNullOrWhiteSpace(releaseId) && !string.IsNullOrWhiteSpace(releaseGroupId))
-            {
-                releaseId = await GetReleaseIdFromReleaseGroupId(releaseGroupId, cancellationToken).ConfigureAwait(false);
-                result.HasMetadata = true;
-            }
-
-            if (string.IsNullOrWhiteSpace(releaseId))
-            {
-                var artistMusicBrainzId = id.GetMusicBrainzArtistId();
-
-                var releaseResult = await GetReleaseResult(artistMusicBrainzId, id.GetAlbumArtist(), id.Name, cancellationToken).ConfigureAwait(false);
-
-                if (releaseResult != null)
-                {
-                    if (!string.IsNullOrWhiteSpace(releaseResult.ReleaseId))
-                    {
-                        releaseId = releaseResult.ReleaseId;
-                        result.HasMetadata = true;
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(releaseResult.ReleaseGroupId))
-                    {
-                        releaseGroupId = releaseResult.ReleaseGroupId;
-                        result.HasMetadata = true;
-                    }
-
-                    result.Item.ProductionYear = releaseResult.Year;
-                    result.Item.Overview = releaseResult.Overview;
-                }
-            }
-
-            // If we have a release Id but not a release group Id...
-            if (!string.IsNullOrWhiteSpace(releaseId) && string.IsNullOrWhiteSpace(releaseGroupId))
-            {
-                releaseGroupId = await GetReleaseGroupFromReleaseId(releaseId, cancellationToken).ConfigureAwait(false);
-                result.HasMetadata = true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(releaseId) || !string.IsNullOrWhiteSpace(releaseGroupId))
-            {
-                result.HasMetadata = true;
-            }
-
-            if (result.HasMetadata)
-            {
-                if (!string.IsNullOrEmpty(releaseId))
-                {
-                    result.Item.SetProviderId(MetadataProviders.MusicBrainzAlbum, releaseId);
-                }
-
-                if (!string.IsNullOrEmpty(releaseGroupId))
-                {
-                    result.Item.SetProviderId(MetadataProviders.MusicBrainzReleaseGroup, releaseGroupId);
-                }
-            }
-
-            return result;
-        }
-
-        private Task<ReleaseResult> GetReleaseResult(string artistMusicBrainId, string artistName, string albumName, CancellationToken cancellationToken)
-        {
-            if (!string.IsNullOrEmpty(artistMusicBrainId))
-            {
-                return GetReleaseResult(albumName, artistMusicBrainId, cancellationToken);
-            }
-
-            if (string.IsNullOrWhiteSpace(artistName))
-            {
-                return Task.FromResult(new ReleaseResult());
-            }
-
-            return GetReleaseResultByArtistName(albumName, artistName, cancellationToken);
-        }
-
-        private async Task<ReleaseResult> GetReleaseResult(string albumName, string artistId, CancellationToken cancellationToken)
-        {
-            var url = string.Format("/ws/2/release/?query=\"{0}\" AND arid:{1}",
-                WebUtility.UrlEncode(albumName),
-                artistId);
-
-            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-            using (var stream = response.Content)
-            using (var oReader = new StreamReader(stream, Encoding.UTF8))
-            {
-                var settings = new XmlReaderSettings()
-                {
-                    ValidationType = ValidationType.None,
-                    CheckCharacters = false,
-                    IgnoreProcessingInstructions = true,
-                    IgnoreComments = true
-                };
-
-                using (var reader = XmlReader.Create(oReader, settings))
-                {
-                    return ReleaseResult.Parse(reader).FirstOrDefault();
-                }
-            }
-        }
-
-        private async Task<ReleaseResult> GetReleaseResultByArtistName(string albumName, string artistName, CancellationToken cancellationToken)
-        {
-            var url = string.Format(
-                CultureInfo.InvariantCulture,
-                "/ws/2/release/?query=\"{0}\" AND artist:\"{1}\"",
-                WebUtility.UrlEncode(albumName),
-                WebUtility.UrlEncode(artistName));
-
-            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-            using (var stream = response.Content)
-            using (var oReader = new StreamReader(stream, Encoding.UTF8))
-            {
-                var settings = new XmlReaderSettings()
-                {
-                    ValidationType = ValidationType.None,
-                    CheckCharacters = false,
-                    IgnoreProcessingInstructions = true,
-                    IgnoreComments = true
-                };
-
-                using (var reader = XmlReader.Create(oReader, settings))
-                {
-                    return ReleaseResult.Parse(reader).FirstOrDefault();
-                }
-            }
-        }
-
-        private class ReleaseResult
-        {
-            public string ReleaseId;
-            public string ReleaseGroupId;
-            public string Title;
-            public string Overview;
-            public int? Year;
-
-            public List<ValueTuple<string, string>> Artists = new List<ValueTuple<string, string>>();
-
-            public static IEnumerable<ReleaseResult> Parse(XmlReader reader)
-            {
-                reader.MoveToContent();
-                reader.Read();
-
-                // Loop through each element
-                while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-                {
-                    if (reader.NodeType == XmlNodeType.Element)
-                    {
-                        switch (reader.Name)
-                        {
-                            case "release-list":
-                                {
-                                    if (reader.IsEmptyElement)
-                                    {
-                                        reader.Read();
-                                        continue;
-                                    }
-
-                                    using (var subReader = reader.ReadSubtree())
-                                    {
-                                        return ParseReleaseList(subReader).ToList();
-                                    }
-                                }
-                            default:
-                                {
-                                    reader.Skip();
-                                    break;
-                                }
-                        }
-                    }
-                    else
-                    {
-                        reader.Read();
-                    }
-                }
-
-                return Enumerable.Empty<ReleaseResult>();
-            }
-
-            private static IEnumerable<ReleaseResult> ParseReleaseList(XmlReader reader)
-            {
-                reader.MoveToContent();
-                reader.Read();
-
-                // Loop through each element
-                while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-                {
-                    if (reader.NodeType == XmlNodeType.Element)
-                    {
-                        switch (reader.Name)
-                        {
-                            case "release":
-                                {
-                                    if (reader.IsEmptyElement)
-                                    {
-                                        reader.Read();
-                                        continue;
-                                    }
-                                    var releaseId = reader.GetAttribute("id");
-
-                                    using (var subReader = reader.ReadSubtree())
-                                    {
-                                        var release = ParseRelease(subReader, releaseId);
-                                        if (release != null)
-                                        {
-                                            yield return release;
-                                        }
-                                    }
-                                    break;
-                                }
-                            default:
-                                {
-                                    reader.Skip();
-                                    break;
-                                }
-                        }
-                    }
-                    else
-                    {
-                        reader.Read();
-                    }
-                }
-            }
-
-            private static ReleaseResult ParseRelease(XmlReader reader, string releaseId)
-            {
-                var result = new ReleaseResult
-                {
-                    ReleaseId = releaseId
-                };
-
-                reader.MoveToContent();
-                reader.Read();
-
-                // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
-
-                // Loop through each element
-                while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-                {
-                    if (reader.NodeType == XmlNodeType.Element)
-                    {
-                        switch (reader.Name)
-                        {
-                            case "title":
-                                {
-                                    result.Title = reader.ReadElementContentAsString();
-                                    break;
-                                }
-                            case "date":
-                                {
-                                    var val = reader.ReadElementContentAsString();
-                                    if (DateTime.TryParse(val, out var date))
-                                    {
-                                        result.Year = date.Year;
-                                    }
-                                    break;
-                                }
-                            case "annotation":
-                                {
-                                    result.Overview = reader.ReadElementContentAsString();
-                                    break;
-                                }
-                            case "release-group":
-                                {
-                                    result.ReleaseGroupId = reader.GetAttribute("id");
-                                    reader.Skip();
-                                    break;
-                                }
-                            case "artist-credit":
-                                {
-                                    // TODO
-
-                                    /*
-                                     * <artist-credit>
-<name-credit>
-<artist id="e225cda5-882d-4b80-b8a3-b36d7175b1ea">
-<name>SARCASTIC+ZOOKEEPER</name>
-<sort-name>SARCASTIC+ZOOKEEPER</sort-name>
-</artist>
-</name-credit>
-</artist-credit>
-                                     */
-                                    using (var subReader = reader.ReadSubtree())
-                                    {
-                                        var artist = ParseArtistCredit(subReader);
-
-                                        if (!string.IsNullOrEmpty(artist.Item1))
-                                        {
-                                            result.Artists.Add(artist);
-                                        }
-                                    }
-
-                                    break;
-                                }
-                            default:
-                                {
-                                    reader.Skip();
-                                    break;
-                                }
-                        }
-                    }
-                    else
-                    {
-                        reader.Read();
-                    }
-                }
-
-                return result;
-            }
-        }
-
-        private static ValueTuple<string, string> ParseArtistCredit(XmlReader reader)
-        {
-            reader.MoveToContent();
-            reader.Read();
-
-            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
-
-            // Loop through each element
-            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    switch (reader.Name)
-                    {
-                        case "name-credit":
-                            {
-                                using (var subReader = reader.ReadSubtree())
-                                {
-                                    return ParseArtistNameCredit(subReader);
-                                }
-                            }
-                        default:
-                            {
-                                reader.Skip();
-                                break;
-                            }
-                    }
-                }
-                else
-                {
-                    reader.Read();
-                }
-            }
-
-            return new ValueTuple<string, string>();
-        }
-
-        private static (string, string) ParseArtistNameCredit(XmlReader reader)
-        {
-            reader.MoveToContent();
-            reader.Read();
-
-            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
-
-            // Loop through each element
-            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    switch (reader.Name)
-                    {
-                        case "artist":
-                            {
-                                var id = reader.GetAttribute("id");
-                                using (var subReader = reader.ReadSubtree())
-                                {
-                                    return ParseArtistArtistCredit(subReader, id);
-                                }
-                            }
-                        default:
-                            {
-                                reader.Skip();
-                                break;
-                            }
-                    }
-                }
-                else
-                {
-                    reader.Read();
-                }
-            }
-
-            return (null, null);
-        }
-
-        private static (string name, string id) ParseArtistArtistCredit(XmlReader reader, string artistId)
-        {
-            reader.MoveToContent();
-            reader.Read();
-
-            string name = null;
-
-            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
-
-            // Loop through each element
-            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    switch (reader.Name)
-                    {
-                        case "name":
-                            {
-                                name = reader.ReadElementContentAsString();
-                                break;
-                            }
-                        default:
-                            {
-                                reader.Skip();
-                                break;
-                            }
-                    }
-                }
-                else
-                {
-                    reader.Read();
-                }
-            }
-
-            return (name, artistId);
-        }
-
-        private async Task<string> GetReleaseIdFromReleaseGroupId(string releaseGroupId, CancellationToken cancellationToken)
-        {
-            var url = "/ws/2/release?release-group=" + releaseGroupId.ToString(CultureInfo.InvariantCulture);
-
-            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-            using (var stream = response.Content)
-            using (var oReader = new StreamReader(stream, Encoding.UTF8))
-            {
-                var settings = new XmlReaderSettings()
-                {
-                    ValidationType = ValidationType.None,
-                    CheckCharacters = false,
-                    IgnoreProcessingInstructions = true,
-                    IgnoreComments = true
-                };
-
-                using (var reader = XmlReader.Create(oReader, settings))
-                {
-                    var result = ReleaseResult.Parse(reader).FirstOrDefault();
-
-                    if (result != null)
-                    {
-                        return result.ReleaseId;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the release group id internal.
-        /// </summary>
-        /// <param name="releaseEntryId">The release entry id.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{System.String}.</returns>
-        private async Task<string> GetReleaseGroupFromReleaseId(string releaseEntryId, CancellationToken cancellationToken)
-        {
-            var url = "/ws/2/release-group/?query=reid:" + releaseEntryId.ToString(CultureInfo.InvariantCulture);
-
-            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-            using (var stream = response.Content)
-            using (var oReader = new StreamReader(stream, Encoding.UTF8))
-            {
-                var settings = new XmlReaderSettings()
-                {
-                    ValidationType = ValidationType.None,
-                    CheckCharacters = false,
-                    IgnoreProcessingInstructions = true,
-                    IgnoreComments = true
-                };
-
-                using (var reader = XmlReader.Create(oReader, settings))
-                {
-                    reader.MoveToContent();
-                    reader.Read();
-
-                    // Loop through each element
-                    while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-                    {
-                        if (reader.NodeType == XmlNodeType.Element)
-                        {
-                            switch (reader.Name)
-                            {
-                                case "release-group-list":
-                                    {
-                                        if (reader.IsEmptyElement)
-                                        {
-                                            reader.Read();
-                                            continue;
-                                        }
-                                        using (var subReader = reader.ReadSubtree())
-                                        {
-                                            return GetFirstReleaseGroupId(subReader);
-                                        }
-                                    }
-                                default:
-                                    {
-                                        reader.Skip();
-                                        break;
-                                    }
-                            }
-                        }
-                        else
-                        {
-                            reader.Read();
-                        }
-                    }
-
-                    return null;
-                }
-            }
-        }
-
-        private string GetFirstReleaseGroupId(XmlReader reader)
-        {
-            reader.MoveToContent();
-            reader.Read();
-
-            // Loop through each element
-            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    switch (reader.Name)
-                    {
-                        case "release-group":
-                            {
-                                return reader.GetAttribute("id");
-                            }
-                        default:
-                            {
-                                reader.Skip();
-                                break;
-                            }
-                    }
-                }
-                else
-                {
-                    reader.Read();
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Makes request to MusicBrainz server and awaits a response.
-        /// A 503 Service Unavailable response indicates throttling to maintain a rate limit.
-        /// A number of retries shall be made in order to try and satisfy the request before
-        /// giving up and returning null.
-        /// </summary>
-        internal async Task<HttpResponseInfo> GetMusicBrainzResponse(string url, CancellationToken cancellationToken)
-        {
-            var options = new HttpRequestOptions
-            {
-                Url = _musicBrainzBaseUrl.TrimEnd('/') + url,
-                CancellationToken = cancellationToken,
-                // MusicBrainz request a contact email address is supplied, as comment, in user agent field:
-                // https://musicbrainz.org/doc/XML_Web_Service/Rate_Limiting#User-Agent
-                UserAgent = string.Format(
-                    CultureInfo.InvariantCulture,
-                    "{0} ( {1} )",
-                    _appHost.ApplicationUserAgent,
-                    _appHost.ApplicationUserAgentAddress),
-                BufferContent = false
-            };
-
-            HttpResponseInfo response;
-            var attempts = 0u;
-
-            do
-            {
-                attempts++;
-
-                if (_stopWatchMusicBrainz.ElapsedMilliseconds < MusicBrainzQueryIntervalMs)
-                {
-                    // MusicBrainz is extremely adamant about limiting to one request per second
-                    var delayMs = MusicBrainzQueryIntervalMs - _stopWatchMusicBrainz.ElapsedMilliseconds;
-                    await Task.Delay((int)delayMs, cancellationToken).ConfigureAwait(false);
-                }
-
-                // Write time since last request to debug log as evidence we're meeting rate limit
-                // requirement, before resetting stopwatch back to zero.
-                _logger.LogDebug("GetMusicBrainzResponse: Time since previous request: {0} ms", _stopWatchMusicBrainz.ElapsedMilliseconds);
-                _stopWatchMusicBrainz.Restart();
-
-                response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
-
-                // We retry a finite number of times, and only whilst MB is indcating 503 (throttling)
-            }
-            while (attempts < MusicBrainzQueryAttempts && response.StatusCode == HttpStatusCode.ServiceUnavailable);
-
-            // Log error if unable to query MB database due to throttling
-            if (attempts == MusicBrainzQueryAttempts && response.StatusCode == HttpStatusCode.ServiceUnavailable)
-            {
-                _logger.LogError("GetMusicBrainzResponse: 503 Service Unavailable (throttled) response received {0} times whilst requesting {1}", attempts, options.Url);
-            }
-
-            return response;
-        }
-
-        /// <inheritdoc />
-        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
deleted file mode 100644
index 5d675392c..000000000
--- a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Extensions;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Providers;
-
-namespace MediaBrowser.Providers.Music
-{
-    public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, ArtistInfo>
-    {
-        /// <inheritdoc />
-        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(ArtistInfo searchInfo, CancellationToken cancellationToken)
-        {
-            var musicBrainzId = searchInfo.GetMusicBrainzArtistId();
-
-            if (!string.IsNullOrWhiteSpace(musicBrainzId))
-            {
-                var url = "/ws/2/artist/?query=arid:{0}" + musicBrainzId.ToString(CultureInfo.InvariantCulture);
-
-                using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-                using (var stream = response.Content)
-                {
-                    return GetResultsFromResponse(stream);
-                }
-            }
-            else
-            {
-                // They seem to throw bad request failures on any term with a slash
-                var nameToSearch = searchInfo.Name.Replace('/', ' ');
-
-                var url = string.Format("/ws/2/artist/?query=\"{0}\"&dismax=true", UrlEncode(nameToSearch));
-
-                using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-                using (var stream = response.Content)
-                {
-                    var results = GetResultsFromResponse(stream).ToList();
-
-                    if (results.Count > 0)
-                    {
-                        return results;
-                    }
-                }
-
-                if (HasDiacritics(searchInfo.Name))
-                {
-                    // Try again using the search with accent characters url
-                    url = string.Format("/ws/2/artist/?query=artistaccent:\"{0}\"", UrlEncode(nameToSearch));
-
-                    using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
-                    {
-                        using (var stream = response.Content)
-                        {
-                            return GetResultsFromResponse(stream);
-                        }
-                    }
-                }
-            }
-
-            return Enumerable.Empty<RemoteSearchResult>();
-        }
-
-        private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream)
-        {
-            using (var oReader = new StreamReader(stream, Encoding.UTF8))
-            {
-                var settings = new XmlReaderSettings()
-                {
-                    ValidationType = ValidationType.None,
-                    CheckCharacters = false,
-                    IgnoreProcessingInstructions = true,
-                    IgnoreComments = true
-                };
-
-                using (var reader = XmlReader.Create(oReader, settings))
-                {
-                    reader.MoveToContent();
-                    reader.Read();
-
-                    // Loop through each element
-                    while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-                    {
-                        if (reader.NodeType == XmlNodeType.Element)
-                        {
-                            switch (reader.Name)
-                            {
-                                case "artist-list":
-                                    {
-                                        if (reader.IsEmptyElement)
-                                        {
-                                            reader.Read();
-                                            continue;
-                                        }
-                                        using (var subReader = reader.ReadSubtree())
-                                        {
-                                            return ParseArtistList(subReader).ToList();
-                                        }
-                                    }
-                                default:
-                                    {
-                                        reader.Skip();
-                                        break;
-                                    }
-                            }
-                        }
-                        else
-                        {
-                            reader.Read();
-                        }
-                    }
-
-                    return Enumerable.Empty<RemoteSearchResult>();
-                }
-            }
-        }
-
-        private IEnumerable<RemoteSearchResult> ParseArtistList(XmlReader reader)
-        {
-            reader.MoveToContent();
-            reader.Read();
-
-            // Loop through each element
-            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    switch (reader.Name)
-                    {
-                        case "artist":
-                            {
-                                if (reader.IsEmptyElement)
-                                {
-                                    reader.Read();
-                                    continue;
-                                }
-                                var mbzId = reader.GetAttribute("id");
-
-                                using (var subReader = reader.ReadSubtree())
-                                {
-                                    var artist = ParseArtist(subReader, mbzId);
-                                    if (artist != null)
-                                    {
-                                        yield return artist;
-                                    }
-                                }
-                                break;
-                            }
-                        default:
-                            {
-                                reader.Skip();
-                                break;
-                            }
-                    }
-                }
-                else
-                {
-                    reader.Read();
-                }
-            }
-        }
-
-        private RemoteSearchResult ParseArtist(XmlReader reader, string artistId)
-        {
-            var result = new RemoteSearchResult();
-
-            reader.MoveToContent();
-            reader.Read();
-
-            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
-
-            // Loop through each element
-            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    switch (reader.Name)
-                    {
-                        case "name":
-                            {
-                                result.Name = reader.ReadElementContentAsString();
-                                break;
-                            }
-                        case "annotation":
-                            {
-                                result.Overview = reader.ReadElementContentAsString();
-                                break;
-                            }
-                        default:
-                            {
-                                // there is sort-name if ever needed
-                                reader.Skip();
-                                break;
-                            }
-                    }
-                }
-                else
-                {
-                    reader.Read();
-                }
-            }
-
-            result.SetProviderId(MetadataProviders.MusicBrainzArtist, artistId);
-
-            if (string.IsNullOrWhiteSpace(artistId) || string.IsNullOrWhiteSpace(result.Name))
-            {
-                return null;
-            }
-
-            return result;
-        }
-
-        public async Task<MetadataResult<MusicArtist>> GetMetadata(ArtistInfo id, CancellationToken cancellationToken)
-        {
-            var result = new MetadataResult<MusicArtist>
-            {
-                Item = new MusicArtist()
-            };
-
-            var musicBrainzId = id.GetMusicBrainzArtistId();
-
-            if (string.IsNullOrWhiteSpace(musicBrainzId))
-            {
-                var searchResults = await GetSearchResults(id, cancellationToken).ConfigureAwait(false);
-
-                var singleResult = searchResults.FirstOrDefault();
-
-                if (singleResult != null)
-                {
-                    musicBrainzId = singleResult.GetProviderId(MetadataProviders.MusicBrainzArtist);
-                    //result.Item.Name = singleResult.Name;
-                    result.Item.Overview = singleResult.Overview;
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(musicBrainzId))
-            {
-                result.HasMetadata = true;
-                result.Item.SetProviderId(MetadataProviders.MusicBrainzArtist, musicBrainzId);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Determines whether the specified text has diacritics.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <returns><c>true</c> if the specified text has diacritics; otherwise, <c>false</c>.</returns>
-        private bool HasDiacritics(string text)
-        {
-            return !string.Equals(text, text.RemoveDiacritics(), StringComparison.Ordinal);
-        }
-
-        /// <summary>
-        /// Encodes an URL.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>System.String.</returns>
-        private static string UrlEncode(string name)
-        {
-            return WebUtility.UrlEncode(name);
-        }
-
-        public string Name => "MusicBrainz";
-
-        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 585c98af9..b431c1e41 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -5,101 +5,6 @@ using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Providers.Music
 {
-    public class MusicBrainzReleaseGroupExternalId : IExternalId
-    {
-        /// <inheritdoc />
-        public string Name => "MusicBrainz Release Group";
-
-        /// <inheritdoc />
-        public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
-
-        /// <inheritdoc />
-        public string UrlFormatString => "https://musicbrainz.org/release-group/{0}";
-
-        /// <inheritdoc />
-        public bool Supports(IHasProviderIds item)
-            => item is Audio || item is MusicAlbum;
-    }
-
-    public class MusicBrainzAlbumArtistExternalId : IExternalId
-    {
-        /// <inheritdoc />
-        public string Name => "MusicBrainz Album Artist";
-
-        /// <inheritdoc />
-        public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
-
-        /// <inheritdoc />
-        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
-
-        /// <inheritdoc />
-        public bool Supports(IHasProviderIds item)
-            => item is Audio;
-    }
-
-    public class MusicBrainzAlbumExternalId : IExternalId
-    {
-        /// <inheritdoc />
-        public string Name => "MusicBrainz Album";
-
-        /// <inheritdoc />
-        public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
-
-        /// <inheritdoc />
-        public string UrlFormatString => "https://musicbrainz.org/release/{0}";
-
-        /// <inheritdoc />
-        public bool Supports(IHasProviderIds item)
-            => item is Audio || item is MusicAlbum;
-    }
-
-    public class MusicBrainzArtistExternalId : IExternalId
-    {
-        /// <inheritdoc />
-        public string Name => "MusicBrainz";
-
-        /// <inheritdoc />
-        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
-
-        /// <inheritdoc />
-        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
-
-        /// <inheritdoc />
-        public bool Supports(IHasProviderIds item) => item is MusicArtist;
-    }
-
-    public class MusicBrainzOtherArtistExternalId : IExternalId
-    {
-        /// <inheritdoc />
-        public string Name => "MusicBrainz Artist";
-
-        /// <inheritdoc />
-
-        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
-
-        /// <inheritdoc />
-        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
-
-        /// <inheritdoc />
-        public bool Supports(IHasProviderIds item)
-            => item is Audio || item is MusicAlbum;
-    }
-
-    public class MusicBrainzTrackId : IExternalId
-    {
-        /// <inheritdoc />
-        public string Name => "MusicBrainz Track";
-
-        /// <inheritdoc />
-        public string Key => MetadataProviders.MusicBrainzTrack.ToString();
-
-        /// <inheritdoc />
-        public string UrlFormatString => "https://musicbrainz.org/track/{0}";
-
-        /// <inheritdoc />
-        public bool Supports(IHasProviderIds item) => item is Audio;
-    }
-
     public class ImvdbId : IExternalId
     {
         /// <inheritdoc />
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
new file mode 100644
index 000000000..0fddb0557
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
@@ -0,0 +1,799 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using MediaBrowser.Common;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
+using MediaBrowser.Providers.Plugins.MusicBrainz;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.Providers.Music
+{
+    public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, AlbumInfo>, IHasOrder
+    {
+        /// <summary>
+        /// The Jellyfin user-agent is unrestricted but source IP must not exceed
+        /// one request per second, therefore we rate limit to avoid throttling.
+        /// Be prudent, use a value slightly above the minimun required.
+        /// https://musicbrainz.org/doc/XML_Web_Service/Rate_Limiting
+        /// </summary>
+        private readonly long _musicBrainzQueryIntervalMs = 1050u;
+
+        /// <summary>
+        /// For each single MB lookup/search, this is the maximum number of
+        /// attempts that shall be made whilst receiving a 503 Server
+        /// Unavailable (indicating throttled) response.
+        /// </summary>
+        private const uint MusicBrainzQueryAttempts = 5u;
+
+        internal static MusicBrainzAlbumProvider Current;
+
+        private readonly IHttpClient _httpClient;
+        private readonly IApplicationHost _appHost;
+        private readonly ILogger _logger;
+
+        private readonly string _musicBrainzBaseUrl;
+
+        private Stopwatch _stopWatchMusicBrainz = new Stopwatch();
+
+        public MusicBrainzAlbumProvider(
+            IHttpClient httpClient,
+            IApplicationHost appHost,
+            ILogger logger)
+        {
+            _httpClient = httpClient;
+            _appHost = appHost;
+            _logger = logger;
+
+            _musicBrainzBaseUrl = Plugin.Instance.Configuration.Server;
+            _musicBrainzQueryIntervalMs = Plugin.Instance.Configuration.RateLimit;
+
+            // Use a stopwatch to ensure we don't exceed the MusicBrainz rate limit
+            _stopWatchMusicBrainz.Start();
+
+            Current = this;
+        }
+
+        /// <inheritdoc />
+        public string Name => "MusicBrainz";
+
+        /// <inheritdoc />
+        public int Order => 0;
+
+        /// <inheritdoc />
+        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(AlbumInfo searchInfo, CancellationToken cancellationToken)
+        {
+            // TODO maybe remove when artist metadata can be disabled
+            if (!Plugin.Instance.Configuration.Enable)
+            {
+                return Enumerable.Empty<RemoteSearchResult>();
+            }
+
+            var releaseId = searchInfo.GetReleaseId();
+            var releaseGroupId = searchInfo.GetReleaseGroupId();
+
+            string url;
+
+            if (!string.IsNullOrEmpty(releaseId))
+            {
+                url = "/ws/2/release/?query=reid:" + releaseId.ToString(CultureInfo.InvariantCulture);
+            }
+            else if (!string.IsNullOrEmpty(releaseGroupId))
+            {
+                url = "/ws/2/release?release-group=" + releaseGroupId.ToString(CultureInfo.InvariantCulture);
+            }
+            else
+            {
+                var artistMusicBrainzId = searchInfo.GetMusicBrainzArtistId();
+
+                if (!string.IsNullOrWhiteSpace(artistMusicBrainzId))
+                {
+                    url = string.Format(
+                        CultureInfo.InvariantCulture,
+                        "/ws/2/release/?query=\"{0}\" AND arid:{1}",
+                        WebUtility.UrlEncode(searchInfo.Name),
+                        artistMusicBrainzId);
+                }
+                else
+                {
+                    // I'm sure there is a better way but for now it resolves search for 12" Mixes
+                    var queryName = searchInfo.Name.Replace("\"", string.Empty);
+
+                    url = string.Format(
+                        CultureInfo.InvariantCulture,
+                        "/ws/2/release/?query=\"{0}\" AND artist:\"{1}\"",
+                        WebUtility.UrlEncode(queryName),
+                        WebUtility.UrlEncode(searchInfo.GetAlbumArtist()));
+                }
+            }
+
+            if (!string.IsNullOrWhiteSpace(url))
+            {
+                using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+                using (var stream = response.Content)
+                {
+                    return GetResultsFromResponse(stream);
+                }
+            }
+
+            return Enumerable.Empty<RemoteSearchResult>();
+        }
+
+        private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream)
+        {
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
+            {
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
+
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    var results = ReleaseResult.Parse(reader);
+
+                    return results.Select(i =>
+                    {
+                        var result = new RemoteSearchResult
+                        {
+                            Name = i.Title,
+                            ProductionYear = i.Year
+                        };
+
+                        if (i.Artists.Count > 0)
+                        {
+                            result.AlbumArtist = new RemoteSearchResult
+                            {
+                                SearchProviderName = Name,
+                                Name = i.Artists[0].Item1
+                            };
+
+                            result.AlbumArtist.SetProviderId(MetadataProviders.MusicBrainzArtist, i.Artists[0].Item2);
+                        }
+
+                        if (!string.IsNullOrWhiteSpace(i.ReleaseId))
+                        {
+                            result.SetProviderId(MetadataProviders.MusicBrainzAlbum, i.ReleaseId);
+                        }
+
+                        if (!string.IsNullOrWhiteSpace(i.ReleaseGroupId))
+                        {
+                            result.SetProviderId(MetadataProviders.MusicBrainzReleaseGroup, i.ReleaseGroupId);
+                        }
+
+                        return result;
+                    });
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public async Task<MetadataResult<MusicAlbum>> GetMetadata(AlbumInfo id, CancellationToken cancellationToken)
+        {
+            var releaseId = id.GetReleaseId();
+            var releaseGroupId = id.GetReleaseGroupId();
+
+            var result = new MetadataResult<MusicAlbum>
+            {
+                Item = new MusicAlbum()
+            };
+
+            // TODO maybe remove when artist metadata can be disabled
+            if (!Plugin.Instance.Configuration.Enable)
+            {
+                return result;
+            }
+
+            // If we have a release group Id but not a release Id...
+            if (string.IsNullOrWhiteSpace(releaseId) && !string.IsNullOrWhiteSpace(releaseGroupId))
+            {
+                releaseId = await GetReleaseIdFromReleaseGroupId(releaseGroupId, cancellationToken).ConfigureAwait(false);
+                result.HasMetadata = true;
+            }
+
+            if (string.IsNullOrWhiteSpace(releaseId))
+            {
+                var artistMusicBrainzId = id.GetMusicBrainzArtistId();
+
+                var releaseResult = await GetReleaseResult(artistMusicBrainzId, id.GetAlbumArtist(), id.Name, cancellationToken).ConfigureAwait(false);
+
+                if (releaseResult != null)
+                {
+                    if (!string.IsNullOrWhiteSpace(releaseResult.ReleaseId))
+                    {
+                        releaseId = releaseResult.ReleaseId;
+                        result.HasMetadata = true;
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(releaseResult.ReleaseGroupId))
+                    {
+                        releaseGroupId = releaseResult.ReleaseGroupId;
+                        result.HasMetadata = true;
+                    }
+
+                    result.Item.ProductionYear = releaseResult.Year;
+                    result.Item.Overview = releaseResult.Overview;
+                }
+            }
+
+            // If we have a release Id but not a release group Id...
+            if (!string.IsNullOrWhiteSpace(releaseId) && string.IsNullOrWhiteSpace(releaseGroupId))
+            {
+                releaseGroupId = await GetReleaseGroupFromReleaseId(releaseId, cancellationToken).ConfigureAwait(false);
+                result.HasMetadata = true;
+            }
+
+            if (!string.IsNullOrWhiteSpace(releaseId) || !string.IsNullOrWhiteSpace(releaseGroupId))
+            {
+                result.HasMetadata = true;
+            }
+
+            if (result.HasMetadata)
+            {
+                if (!string.IsNullOrEmpty(releaseId))
+                {
+                    result.Item.SetProviderId(MetadataProviders.MusicBrainzAlbum, releaseId);
+                }
+
+                if (!string.IsNullOrEmpty(releaseGroupId))
+                {
+                    result.Item.SetProviderId(MetadataProviders.MusicBrainzReleaseGroup, releaseGroupId);
+                }
+            }
+
+            return result;
+        }
+
+        private Task<ReleaseResult> GetReleaseResult(string artistMusicBrainId, string artistName, string albumName, CancellationToken cancellationToken)
+        {
+            if (!string.IsNullOrEmpty(artistMusicBrainId))
+            {
+                return GetReleaseResult(albumName, artistMusicBrainId, cancellationToken);
+            }
+
+            if (string.IsNullOrWhiteSpace(artistName))
+            {
+                return Task.FromResult(new ReleaseResult());
+            }
+
+            return GetReleaseResultByArtistName(albumName, artistName, cancellationToken);
+        }
+
+        private async Task<ReleaseResult> GetReleaseResult(string albumName, string artistId, CancellationToken cancellationToken)
+        {
+            var url = string.Format("/ws/2/release/?query=\"{0}\" AND arid:{1}",
+                WebUtility.UrlEncode(albumName),
+                artistId);
+
+            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
+            {
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
+
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    return ReleaseResult.Parse(reader).FirstOrDefault();
+                }
+            }
+        }
+
+        private async Task<ReleaseResult> GetReleaseResultByArtistName(string albumName, string artistName, CancellationToken cancellationToken)
+        {
+            var url = string.Format(
+                CultureInfo.InvariantCulture,
+                "/ws/2/release/?query=\"{0}\" AND artist:\"{1}\"",
+                WebUtility.UrlEncode(albumName),
+                WebUtility.UrlEncode(artistName));
+
+            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
+            {
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
+
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    return ReleaseResult.Parse(reader).FirstOrDefault();
+                }
+            }
+        }
+
+        private class ReleaseResult
+        {
+            public string ReleaseId;
+            public string ReleaseGroupId;
+            public string Title;
+            public string Overview;
+            public int? Year;
+
+            public List<ValueTuple<string, string>> Artists = new List<ValueTuple<string, string>>();
+
+            public static IEnumerable<ReleaseResult> Parse(XmlReader reader)
+            {
+                reader.MoveToContent();
+                reader.Read();
+
+                // Loop through each element
+                while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        switch (reader.Name)
+                        {
+                            case "release-list":
+                                {
+                                    if (reader.IsEmptyElement)
+                                    {
+                                        reader.Read();
+                                        continue;
+                                    }
+
+                                    using (var subReader = reader.ReadSubtree())
+                                    {
+                                        return ParseReleaseList(subReader).ToList();
+                                    }
+                                }
+                            default:
+                                {
+                                    reader.Skip();
+                                    break;
+                                }
+                        }
+                    }
+                    else
+                    {
+                        reader.Read();
+                    }
+                }
+
+                return Enumerable.Empty<ReleaseResult>();
+            }
+
+            private static IEnumerable<ReleaseResult> ParseReleaseList(XmlReader reader)
+            {
+                reader.MoveToContent();
+                reader.Read();
+
+                // Loop through each element
+                while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        switch (reader.Name)
+                        {
+                            case "release":
+                                {
+                                    if (reader.IsEmptyElement)
+                                    {
+                                        reader.Read();
+                                        continue;
+                                    }
+                                    var releaseId = reader.GetAttribute("id");
+
+                                    using (var subReader = reader.ReadSubtree())
+                                    {
+                                        var release = ParseRelease(subReader, releaseId);
+                                        if (release != null)
+                                        {
+                                            yield return release;
+                                        }
+                                    }
+                                    break;
+                                }
+                            default:
+                                {
+                                    reader.Skip();
+                                    break;
+                                }
+                        }
+                    }
+                    else
+                    {
+                        reader.Read();
+                    }
+                }
+            }
+
+            private static ReleaseResult ParseRelease(XmlReader reader, string releaseId)
+            {
+                var result = new ReleaseResult
+                {
+                    ReleaseId = releaseId
+                };
+
+                reader.MoveToContent();
+                reader.Read();
+
+                // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
+
+                // Loop through each element
+                while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        switch (reader.Name)
+                        {
+                            case "title":
+                                {
+                                    result.Title = reader.ReadElementContentAsString();
+                                    break;
+                                }
+                            case "date":
+                                {
+                                    var val = reader.ReadElementContentAsString();
+                                    if (DateTime.TryParse(val, out var date))
+                                    {
+                                        result.Year = date.Year;
+                                    }
+                                    break;
+                                }
+                            case "annotation":
+                                {
+                                    result.Overview = reader.ReadElementContentAsString();
+                                    break;
+                                }
+                            case "release-group":
+                                {
+                                    result.ReleaseGroupId = reader.GetAttribute("id");
+                                    reader.Skip();
+                                    break;
+                                }
+                            case "artist-credit":
+                                {
+                                    using (var subReader = reader.ReadSubtree())
+                                    {
+                                        var artist = ParseArtistCredit(subReader);
+
+                                        if (!string.IsNullOrEmpty(artist.Item1))
+                                        {
+                                            result.Artists.Add(artist);
+                                        }
+                                    }
+
+                                    break;
+                                }
+                            default:
+                                {
+                                    reader.Skip();
+                                    break;
+                                }
+                        }
+                    }
+                    else
+                    {
+                        reader.Read();
+                    }
+                }
+
+                return result;
+            }
+        }
+
+        private static ValueTuple<string, string> ParseArtistCredit(XmlReader reader)
+        {
+            reader.MoveToContent();
+            reader.Read();
+
+            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
+
+            // Loop through each element
+            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "name-credit":
+                            {
+                                using (var subReader = reader.ReadSubtree())
+                                {
+                                    return ParseArtistNameCredit(subReader);
+                                }
+                            }
+                        default:
+                            {
+                                reader.Skip();
+                                break;
+                            }
+                    }
+                }
+                else
+                {
+                    reader.Read();
+                }
+            }
+
+            return new ValueTuple<string, string>();
+        }
+
+        private static (string, string) ParseArtistNameCredit(XmlReader reader)
+        {
+            reader.MoveToContent();
+            reader.Read();
+
+            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
+
+            // Loop through each element
+            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "artist":
+                            {
+                                var id = reader.GetAttribute("id");
+                                using (var subReader = reader.ReadSubtree())
+                                {
+                                    return ParseArtistArtistCredit(subReader, id);
+                                }
+                            }
+                        default:
+                            {
+                                reader.Skip();
+                                break;
+                            }
+                    }
+                }
+                else
+                {
+                    reader.Read();
+                }
+            }
+
+            return (null, null);
+        }
+
+        private static (string name, string id) ParseArtistArtistCredit(XmlReader reader, string artistId)
+        {
+            reader.MoveToContent();
+            reader.Read();
+
+            string name = null;
+
+            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
+
+            // Loop through each element
+            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "name":
+                            {
+                                name = reader.ReadElementContentAsString();
+                                break;
+                            }
+                        default:
+                            {
+                                reader.Skip();
+                                break;
+                            }
+                    }
+                }
+                else
+                {
+                    reader.Read();
+                }
+            }
+
+            return (name, artistId);
+        }
+
+        private async Task<string> GetReleaseIdFromReleaseGroupId(string releaseGroupId, CancellationToken cancellationToken)
+        {
+            var url = "/ws/2/release?release-group=" + releaseGroupId.ToString(CultureInfo.InvariantCulture);
+
+            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
+            {
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
+
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    var result = ReleaseResult.Parse(reader).FirstOrDefault();
+
+                    if (result != null)
+                    {
+                        return result.ReleaseId;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the release group id internal.
+        /// </summary>
+        /// <param name="releaseEntryId">The release entry id.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{System.String}.</returns>
+        private async Task<string> GetReleaseGroupFromReleaseId(string releaseEntryId, CancellationToken cancellationToken)
+        {
+            var url = "/ws/2/release-group/?query=reid:" + releaseEntryId.ToString(CultureInfo.InvariantCulture);
+
+            using (var response = await GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
+            {
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
+
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    reader.MoveToContent();
+                    reader.Read();
+
+                    // Loop through each element
+                    while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+                    {
+                        if (reader.NodeType == XmlNodeType.Element)
+                        {
+                            switch (reader.Name)
+                            {
+                                case "release-group-list":
+                                    {
+                                        if (reader.IsEmptyElement)
+                                        {
+                                            reader.Read();
+                                            continue;
+                                        }
+                                        using (var subReader = reader.ReadSubtree())
+                                        {
+                                            return GetFirstReleaseGroupId(subReader);
+                                        }
+                                    }
+                                default:
+                                    {
+                                        reader.Skip();
+                                        break;
+                                    }
+                            }
+                        }
+                        else
+                        {
+                            reader.Read();
+                        }
+                    }
+
+                    return null;
+                }
+            }
+        }
+
+        private string GetFirstReleaseGroupId(XmlReader reader)
+        {
+            reader.MoveToContent();
+            reader.Read();
+
+            // Loop through each element
+            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "release-group":
+                            {
+                                return reader.GetAttribute("id");
+                            }
+                        default:
+                            {
+                                reader.Skip();
+                                break;
+                            }
+                    }
+                }
+                else
+                {
+                    reader.Read();
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Makes request to MusicBrainz server and awaits a response.
+        /// A 503 Service Unavailable response indicates throttling to maintain a rate limit.
+        /// A number of retries shall be made in order to try and satisfy the request before
+        /// giving up and returning null.
+        /// </summary>
+        internal async Task<HttpResponseInfo> GetMusicBrainzResponse(string url, CancellationToken cancellationToken)
+        {
+            var options = new HttpRequestOptions
+            {
+                Url = _musicBrainzBaseUrl.TrimEnd('/') + url,
+                CancellationToken = cancellationToken,
+                // MusicBrainz request a contact email address is supplied, as comment, in user agent field:
+                // https://musicbrainz.org/doc/XML_Web_Service/Rate_Limiting#User-Agent
+                UserAgent = string.Format(
+                    CultureInfo.InvariantCulture,
+                    "{0} ( {1} )",
+                    _appHost.ApplicationUserAgent,
+                    _appHost.ApplicationUserAgentAddress),
+                BufferContent = false
+            };
+
+            HttpResponseInfo response;
+            var attempts = 0u;
+
+            do
+            {
+                attempts++;
+
+                if (_stopWatchMusicBrainz.ElapsedMilliseconds < _musicBrainzQueryIntervalMs)
+                {
+                    // MusicBrainz is extremely adamant about limiting to one request per second
+                    var delayMs = _musicBrainzQueryIntervalMs - _stopWatchMusicBrainz.ElapsedMilliseconds;
+                    await Task.Delay((int)delayMs, cancellationToken).ConfigureAwait(false);
+                }
+
+                // Write time since last request to debug log as evidence we're meeting rate limit
+                // requirement, before resetting stopwatch back to zero.
+                _logger.LogDebug("GetMusicBrainzResponse: Time since previous request: {0} ms", _stopWatchMusicBrainz.ElapsedMilliseconds);
+                _stopWatchMusicBrainz.Restart();
+
+                response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
+
+                // We retry a finite number of times, and only whilst MB is indicating 503 (throttling)
+            }
+            while (attempts < MusicBrainzQueryAttempts && response.StatusCode == HttpStatusCode.ServiceUnavailable);
+
+            // Log error if unable to query MB database due to throttling
+            if (attempts == MusicBrainzQueryAttempts && response.StatusCode == HttpStatusCode.ServiceUnavailable)
+            {
+                _logger.LogError("GetMusicBrainzResponse: 503 Service Unavailable (throttled) response received {0} times whilst requesting {1}", attempts, options.Url);
+            }
+
+            return response;
+        }
+
+        /// <inheritdoc />
+        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
new file mode 100644
index 000000000..260a3b6e7
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
@@ -0,0 +1,298 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Extensions;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
+using MediaBrowser.Providers.Plugins.MusicBrainz;
+
+namespace MediaBrowser.Providers.Music
+{
+    public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, ArtistInfo>
+    {
+        /// <inheritdoc />
+        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(ArtistInfo searchInfo, CancellationToken cancellationToken)
+        {
+            // TODO maybe remove when artist metadata can be disabled
+            if (!Plugin.Instance.Configuration.Enable)
+            {
+                return Enumerable.Empty<RemoteSearchResult>();
+            }
+
+            var musicBrainzId = searchInfo.GetMusicBrainzArtistId();
+
+            if (!string.IsNullOrWhiteSpace(musicBrainzId))
+            {
+                var url = "/ws/2/artist/?query=arid:{0}" + musicBrainzId.ToString(CultureInfo.InvariantCulture);
+
+                using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+                using (var stream = response.Content)
+                {
+                    return GetResultsFromResponse(stream);
+                }
+            }
+            else
+            {
+                // They seem to throw bad request failures on any term with a slash
+                var nameToSearch = searchInfo.Name.Replace('/', ' ');
+
+                var url = string.Format("/ws/2/artist/?query=\"{0}\"&dismax=true", UrlEncode(nameToSearch));
+
+                using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+                using (var stream = response.Content)
+                {
+                    var results = GetResultsFromResponse(stream).ToList();
+
+                    if (results.Count > 0)
+                    {
+                        return results;
+                    }
+                }
+
+                if (HasDiacritics(searchInfo.Name))
+                {
+                    // Try again using the search with accent characters url
+                    url = string.Format("/ws/2/artist/?query=artistaccent:\"{0}\"", UrlEncode(nameToSearch));
+
+                    using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, cancellationToken).ConfigureAwait(false))
+                    {
+                        using (var stream = response.Content)
+                        {
+                            return GetResultsFromResponse(stream);
+                        }
+                    }
+                }
+            }
+
+            return Enumerable.Empty<RemoteSearchResult>();
+        }
+
+        private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream)
+        {
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
+            {
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
+
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    reader.MoveToContent();
+                    reader.Read();
+
+                    // Loop through each element
+                    while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+                    {
+                        if (reader.NodeType == XmlNodeType.Element)
+                        {
+                            switch (reader.Name)
+                            {
+                                case "artist-list":
+                                    {
+                                        if (reader.IsEmptyElement)
+                                        {
+                                            reader.Read();
+                                            continue;
+                                        }
+                                        using (var subReader = reader.ReadSubtree())
+                                        {
+                                            return ParseArtistList(subReader).ToList();
+                                        }
+                                    }
+                                default:
+                                    {
+                                        reader.Skip();
+                                        break;
+                                    }
+                            }
+                        }
+                        else
+                        {
+                            reader.Read();
+                        }
+                    }
+
+                    return Enumerable.Empty<RemoteSearchResult>();
+                }
+            }
+        }
+
+        private IEnumerable<RemoteSearchResult> ParseArtistList(XmlReader reader)
+        {
+            reader.MoveToContent();
+            reader.Read();
+
+            // Loop through each element
+            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "artist":
+                            {
+                                if (reader.IsEmptyElement)
+                                {
+                                    reader.Read();
+                                    continue;
+                                }
+                                var mbzId = reader.GetAttribute("id");
+
+                                using (var subReader = reader.ReadSubtree())
+                                {
+                                    var artist = ParseArtist(subReader, mbzId);
+                                    if (artist != null)
+                                    {
+                                        yield return artist;
+                                    }
+                                }
+                                break;
+                            }
+                        default:
+                            {
+                                reader.Skip();
+                                break;
+                            }
+                    }
+                }
+                else
+                {
+                    reader.Read();
+                }
+            }
+        }
+
+        private RemoteSearchResult ParseArtist(XmlReader reader, string artistId)
+        {
+            var result = new RemoteSearchResult();
+
+            reader.MoveToContent();
+            reader.Read();
+
+            // http://stackoverflow.com/questions/2299632/why-does-xmlreader-skip-every-other-element-if-there-is-no-whitespace-separator
+
+            // Loop through each element
+            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "name":
+                            {
+                                result.Name = reader.ReadElementContentAsString();
+                                break;
+                            }
+                        case "annotation":
+                            {
+                                result.Overview = reader.ReadElementContentAsString();
+                                break;
+                            }
+                        default:
+                            {
+                                // there is sort-name if ever needed
+                                reader.Skip();
+                                break;
+                            }
+                    }
+                }
+                else
+                {
+                    reader.Read();
+                }
+            }
+
+            result.SetProviderId(MetadataProviders.MusicBrainzArtist, artistId);
+
+            if (string.IsNullOrWhiteSpace(artistId) || string.IsNullOrWhiteSpace(result.Name))
+            {
+                return null;
+            }
+
+            return result;
+        }
+
+        public async Task<MetadataResult<MusicArtist>> GetMetadata(ArtistInfo id, CancellationToken cancellationToken)
+        {
+            var result = new MetadataResult<MusicArtist>
+            {
+                Item = new MusicArtist()
+            };
+
+            // TODO maybe remove when artist metadata can be disabled
+            if (!Plugin.Instance.Configuration.Enable)
+            {
+                return result;
+            }
+
+            var musicBrainzId = id.GetMusicBrainzArtistId();
+
+            if (string.IsNullOrWhiteSpace(musicBrainzId))
+            {
+                var searchResults = await GetSearchResults(id, cancellationToken).ConfigureAwait(false);
+
+                var singleResult = searchResults.FirstOrDefault();
+
+                if (singleResult != null)
+                {
+                    musicBrainzId = singleResult.GetProviderId(MetadataProviders.MusicBrainzArtist);
+                    result.Item.Overview = singleResult.Overview;
+
+                    if (Plugin.Instance.Configuration.ReplaceArtistName)
+                    {
+                        result.Item.Name = singleResult.Name;
+                    }
+                }
+            }
+
+            if (!string.IsNullOrWhiteSpace(musicBrainzId))
+            {
+                result.HasMetadata = true;
+                result.Item.SetProviderId(MetadataProviders.MusicBrainzArtist, musicBrainzId);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Determines whether the specified text has diacritics.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <returns><c>true</c> if the specified text has diacritics; otherwise, <c>false</c>.</returns>
+        private bool HasDiacritics(string text)
+        {
+            return !string.Equals(text, text.RemoveDiacritics(), StringComparison.Ordinal);
+        }
+
+        /// <summary>
+        /// Encodes an URL.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>System.String.</returns>
+        private static string UrlEncode(string name)
+        {
+            return WebUtility.UrlEncode(name);
+        }
+
+        public string Name => "MusicBrainz";
+
+        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/PluginConfiguration.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/PluginConfiguration.cs
new file mode 100644
index 000000000..6bce0b447
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/PluginConfiguration.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using MediaBrowser.Model.Plugins;
+
+namespace MediaBrowser.Providers.Plugins.MusicBrainz
+{
+    public class PluginConfiguration : BasePluginConfiguration
+    {
+        public bool Enable { get; set; } = false;
+
+        public bool ReplaceArtistName { get; set; } = false;
+
+        public string Server { get; set; } = "https://www.musicbrainz.org";
+
+        public long RateLimit { get; set; } = 1000u;
+    }
+}
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/config.html b/MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/config.html
new file mode 100644
index 000000000..dfffa9065
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/Configuration/config.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>MusicBrainz</title>
+</head>
+<body>
+    <div data-role="page" class="page type-interior pluginConfigurationPage musicBrainzConfigPage" data-require="emby-input,emby-button,emby-checkbox">
+        <div data-role="content">
+            <div class="content-primary">
+                <form class="musicBrainzConfigForm">
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="server" label="Server:" />
+                        <div class="fieldDescription">This can either be a mirror of the official server or a custom server.</div>
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="number" id="rateLimit" pattern="[0-9]*" required min="400" max="10000" label="Rate Limit:" />
+                        <div class="fieldDescription">Span of time between each request in milliseconds.</div>
+                    </div>
+                    <label class="checkboxContainer">
+                        <input is="emby-checkbox" type="checkbox" id="enable" />
+                        <span>Enable this provider for metadata searches on artists and albums.</span>
+                    </label>
+                    <label class="checkboxContainer">
+                        <input is="emby-checkbox" type="checkbox" id="replaceArtistName" />
+                        <span>When an artist is found during a metadata search, replace the artist name with the value on the server.</span>
+                    </label>
+                    <br />
+                    <div>
+                        <button is="emby-button" type="submit" class="raised button-submit block"><span>Save</span></button>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <script type="text/javascript">
+            var MusicBrainzPluginConfig = {
+                uniquePluginId: "8c95c4d2-e50c-4fb0-a4f3-6c06ff0f9a1a"
+            };
+
+            $('.musicBrainzConfigPage').on('pageshow', function () {
+                Dashboard.showLoadingMsg();
+                ApiClient.getPluginConfiguration(MusicBrainzPluginConfig.uniquePluginId).then(function (config) {
+                    $('#server').val(config.Server).change();
+                    $('#rateLimit').val(config.RateLimit).change();
+                    $('#enable').checked(config.Enable);
+                    $('#replaceArtistName').checked(config.ReplaceArtistName);
+
+                    Dashboard.hideLoadingMsg();
+                });
+            });
+
+            $('.musicBrainzConfigForm').on('submit', function (e) {
+                Dashboard.showLoadingMsg();
+
+                var form = this;
+                ApiClient.getPluginConfiguration(MusicBrainzPluginConfig.uniquePluginId).then(function (config) {
+                    config.Server = $('#server', form).val();
+                    config.RateLimit = $('#rateLimit', form).val();
+                    config.Enable = $('#enable', form).checked();
+                    config.ReplaceArtistName = $('#replaceArtistName', form).checked();
+
+                    ApiClient.updatePluginConfiguration(MusicBrainzPluginConfig.uniquePluginId, config).then(Dashboard.processPluginConfigurationUpdateResult);
+                });
+
+                return false;
+            });
+        </script>
+    </div>
+</body>
+</html>
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzExternalIds.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzExternalIds.cs
new file mode 100644
index 000000000..0184d4241
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzExternalIds.cs
@@ -0,0 +1,102 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Providers.Music
+{
+    public class MusicBrainzReleaseGroupExternalId : IExternalId
+    {
+        /// <inheritdoc />
+        public string Name => "MusicBrainz Release Group";
+
+        /// <inheritdoc />
+        public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
+
+        /// <inheritdoc />
+        public string UrlFormatString => "https://musicbrainz.org/release-group/{0}";
+
+        /// <inheritdoc />
+        public bool Supports(IHasProviderIds item)
+            => item is Audio || item is MusicAlbum;
+    }
+
+    public class MusicBrainzAlbumArtistExternalId : IExternalId
+    {
+        /// <inheritdoc />
+        public string Name => "MusicBrainz Album Artist";
+
+        /// <inheritdoc />
+        public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
+
+        /// <inheritdoc />
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
+
+        /// <inheritdoc />
+        public bool Supports(IHasProviderIds item)
+            => item is Audio;
+    }
+
+    public class MusicBrainzAlbumExternalId : IExternalId
+    {
+        /// <inheritdoc />
+        public string Name => "MusicBrainz Album";
+
+        /// <inheritdoc />
+        public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
+
+        /// <inheritdoc />
+        public string UrlFormatString => "https://musicbrainz.org/release/{0}";
+
+        /// <inheritdoc />
+        public bool Supports(IHasProviderIds item)
+            => item is Audio || item is MusicAlbum;
+    }
+
+    public class MusicBrainzArtistExternalId : IExternalId
+    {
+        /// <inheritdoc />
+        public string Name => "MusicBrainz";
+
+        /// <inheritdoc />
+        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
+
+        /// <inheritdoc />
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
+
+        /// <inheritdoc />
+        public bool Supports(IHasProviderIds item) => item is MusicArtist;
+    }
+
+    public class MusicBrainzOtherArtistExternalId : IExternalId
+    {
+        /// <inheritdoc />
+        public string Name => "MusicBrainz Artist";
+
+        /// <inheritdoc />
+
+        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
+
+        /// <inheritdoc />
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
+
+        /// <inheritdoc />
+        public bool Supports(IHasProviderIds item)
+            => item is Audio || item is MusicAlbum;
+    }
+
+    public class MusicBrainzTrackId : IExternalId
+    {
+        /// <inheritdoc />
+        public string Name => "MusicBrainz Track";
+
+        /// <inheritdoc />
+        public string Key => MetadataProviders.MusicBrainzTrack.ToString();
+
+        /// <inheritdoc />
+        public string UrlFormatString => "https://musicbrainz.org/track/{0}";
+
+        /// <inheritdoc />
+        public bool Supports(IHasProviderIds item) => item is Audio;
+    }
+}
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/Plugin.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/Plugin.cs
new file mode 100644
index 000000000..2211d513f
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/Plugin.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Plugins;
+using MediaBrowser.Model.Plugins;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Providers.Plugins.MusicBrainz
+{
+    public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
+    {
+        public Plugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer)
+            : base(applicationPaths, xmlSerializer)
+        {
+            Instance = this;
+        }
+
+        public IEnumerable<PluginPageInfo> GetPages()
+        {
+            yield return new PluginPageInfo
+            {
+                Name = Name,
+                EmbeddedResourcePath = GetType().Namespace + ".Configuration.config.html"
+            };
+        }
+
+        public override Guid Id => new Guid("8c95c4d2-e50c-4fb0-a4f3-6c06ff0f9a1a");
+
+        public override string Name => "MusicBrainz";
+
+        public override string Description => "Get artist and album metadata from any MusicBrainz server.";
+
+        public static Plugin Instance { get; private set; }
+    }
+}
-- 
cgit v1.2.3


From 07cc4be6a747cfea40ee7a540385d6d8f38de726 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 23 Feb 2020 12:11:43 +0100
Subject: Fix some warnings

* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
---
 Emby.Dlna/Api/DlnaServerService.cs                 |  1 -
 Emby.Dlna/Api/DlnaService.cs                       |  1 -
 Emby.Dlna/Common/Argument.cs                       |  1 -
 Emby.Dlna/Common/DeviceIcon.cs                     |  1 -
 Emby.Dlna/Common/DeviceService.cs                  |  1 -
 Emby.Dlna/Common/ServiceAction.cs                  |  1 -
 Emby.Dlna/Common/StateVariable.cs                  |  1 -
 Emby.Dlna/Configuration/DlnaOptions.cs             |  1 -
 Emby.Dlna/ConfigurationExtension.cs                |  1 -
 Emby.Dlna/ConnectionManager/ConnectionManager.cs   |  1 -
 .../ConnectionManagerXmlBuilder.cs                 |  1 -
 Emby.Dlna/ConnectionManager/ControlHandler.cs      |  1 -
 .../ConnectionManager/ServiceActionListBuilder.cs  |  1 -
 Emby.Dlna/ContentDirectory/ContentDirectory.cs     |  1 -
 .../ContentDirectory/ContentDirectoryXmlBuilder.cs |  1 -
 Emby.Dlna/ContentDirectory/ControlHandler.cs       |  1 -
 .../ContentDirectory/ServiceActionListBuilder.cs   |  1 -
 Emby.Dlna/ControlRequest.cs                        |  1 -
 Emby.Dlna/ControlResponse.cs                       |  1 -
 Emby.Dlna/Didl/DidlBuilder.cs                      |  1 -
 Emby.Dlna/Didl/Filter.cs                           |  1 -
 Emby.Dlna/Didl/StringWriterWithEncoding.cs         |  1 -
 Emby.Dlna/DlnaManager.cs                           |  1 -
 Emby.Dlna/EventSubscriptionResponse.cs             |  1 -
 Emby.Dlna/Eventing/EventManager.cs                 |  1 -
 Emby.Dlna/Eventing/EventSubscription.cs            |  1 -
 Emby.Dlna/IConnectionManager.cs                    |  1 -
 Emby.Dlna/IContentDirectory.cs                     |  1 -
 Emby.Dlna/IEventManager.cs                         |  1 -
 Emby.Dlna/IMediaReceiverRegistrar.cs               |  1 -
 Emby.Dlna/IUpnpService.cs                          |  1 -
 Emby.Dlna/Main/DlnaEntryPoint.cs                   |  1 -
 Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs |  1 -
 .../MediaReceiverRegistrar.cs                      |  1 -
 .../MediaReceiverRegistrarXmlBuilder.cs            |  1 -
 .../ServiceActionListBuilder.cs                    |  1 -
 Emby.Dlna/PlayTo/Device.cs                         |  1 -
 Emby.Dlna/PlayTo/DeviceInfo.cs                     |  1 -
 Emby.Dlna/PlayTo/PlayToController.cs               |  1 -
 Emby.Dlna/PlayTo/PlayToManager.cs                  |  1 -
 Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs      |  1 -
 Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs         |  1 -
 Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs       |  1 -
 Emby.Dlna/PlayTo/PlaylistItem.cs                   |  1 -
 Emby.Dlna/PlayTo/PlaylistItemFactory.cs            |  1 -
 Emby.Dlna/PlayTo/SsdpHttpClient.cs                 |  1 -
 Emby.Dlna/PlayTo/TRANSPORTSTATE.cs                 |  1 -
 Emby.Dlna/PlayTo/TransportCommands.cs              |  1 -
 Emby.Dlna/PlayTo/UpnpContainer.cs                  |  1 -
 Emby.Dlna/PlayTo/uBaseObject.cs                    |  1 -
 Emby.Dlna/PlayTo/uPnpNamespaces.cs                 |  1 -
 Emby.Dlna/Profiles/DefaultProfile.cs               |  1 -
 Emby.Dlna/Profiles/DenonAvrProfile.cs              |  1 -
 Emby.Dlna/Profiles/DirectTvProfile.cs              |  1 -
 Emby.Dlna/Profiles/DishHopperJoeyProfile.cs        |  1 -
 Emby.Dlna/Profiles/Foobar2000Profile.cs            |  1 -
 Emby.Dlna/Profiles/LgTvProfile.cs                  |  1 -
 Emby.Dlna/Profiles/LinksysDMA2100Profile.cs        |  1 -
 Emby.Dlna/Profiles/MarantzProfile.cs               |  1 -
 Emby.Dlna/Profiles/MediaMonkeyProfile.cs           |  1 -
 Emby.Dlna/Profiles/PanasonicVieraProfile.cs        |  1 -
 Emby.Dlna/Profiles/PopcornHourProfile.cs           |  1 -
 Emby.Dlna/Profiles/SamsungSmartTvProfile.cs        |  1 -
 Emby.Dlna/Profiles/SharpSmartTvProfile.cs          |  1 -
 Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs         |  1 -
 Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs         |  1 -
 Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs         |  1 -
 Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs         |  1 -
 Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs      |  1 -
 Emby.Dlna/Profiles/SonyBravia2010Profile.cs        |  1 -
 Emby.Dlna/Profiles/SonyBravia2011Profile.cs        |  1 -
 Emby.Dlna/Profiles/SonyBravia2012Profile.cs        |  1 -
 Emby.Dlna/Profiles/SonyBravia2013Profile.cs        |  1 -
 Emby.Dlna/Profiles/SonyBravia2014Profile.cs        |  1 -
 Emby.Dlna/Profiles/SonyPs3Profile.cs               |  1 -
 Emby.Dlna/Profiles/SonyPs4Profile.cs               |  1 -
 Emby.Dlna/Profiles/WdtvLiveProfile.cs              |  1 -
 Emby.Dlna/Profiles/XboxOneProfile.cs               |  1 -
 Emby.Dlna/Server/DescriptionXmlBuilder.cs          |  1 -
 Emby.Dlna/Service/BaseControlHandler.cs            |  1 -
 Emby.Dlna/Service/BaseService.cs                   |  1 -
 Emby.Dlna/Service/ControlErrorHandler.cs           |  1 -
 Emby.Dlna/Service/ServiceXmlBuilder.cs             |  1 -
 Emby.Dlna/Ssdp/DeviceDiscovery.cs                  |  1 -
 Emby.Dlna/Ssdp/Extensions.cs                       |  1 -
 Emby.Naming/Audio/AlbumParser.cs                   |  1 -
 Emby.Naming/Audio/AudioFileParser.cs               |  1 -
 Emby.Naming/AudioBook/AudioBookFilePathParser.cs   |  1 -
 .../AudioBook/AudioBookFilePathParserResult.cs     |  1 -
 Emby.Naming/AudioBook/AudioBookListResolver.cs     |  1 -
 Emby.Naming/AudioBook/AudioBookResolver.cs         |  1 -
 Emby.Naming/Common/EpisodeExpression.cs            |  1 -
 Emby.Naming/Common/MediaType.cs                    |  1 -
 Emby.Naming/Common/NamingOptions.cs                |  1 -
 Emby.Naming/Subtitles/SubtitleInfo.cs              |  1 -
 Emby.Naming/Subtitles/SubtitleParser.cs            |  1 -
 Emby.Naming/TV/EpisodeInfo.cs                      |  1 -
 Emby.Naming/TV/EpisodePathParser.cs                |  1 -
 Emby.Naming/TV/EpisodePathParserResult.cs          |  1 -
 Emby.Naming/TV/EpisodeResolver.cs                  |  1 -
 Emby.Naming/TV/SeasonPathParser.cs                 |  1 -
 Emby.Naming/TV/SeasonPathParserResult.cs           |  1 -
 Emby.Naming/Video/CleanDateTimeParser.cs           |  1 -
 Emby.Naming/Video/CleanDateTimeResult.cs           |  1 -
 Emby.Naming/Video/CleanStringParser.cs             |  1 -
 Emby.Naming/Video/ExtraResolver.cs                 |  1 -
 Emby.Naming/Video/ExtraResult.cs                   |  1 -
 Emby.Naming/Video/ExtraRule.cs                     |  1 -
 Emby.Naming/Video/ExtraRuleType.cs                 |  1 -
 Emby.Naming/Video/FileStack.cs                     |  1 -
 Emby.Naming/Video/FlagParser.cs                    |  1 -
 Emby.Naming/Video/Format3DParser.cs                |  1 -
 Emby.Naming/Video/Format3DResult.cs                |  1 -
 Emby.Naming/Video/Format3DRule.cs                  |  1 -
 Emby.Naming/Video/StackResolver.cs                 |  1 -
 Emby.Naming/Video/StubResolver.cs                  |  1 -
 Emby.Naming/Video/StubResult.cs                    |  1 -
 Emby.Naming/Video/StubTypeRule.cs                  |  1 -
 Emby.Naming/Video/VideoListResolver.cs             |  1 -
 Emby.Naming/Video/VideoResolver.cs                 |  1 -
 .../Activity/ActivityLogEntryPoint.cs              |  1 -
 .../Activity/ActivityManager.cs                    |  1 -
 .../Activity/ActivityRepository.cs                 |  1 -
 Emby.Server.Implementations/ApplicationHost.cs     |  1 -
 .../Branding/BrandingConfigurationFactory.cs       |  1 -
 .../Channels/ChannelDynamicMediaSourceProvider.cs  |  1 -
 .../Channels/ChannelImageProvider.cs               |  1 -
 .../Channels/ChannelManager.cs                     |  1 -
 .../Channels/ChannelPostScanTask.cs                |  1 -
 .../Channels/RefreshChannelsScheduledTask.cs       |  1 -
 .../Collections/CollectionImageProvider.cs         |  1 -
 .../Collections/CollectionManager.cs               |  1 -
 .../Data/BaseSqliteRepository.cs                   |  1 -
 .../Data/CleanDatabaseScheduledTask.cs             |  1 -
 .../Data/ManagedConnection.cs                      |  1 -
 .../Data/SqliteDisplayPreferencesRepository.cs     |  1 -
 .../Data/SqliteExtensions.cs                       |  1 -
 .../Data/SqliteUserDataRepository.cs               |  1 -
 .../Data/SqliteUserRepository.cs                   |  1 -
 Emby.Server.Implementations/Devices/DeviceId.cs    |  1 -
 .../Devices/DeviceManager.cs                       |  1 -
 .../Diagnostics/CommonProcess.cs                   |  1 -
 .../Diagnostics/ProcessFactory.cs                  |  1 -
 Emby.Server.Implementations/Dto/DtoService.cs      |  1 -
 .../EntryPoints/ExternalPortForwarding.cs          |  1 -
 .../EntryPoints/LibraryChangedNotifier.cs          |  1 -
 .../EntryPoints/RecordingNotifier.cs               |  1 -
 .../EntryPoints/UserDataChangeNotifier.cs          |  1 -
 .../HttpServer/FileWriter.cs                       |  1 -
 .../HttpServer/HttpListenerHost.cs                 |  1 -
 .../HttpServer/HttpResultFactory.cs                |  1 -
 .../HttpServer/IHttpListener.cs                    |  1 -
 .../HttpServer/RangeRequestWriter.cs               |  1 -
 .../HttpServer/Security/AuthService.cs             |  1 -
 .../HttpServer/Security/AuthorizationContext.cs    |  1 -
 .../HttpServer/Security/SessionContext.cs          |  1 -
 .../IO/ExtendedFileSystemInfo.cs                   |  1 -
 Emby.Server.Implementations/IO/FileRefresher.cs    |  1 -
 Emby.Server.Implementations/IO/LibraryMonitor.cs   |  1 -
 .../IO/ManagedFileSystem.cs                        |  1 -
 .../IO/MbLinkShortcutHandler.cs                    |  1 -
 Emby.Server.Implementations/IO/StreamHelper.cs     |  1 -
 .../Images/BaseDynamicImageProvider.cs             |  1 -
 .../Library/ExclusiveLiveStream.cs                 |  1 -
 .../Library/LibraryManager.cs                      |  1 -
 .../Library/LiveStreamHelper.cs                    |  1 -
 .../Library/MediaSourceManager.cs                  |  1 -
 .../Library/MediaStreamSelector.cs                 |  1 -
 .../Library/MusicManager.cs                        |  1 -
 .../Library/ResolverHelper.cs                      |  2 +-
 .../Library/Resolvers/Audio/AudioResolver.cs       |  1 -
 .../Library/Resolvers/BaseVideoResolver.cs         |  1 -
 .../Library/Resolvers/Books/BookResolver.cs        |  1 -
 .../Library/Resolvers/PhotoResolver.cs             |  1 -
 .../Library/Resolvers/PlaylistResolver.cs          |  1 -
 .../Library/Resolvers/SpecialFolderResolver.cs     |  1 -
 .../Library/Resolvers/TV/SeriesResolver.cs         |  1 -
 .../Library/Resolvers/VideoResolver.cs             |  1 -
 .../Library/SearchEngine.cs                        |  1 -
 .../Library/UserDataManager.cs                     |  1 -
 Emby.Server.Implementations/Library/UserManager.cs |  1 -
 .../Library/UserViewManager.cs                     |  1 -
 .../LiveTv/EmbyTV/EmbyTV.cs                        |  1 -
 .../LiveTv/EmbyTV/EpgChannelData.cs                |  1 -
 .../LiveTv/LiveTvManager.cs                        |  1 -
 MediaBrowser.Api/Playback/MediaInfoService.cs      |  1 -
 .../Configuration/ConfigurationUpdateEventArgs.cs  |  1 -
 .../Configuration/IConfigurationManager.cs         |  1 -
 MediaBrowser.Common/Cryptography/PasswordHash.cs   |  1 -
 .../Extensions/RateLimitExceededException.cs       |  1 -
 MediaBrowser.Common/Net/CustomHeaderNames.cs       |  1 -
 MediaBrowser.Common/Net/HttpRequestOptions.cs      |  1 -
 MediaBrowser.Common/Net/HttpResponseInfo.cs        |  1 -
 MediaBrowser.Common/Net/INetworkManager.cs         |  1 -
 MediaBrowser.Common/Plugins/IPlugin.cs             |  1 -
 MediaBrowser.Common/Plugins/IPluginAssembly.cs     |  1 -
 MediaBrowser.Common/Progress/ActionableProgress.cs |  1 -
 .../Providers/SubtitleConfigurationFactory.cs      |  1 -
 MediaBrowser.Common/System/OperatingSystem.cs      |  1 -
 .../Updates/IInstallationManager.cs                |  1 -
 .../Updates/InstallationEventArgs.cs               |  1 -
 .../Updates/InstallationFailedEventArgs.cs         |  1 -
 .../Authentication/AuthenticationResult.cs         |  1 -
 MediaBrowser.Model/Activity/ActivityLogEntry.cs    |  1 -
 MediaBrowser.Model/Activity/IActivityManager.cs    |  1 -
 MediaBrowser.Model/Activity/IActivityRepository.cs |  1 -
 .../ApiClient/ServerDiscoveryInfo.cs               |  3 +-
 MediaBrowser.Model/Branding/BrandingOptions.cs     |  3 +-
 MediaBrowser.Model/Channels/ChannelFeatures.cs     |  1 -
 MediaBrowser.Model/Channels/ChannelFolderType.cs   |  1 -
 MediaBrowser.Model/Channels/ChannelInfo.cs         |  1 -
 .../Channels/ChannelItemSortField.cs               |  1 -
 .../Channels/ChannelMediaContentType.cs            |  1 -
 MediaBrowser.Model/Channels/ChannelMediaType.cs    |  1 -
 MediaBrowser.Model/Channels/ChannelQuery.cs        |  1 -
 .../Collections/CollectionCreationResult.cs        |  1 -
 MediaBrowser.Model/Configuration/AccessSchedule.cs |  1 -
 .../Configuration/DynamicDayOfWeek.cs              |  1 -
 .../Configuration/EncodingOptions.cs               |  1 -
 MediaBrowser.Model/Configuration/ImageOption.cs    |  3 +-
 .../Configuration/ImageSavingConvention.cs         |  1 -
 MediaBrowser.Model/Configuration/LibraryOptions.cs |  1 -
 .../Configuration/MetadataConfiguration.cs         |  1 -
 .../Configuration/MetadataOptions.cs               |  1 -
 MediaBrowser.Model/Configuration/MetadataPlugin.cs |  1 -
 .../Configuration/MetadataPluginSummary.cs         |  1 -
 .../Configuration/MetadataPluginType.cs            |  1 -
 .../Configuration/ServerConfiguration.cs           |  1 -
 .../Configuration/SubtitlePlaybackMode.cs          |  1 -
 MediaBrowser.Model/Configuration/UnratedItem.cs    |  1 -
 .../Configuration/UserConfiguration.cs             |  1 -
 .../Configuration/XbmcMetadataOptions.cs           |  1 -
 MediaBrowser.Model/Cryptography/ICryptoProvider.cs |  1 -
 MediaBrowser.Model/Devices/ContentUploadHistory.cs |  1 -
 MediaBrowser.Model/Devices/DeviceInfo.cs           |  3 +-
 MediaBrowser.Model/Devices/DeviceQuery.cs          |  1 -
 MediaBrowser.Model/Devices/DevicesOptions.cs       |  1 -
 MediaBrowser.Model/Devices/LocalFileInfo.cs        |  1 -
 MediaBrowser.Model/Diagnostics/IProcess.cs         |  1 -
 MediaBrowser.Model/Diagnostics/IProcessFactory.cs  |  1 -
 MediaBrowser.Model/Dlna/AudioOptions.cs            |  1 -
 MediaBrowser.Model/Dlna/CodecProfile.cs            |  1 -
 MediaBrowser.Model/Dlna/CodecType.cs               |  1 -
 MediaBrowser.Model/Dlna/ConditionProcessor.cs      |  1 -
 MediaBrowser.Model/Dlna/ContainerProfile.cs        |  1 -
 MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs   |  1 -
 MediaBrowser.Model/Dlna/DeviceIdentification.cs    |  1 -
 MediaBrowser.Model/Dlna/DeviceProfile.cs           |  1 -
 MediaBrowser.Model/Dlna/DeviceProfileInfo.cs       |  1 -
 MediaBrowser.Model/Dlna/DeviceProfileType.cs       |  1 -
 MediaBrowser.Model/Dlna/DirectPlayProfile.cs       |  1 -
 MediaBrowser.Model/Dlna/DlnaFlags.cs               |  1 -
 MediaBrowser.Model/Dlna/DlnaMaps.cs                |  1 -
 MediaBrowser.Model/Dlna/DlnaProfileType.cs         |  1 -
 MediaBrowser.Model/Dlna/EncodingContext.cs         |  1 -
 MediaBrowser.Model/Dlna/HeaderMatchType.cs         |  1 -
 MediaBrowser.Model/Dlna/HttpHeaderInfo.cs          |  1 -
 MediaBrowser.Model/Dlna/IDeviceDiscovery.cs        |  1 -
 MediaBrowser.Model/Dlna/ITranscoderSupport.cs      |  1 -
 MediaBrowser.Model/Dlna/MediaFormatProfile.cs      |  1 -
 .../Dlna/MediaFormatProfileResolver.cs             |  1 -
 MediaBrowser.Model/Dlna/PlaybackErrorCode.cs       |  1 -
 MediaBrowser.Model/Dlna/ProfileCondition.cs        |  1 -
 MediaBrowser.Model/Dlna/ProfileConditionType.cs    |  1 -
 MediaBrowser.Model/Dlna/ProfileConditionValue.cs   |  1 -
 MediaBrowser.Model/Dlna/ResolutionConfiguration.cs |  1 -
 MediaBrowser.Model/Dlna/ResolutionNormalizer.cs    |  1 -
 MediaBrowser.Model/Dlna/ResolutionOptions.cs       |  1 -
 MediaBrowser.Model/Dlna/ResponseProfile.cs         |  1 -
 MediaBrowser.Model/Dlna/SearchCriteria.cs          |  1 -
 MediaBrowser.Model/Dlna/SearchType.cs              |  1 -
 MediaBrowser.Model/Dlna/SortCriteria.cs            |  1 -
 MediaBrowser.Model/Dlna/StreamBuilder.cs           |  1 -
 MediaBrowser.Model/Dlna/StreamInfo.cs              |  1 -
 MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs  |  3 +-
 MediaBrowser.Model/Dlna/SubtitleProfile.cs         |  1 -
 MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs      |  1 -
 MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs       |  1 -
 MediaBrowser.Model/Dlna/TranscodingProfile.cs      |  1 -
 MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs          |  1 -
 MediaBrowser.Model/Dlna/VideoOptions.cs            |  1 -
 MediaBrowser.Model/Dlna/XmlAttribute.cs            |  1 -
 MediaBrowser.Model/Drawing/ImageDimensions.cs      |  1 -
 MediaBrowser.Model/Drawing/ImageOrientation.cs     |  1 -
 MediaBrowser.Model/Dto/BaseItemDto.cs              |  1 -
 MediaBrowser.Model/Dto/IHasServerId.cs             |  1 -
 MediaBrowser.Model/Dto/ImageByNameInfo.cs          |  1 -
 MediaBrowser.Model/Dto/MediaSourceInfo.cs          |  1 -
 MediaBrowser.Model/Dto/MediaSourceType.cs          |  1 -
 MediaBrowser.Model/Dto/MetadataEditorInfo.cs       |  1 -
 MediaBrowser.Model/Dto/NameIdPair.cs               |  3 +-
 MediaBrowser.Model/Dto/NameValuePair.cs            |  3 +-
 MediaBrowser.Model/Dto/RatingType.cs               |  1 -
 MediaBrowser.Model/Dto/RecommendationDto.cs        |  1 -
 MediaBrowser.Model/Dto/RecommendationType.cs       |  1 -
 MediaBrowser.Model/Entities/ChapterInfo.cs         |  1 -
 MediaBrowser.Model/Entities/CollectionType.cs      |  1 -
 MediaBrowser.Model/Entities/ExtraType.cs           |  1 -
 MediaBrowser.Model/Entities/LibraryUpdateInfo.cs   |  1 -
 MediaBrowser.Model/Entities/MediaStream.cs         |  1 -
 MediaBrowser.Model/Entities/MediaUrl.cs            |  1 -
 MediaBrowser.Model/Entities/MetadataProviders.cs   |  1 -
 MediaBrowser.Model/Entities/PackageReviewInfo.cs   |  1 -
 MediaBrowser.Model/Entities/ParentalRating.cs      |  1 -
 MediaBrowser.Model/Entities/TrailerType.cs         |  1 -
 MediaBrowser.Model/Entities/Video3DFormat.cs       |  1 -
 MediaBrowser.Model/Entities/VirtualFolderInfo.cs   |  1 -
 MediaBrowser.Model/Extensions/ListHelper.cs        |  1 -
 MediaBrowser.Model/Globalization/CultureDto.cs     |  1 -
 .../Globalization/LocalizationOption.cs            |  1 -
 MediaBrowser.Model/IO/FileSystemMetadata.cs        |  3 +-
 MediaBrowser.Model/IO/IFileSystem.cs               |  1 -
 MediaBrowser.Model/IO/IIsoManager.cs               |  1 -
 MediaBrowser.Model/IO/IIsoMounter.cs               |  1 -
 MediaBrowser.Model/IO/IShortcutHandler.cs          |  1 -
 MediaBrowser.Model/IO/IStreamHelper.cs             |  1 -
 MediaBrowser.Model/IO/IZipClient.cs                |  1 -
 MediaBrowser.Model/Library/PlayAccess.cs           |  1 -
 MediaBrowser.Model/Library/UserViewQuery.cs        |  1 -
 MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs      |  1 -
 MediaBrowser.Model/LiveTv/DayPattern.cs            |  1 -
 MediaBrowser.Model/LiveTv/GuideInfo.cs             |  1 -
 MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs    |  1 -
 MediaBrowser.Model/LiveTv/LiveTvInfo.cs            |  1 -
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs         |  1 -
 MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs     |  1 -
 MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs   |  1 -
 MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs     |  1 -
 MediaBrowser.Model/LiveTv/ProgramAudio.cs          |  1 -
 MediaBrowser.Model/LiveTv/RecordingQuery.cs        |  1 -
 MediaBrowser.Model/LiveTv/RecordingStatus.cs       |  1 -
 MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs    |  1 -
 MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs      |  1 -
 MediaBrowser.Model/LiveTv/TimerInfoDto.cs          |  1 -
 MediaBrowser.Model/LiveTv/TimerQuery.cs            |  1 -
 MediaBrowser.Model/MediaInfo/AudioCodec.cs         |  1 -
 MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs     |  1 -
 MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs  |  1 -
 MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs |  1 -
 MediaBrowser.Model/MediaInfo/MediaInfo.cs          |  3 +-
 MediaBrowser.Model/MediaInfo/MediaProtocol.cs      |  1 -
 .../MediaInfo/PlaybackInfoRequest.cs               |  1 -
 MediaBrowser.Model/MediaInfo/SubtitleFormat.cs     |  1 -
 MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs |  1 -
 MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs  |  1 -
 .../MediaInfo/TransportStreamTimestamp.cs          |  1 -
 MediaBrowser.Model/Net/EndPointInfo.cs             |  1 -
 MediaBrowser.Model/Net/ISocket.cs                  |  1 -
 MediaBrowser.Model/Net/ISocketFactory.cs           |  1 -
 MediaBrowser.Model/Net/MimeTypes.cs                |  1 -
 MediaBrowser.Model/Net/NetworkShare.cs             |  1 -
 MediaBrowser.Model/Net/SocketReceiveResult.cs      |  1 -
 MediaBrowser.Model/Net/WebSocketMessage.cs         |  1 -
 .../Notifications/NotificationLevel.cs             |  1 -
 .../Notifications/NotificationOption.cs            |  1 -
 .../Notifications/NotificationOptions.cs           |  1 -
 .../Notifications/NotificationRequest.cs           |  1 -
 .../Notifications/NotificationType.cs              |  1 -
 .../Notifications/NotificationTypeInfo.cs          |  1 -
 MediaBrowser.Model/Notifications/SendToUserType.cs |  1 -
 .../Playlists/PlaylistCreationRequest.cs           |  1 -
 .../Playlists/PlaylistCreationResult.cs            |  1 -
 MediaBrowser.Model/Playlists/PlaylistItemQuery.cs  |  1 -
 MediaBrowser.Model/Plugins/IHasWebPages.cs         |  1 -
 MediaBrowser.Model/Plugins/PluginPageInfo.cs       |  1 -
 MediaBrowser.Model/Providers/ExternalIdInfo.cs     |  1 -
 MediaBrowser.Model/Providers/ExternalUrl.cs        |  1 -
 MediaBrowser.Model/Providers/ImageProviderInfo.cs  |  1 -
 MediaBrowser.Model/Providers/RemoteImageQuery.cs   |  1 -
 MediaBrowser.Model/Providers/RemoteSearchResult.cs |  1 -
 MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs |  1 -
 MediaBrowser.Model/Providers/SubtitleOptions.cs    |  1 -
 .../Providers/SubtitleProviderInfo.cs              |  1 -
 MediaBrowser.Model/Querying/AllThemeMediaResult.cs |  1 -
 MediaBrowser.Model/Querying/EpisodeQuery.cs        |  1 -
 MediaBrowser.Model/Querying/ItemFields.cs          |  1 -
 MediaBrowser.Model/Querying/ItemSortBy.cs          |  1 -
 MediaBrowser.Model/Querying/LatestItemsQuery.cs    |  1 -
 .../Querying/MovieRecommendationQuery.cs           |  3 +-
 MediaBrowser.Model/Querying/NextUpQuery.cs         |  1 -
 MediaBrowser.Model/Querying/QueryFilters.cs        |  1 -
 MediaBrowser.Model/Querying/QueryResult.cs         |  1 -
 .../Querying/UpcomingEpisodesQuery.cs              |  1 -
 MediaBrowser.Model/Search/SearchHint.cs            |  1 -
 MediaBrowser.Model/Search/SearchQuery.cs           |  1 -
 .../Serialization/IJsonSerializer.cs               |  1 -
 MediaBrowser.Model/Serialization/IXmlSerializer.cs |  1 -
 MediaBrowser.Model/Services/IAsyncStreamWriter.cs  |  1 -
 MediaBrowser.Model/Services/IHasHeaders.cs         |  1 -
 MediaBrowser.Model/Services/IHasRequestFilter.cs   |  1 -
 MediaBrowser.Model/Services/IHttpRequest.cs        |  1 -
 MediaBrowser.Model/Services/IHttpResult.cs         |  1 -
 MediaBrowser.Model/Services/IRequest.cs            |  1 -
 .../Services/IRequiresRequestStream.cs             |  1 -
 MediaBrowser.Model/Services/IService.cs            |  1 -
 MediaBrowser.Model/Services/IStreamWriter.cs       |  1 -
 .../Services/QueryParamCollection.cs               |  1 -
 MediaBrowser.Model/Services/RouteAttribute.cs      |  1 -
 MediaBrowser.Model/Session/ClientCapabilities.cs   |  1 -
 MediaBrowser.Model/Session/GeneralCommand.cs       |  1 -
 MediaBrowser.Model/Session/GeneralCommandType.cs   |  1 -
 MediaBrowser.Model/Session/MessageCommand.cs       |  1 -
 MediaBrowser.Model/Session/PlayMethod.cs           |  1 -
 MediaBrowser.Model/Session/PlayRequest.cs          |  1 -
 MediaBrowser.Model/Session/PlaybackProgressInfo.cs |  1 -
 MediaBrowser.Model/Session/PlaybackStopInfo.cs     |  1 -
 MediaBrowser.Model/Session/PlayerStateInfo.cs      |  1 -
 MediaBrowser.Model/Session/PlaystateCommand.cs     |  1 -
 MediaBrowser.Model/Session/PlaystateRequest.cs     |  1 -
 MediaBrowser.Model/Session/TranscodingInfo.cs      |  1 -
 MediaBrowser.Model/Sync/SyncCategory.cs            |  1 -
 MediaBrowser.Model/Sync/SyncJob.cs                 |  1 -
 MediaBrowser.Model/Sync/SyncJobStatus.cs           |  1 -
 MediaBrowser.Model/Sync/SyncTarget.cs              |  1 -
 MediaBrowser.Model/System/LogFile.cs               |  1 -
 MediaBrowser.Model/System/OperatingSystemId.cs     |  1 -
 MediaBrowser.Model/System/PublicSystemInfo.cs      |  1 -
 MediaBrowser.Model/System/SystemInfo.cs            |  1 -
 .../Tasks/IConfigurableScheduledTask.cs            |  1 -
 MediaBrowser.Model/Tasks/IScheduledTask.cs         |  1 -
 MediaBrowser.Model/Tasks/ITaskManager.cs           |  1 -
 .../Tasks/TaskCompletionEventArgs.cs               |  1 -
 MediaBrowser.Model/Tasks/TaskOptions.cs            |  1 -
 MediaBrowser.Model/Tasks/TaskTriggerInfo.cs        |  1 -
 MediaBrowser.Model/Updates/PackageVersionInfo.cs   |  1 -
 MediaBrowser.Model/Users/ForgotPasswordAction.cs   |  1 -
 MediaBrowser.Model/Users/ForgotPasswordResult.cs   |  1 -
 MediaBrowser.Model/Users/PinRedeemResult.cs        |  1 -
 MediaBrowser.Model/Users/UserAction.cs             |  1 -
 MediaBrowser.Model/Users/UserActionType.cs         |  1 -
 MediaBrowser.Model/Users/UserPolicy.cs             |  3 +-
 .../Api/ConfigurationPageInfo.cs                   | 51 ++++++++-------
 MediaBrowser.WebDashboard/Api/DashboardService.cs  | 74 ++++++++++++++--------
 MediaBrowser.WebDashboard/Api/PackageCreator.cs    | 22 +++----
 .../MediaBrowser.WebDashboard.csproj               | 13 ++++
 MediaBrowser.WebDashboard/ServerEntryPoint.cs      | 22 ++++---
 .../Configuration/NfoConfigurationExtension.cs     | 15 +++++
 .../Configuration/NfoConfigurationFactory.cs       | 24 +++++++
 .../Configuration/NfoOptions.cs                    | 30 ---------
 MediaBrowser.XbmcMetadata/EntryPoint.cs            |  4 +-
 .../MediaBrowser.XbmcMetadata.csproj               | 13 ++++
 MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs | 67 ++++++++++++++------
 .../Parsers/EpisodeNfoParser.cs                    | 14 +++-
 .../Parsers/MovieNfoParser.cs                      | 16 +++--
 .../Parsers/SeasonNfoParser.cs                     | 10 +++
 .../Parsers/SeriesNfoParser.cs                     | 15 +++++
 .../Providers/AlbumNfoProvider.cs                  | 16 ++++-
 .../Providers/ArtistNfoProvider.cs                 | 10 +++
 .../Providers/BaseNfoProvider.cs                   | 15 +++--
 .../Providers/BaseVideoNfoProvider.cs              | 10 ++-
 .../Providers/EpisodeNfoProvider.cs                | 16 ++++-
 .../Providers/MovieNfoProvider.cs                  | 31 ++++-----
 .../Providers/MusicVideoNfoProvider.cs             | 26 ++++++++
 .../Providers/SeasonNfoProvider.cs                 | 17 ++++-
 .../Providers/SeriesNfoProvider.cs                 | 12 +++-
 .../Providers/VideoNfoProvider.cs                  | 26 ++++++++
 MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs  | 16 ++++-
 MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs | 22 ++++++-
 MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs   | 53 ++++++++--------
 .../Savers/EpisodeNfoSaver.cs                      | 26 ++++++--
 MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs  | 30 ++++++---
 MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs | 14 +++-
 MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs | 14 +++-
 jellyfin.ruleset                                   |  4 ++
 464 files changed, 553 insertions(+), 649 deletions(-)
 create mode 100644 MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationExtension.cs
 create mode 100644 MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationFactory.cs
 delete mode 100644 MediaBrowser.XbmcMetadata/Configuration/NfoOptions.cs
 create mode 100644 MediaBrowser.XbmcMetadata/Providers/MusicVideoNfoProvider.cs
 create mode 100644 MediaBrowser.XbmcMetadata/Providers/VideoNfoProvider.cs

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

diff --git a/Emby.Dlna/Api/DlnaServerService.cs b/Emby.Dlna/Api/DlnaServerService.cs
index 4d9933a0c..b7d018921 100644
--- a/Emby.Dlna/Api/DlnaServerService.cs
+++ b/Emby.Dlna/Api/DlnaServerService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Dlna/Api/DlnaService.cs b/Emby.Dlna/Api/DlnaService.cs
index f10695541..7d6b8f78e 100644
--- a/Emby.Dlna/Api/DlnaService.cs
+++ b/Emby.Dlna/Api/DlnaService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Linq;
 using MediaBrowser.Controller.Dlna;
diff --git a/Emby.Dlna/Common/Argument.cs b/Emby.Dlna/Common/Argument.cs
index c6ab9959e..f375e6049 100644
--- a/Emby.Dlna/Common/Argument.cs
+++ b/Emby.Dlna/Common/Argument.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna.Common
 {
diff --git a/Emby.Dlna/Common/DeviceIcon.cs b/Emby.Dlna/Common/DeviceIcon.cs
index 49d19992d..c3f7fa8aa 100644
--- a/Emby.Dlna/Common/DeviceIcon.cs
+++ b/Emby.Dlna/Common/DeviceIcon.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Globalization;
 
diff --git a/Emby.Dlna/Common/DeviceService.cs b/Emby.Dlna/Common/DeviceService.cs
index 9947ec6b9..44c0a0412 100644
--- a/Emby.Dlna/Common/DeviceService.cs
+++ b/Emby.Dlna/Common/DeviceService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna.Common
 {
diff --git a/Emby.Dlna/Common/ServiceAction.cs b/Emby.Dlna/Common/ServiceAction.cs
index 15c4be809..db4f27063 100644
--- a/Emby.Dlna/Common/ServiceAction.cs
+++ b/Emby.Dlna/Common/ServiceAction.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 
diff --git a/Emby.Dlna/Common/StateVariable.cs b/Emby.Dlna/Common/StateVariable.cs
index bade28e4b..a2c2bf5dd 100644
--- a/Emby.Dlna/Common/StateVariable.cs
+++ b/Emby.Dlna/Common/StateVariable.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/Emby.Dlna/Configuration/DlnaOptions.cs b/Emby.Dlna/Configuration/DlnaOptions.cs
index 84587a7ce..6dd9a445a 100644
--- a/Emby.Dlna/Configuration/DlnaOptions.cs
+++ b/Emby.Dlna/Configuration/DlnaOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna.Configuration
 {
diff --git a/Emby.Dlna/ConfigurationExtension.cs b/Emby.Dlna/ConfigurationExtension.cs
index f8125c12c..e224d10bd 100644
--- a/Emby.Dlna/ConfigurationExtension.cs
+++ b/Emby.Dlna/ConfigurationExtension.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Configuration;
diff --git a/Emby.Dlna/ConnectionManager/ConnectionManager.cs b/Emby.Dlna/ConnectionManager/ConnectionManager.cs
index 365249c54..76b728c08 100644
--- a/Emby.Dlna/ConnectionManager/ConnectionManager.cs
+++ b/Emby.Dlna/ConnectionManager/ConnectionManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Threading.Tasks;
 using Emby.Dlna.Service;
diff --git a/Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs b/Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs
index c8c97c79c..b31d437c3 100644
--- a/Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs
+++ b/Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Common;
diff --git a/Emby.Dlna/ConnectionManager/ControlHandler.cs b/Emby.Dlna/ConnectionManager/ControlHandler.cs
index b390515b8..d4cc65394 100644
--- a/Emby.Dlna/ConnectionManager/ControlHandler.cs
+++ b/Emby.Dlna/ConnectionManager/ControlHandler.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs b/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs
index 019a0f80f..b853e7eab 100644
--- a/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs
+++ b/Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Common;
diff --git a/Emby.Dlna/ContentDirectory/ContentDirectory.cs b/Emby.Dlna/ContentDirectory/ContentDirectory.cs
index 523430e43..61142abf5 100644
--- a/Emby.Dlna/ContentDirectory/ContentDirectory.cs
+++ b/Emby.Dlna/ContentDirectory/ContentDirectory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Threading.Tasks;
diff --git a/Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs b/Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs
index 282a47c73..6db4d7cb6 100644
--- a/Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs
+++ b/Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Common;
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
index 1278b367c..41f4fbbd3 100644
--- a/Emby.Dlna/ContentDirectory/ControlHandler.cs
+++ b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs b/Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs
index a385a74cf..921b14e39 100644
--- a/Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs
+++ b/Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Common;
diff --git a/Emby.Dlna/ControlRequest.cs b/Emby.Dlna/ControlRequest.cs
index 97ad41c83..a6e03b7e6 100644
--- a/Emby.Dlna/ControlRequest.cs
+++ b/Emby.Dlna/ControlRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.IO;
 using Microsoft.AspNetCore.Http;
diff --git a/Emby.Dlna/ControlResponse.cs b/Emby.Dlna/ControlResponse.cs
index 0215a5e38..140ef9b46 100644
--- a/Emby.Dlna/ControlResponse.cs
+++ b/Emby.Dlna/ControlResponse.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 
diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
index 145639ab0..45335f90d 100644
--- a/Emby.Dlna/Didl/DidlBuilder.cs
+++ b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Dlna/Didl/Filter.cs b/Emby.Dlna/Didl/Filter.cs
index 792d79770..f6217d91e 100644
--- a/Emby.Dlna/Didl/Filter.cs
+++ b/Emby.Dlna/Didl/Filter.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Extensions;
diff --git a/Emby.Dlna/Didl/StringWriterWithEncoding.cs b/Emby.Dlna/Didl/StringWriterWithEncoding.cs
index edc258899..67fc56ec0 100644
--- a/Emby.Dlna/Didl/StringWriterWithEncoding.cs
+++ b/Emby.Dlna/Didl/StringWriterWithEncoding.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index c5b9e5fbe..10f881fe7 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/EventSubscriptionResponse.cs b/Emby.Dlna/EventSubscriptionResponse.cs
index f90d273c4..fd18343e6 100644
--- a/Emby.Dlna/EventSubscriptionResponse.cs
+++ b/Emby.Dlna/EventSubscriptionResponse.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 
diff --git a/Emby.Dlna/Eventing/EventManager.cs b/Emby.Dlna/Eventing/EventManager.cs
index 788189880..efbb53b64 100644
--- a/Emby.Dlna/Eventing/EventManager.cs
+++ b/Emby.Dlna/Eventing/EventManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Dlna/Eventing/EventSubscription.cs b/Emby.Dlna/Eventing/EventSubscription.cs
index 108ab4830..51eaee9d7 100644
--- a/Emby.Dlna/Eventing/EventSubscription.cs
+++ b/Emby.Dlna/Eventing/EventSubscription.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/Emby.Dlna/IConnectionManager.cs b/Emby.Dlna/IConnectionManager.cs
index 01fb869f5..7b4a33a98 100644
--- a/Emby.Dlna/IConnectionManager.cs
+++ b/Emby.Dlna/IConnectionManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna
 {
diff --git a/Emby.Dlna/IContentDirectory.cs b/Emby.Dlna/IContentDirectory.cs
index a28ad2b9c..83ef09c66 100644
--- a/Emby.Dlna/IContentDirectory.cs
+++ b/Emby.Dlna/IContentDirectory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna
 {
diff --git a/Emby.Dlna/IEventManager.cs b/Emby.Dlna/IEventManager.cs
index d0960aa16..287203389 100644
--- a/Emby.Dlna/IEventManager.cs
+++ b/Emby.Dlna/IEventManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna
 {
diff --git a/Emby.Dlna/IMediaReceiverRegistrar.cs b/Emby.Dlna/IMediaReceiverRegistrar.cs
index d2aaa8f55..b0376b6a9 100644
--- a/Emby.Dlna/IMediaReceiverRegistrar.cs
+++ b/Emby.Dlna/IMediaReceiverRegistrar.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna
 {
diff --git a/Emby.Dlna/IUpnpService.cs b/Emby.Dlna/IUpnpService.cs
index 289e2df78..9e7859567 100644
--- a/Emby.Dlna/IUpnpService.cs
+++ b/Emby.Dlna/IUpnpService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Threading.Tasks;
 
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index 1ee4151e4..78e8ee4be 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Net.Sockets;
diff --git a/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs b/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs
index 815aac5c7..8bf0cd961 100644
--- a/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs
+++ b/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
index e2d48bc01..44134a41d 100644
--- a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
+++ b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Threading.Tasks;
 using Emby.Dlna.Service;
diff --git a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs
index 465b08f58..849702546 100644
--- a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs
+++ b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Common;
diff --git a/Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs b/Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs
index 3e8b2dbd8..13545c689 100644
--- a/Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs
+++ b/Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Common;
diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
index 61db264a2..b77a2bbac 100644
--- a/Emby.Dlna/PlayTo/Device.cs
+++ b/Emby.Dlna/PlayTo/Device.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/PlayTo/DeviceInfo.cs b/Emby.Dlna/PlayTo/DeviceInfo.cs
index c36f89096..f3aaaebc4 100644
--- a/Emby.Dlna/PlayTo/DeviceInfo.cs
+++ b/Emby.Dlna/PlayTo/DeviceInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using Emby.Dlna.Common;
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 0dbf1a3e6..cf978d742 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs
index 5d75e3360..b8a47c44c 100644
--- a/Emby.Dlna/PlayTo/PlayToManager.cs
+++ b/Emby.Dlna/PlayTo/PlayToManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs b/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs
index bdd2a6c3e..795618df2 100644
--- a/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs
+++ b/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs b/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs
index 485f7ec10..27883ca32 100644
--- a/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs
+++ b/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs b/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs
index 2eddb125d..3b169e599 100644
--- a/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs
+++ b/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/Emby.Dlna/PlayTo/PlaylistItem.cs b/Emby.Dlna/PlayTo/PlaylistItem.cs
index 42d73c38c..85846166c 100644
--- a/Emby.Dlna/PlayTo/PlaylistItem.cs
+++ b/Emby.Dlna/PlayTo/PlaylistItem.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/PlayTo/PlaylistItemFactory.cs b/Emby.Dlna/PlayTo/PlaylistItemFactory.cs
index f7a750d21..bedc8b9ad 100644
--- a/Emby.Dlna/PlayTo/PlaylistItemFactory.cs
+++ b/Emby.Dlna/PlayTo/PlaylistItemFactory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.IO;
 using System.Linq;
diff --git a/Emby.Dlna/PlayTo/SsdpHttpClient.cs b/Emby.Dlna/PlayTo/SsdpHttpClient.cs
index 757e713e1..dab5f29bd 100644
--- a/Emby.Dlna/PlayTo/SsdpHttpClient.cs
+++ b/Emby.Dlna/PlayTo/SsdpHttpClient.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs b/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs
index b312c8b6e..7daefeca8 100644
--- a/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs
+++ b/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/TransportCommands.cs b/Emby.Dlna/PlayTo/TransportCommands.cs
index a00d154f7..c0ce3ab6e 100644
--- a/Emby.Dlna/PlayTo/TransportCommands.cs
+++ b/Emby.Dlna/PlayTo/TransportCommands.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/PlayTo/UpnpContainer.cs b/Emby.Dlna/PlayTo/UpnpContainer.cs
index 9700d8a5d..e2d7a10f0 100644
--- a/Emby.Dlna/PlayTo/UpnpContainer.cs
+++ b/Emby.Dlna/PlayTo/UpnpContainer.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Xml.Linq;
diff --git a/Emby.Dlna/PlayTo/uBaseObject.cs b/Emby.Dlna/PlayTo/uBaseObject.cs
index 6e2e31dc4..a8ed5692c 100644
--- a/Emby.Dlna/PlayTo/uBaseObject.cs
+++ b/Emby.Dlna/PlayTo/uBaseObject.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/Emby.Dlna/PlayTo/uPnpNamespaces.cs b/Emby.Dlna/PlayTo/uPnpNamespaces.cs
index fc0f0f704..dc65cdf43 100644
--- a/Emby.Dlna/PlayTo/uPnpNamespaces.cs
+++ b/Emby.Dlna/PlayTo/uPnpNamespaces.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Linq;
 
diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs
index 97286e347..d10804b22 100644
--- a/Emby.Dlna/Profiles/DefaultProfile.cs
+++ b/Emby.Dlna/Profiles/DefaultProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Linq;
 using MediaBrowser.Model.Dlna;
diff --git a/Emby.Dlna/Profiles/DenonAvrProfile.cs b/Emby.Dlna/Profiles/DenonAvrProfile.cs
index 3be980528..73a87c499 100644
--- a/Emby.Dlna/Profiles/DenonAvrProfile.cs
+++ b/Emby.Dlna/Profiles/DenonAvrProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/DirectTvProfile.cs b/Emby.Dlna/Profiles/DirectTvProfile.cs
index 33bcae604..5ca388167 100644
--- a/Emby.Dlna/Profiles/DirectTvProfile.cs
+++ b/Emby.Dlna/Profiles/DirectTvProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs b/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs
index 26654b803..942e36930 100644
--- a/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs
+++ b/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/Foobar2000Profile.cs b/Emby.Dlna/Profiles/Foobar2000Profile.cs
index c1aece8c8..ea3de686a 100644
--- a/Emby.Dlna/Profiles/Foobar2000Profile.cs
+++ b/Emby.Dlna/Profiles/Foobar2000Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/LgTvProfile.cs b/Emby.Dlna/Profiles/LgTvProfile.cs
index 63b5b6f31..02301764c 100644
--- a/Emby.Dlna/Profiles/LgTvProfile.cs
+++ b/Emby.Dlna/Profiles/LgTvProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs b/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs
index 3a9744e38..1b1423520 100644
--- a/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs
+++ b/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/MarantzProfile.cs b/Emby.Dlna/Profiles/MarantzProfile.cs
index 05f94a206..6cfcc3b82 100644
--- a/Emby.Dlna/Profiles/MarantzProfile.cs
+++ b/Emby.Dlna/Profiles/MarantzProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/MediaMonkeyProfile.cs b/Emby.Dlna/Profiles/MediaMonkeyProfile.cs
index 10218fa56..7161af738 100644
--- a/Emby.Dlna/Profiles/MediaMonkeyProfile.cs
+++ b/Emby.Dlna/Profiles/MediaMonkeyProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/PanasonicVieraProfile.cs b/Emby.Dlna/Profiles/PanasonicVieraProfile.cs
index 945ec4518..44c35e142 100644
--- a/Emby.Dlna/Profiles/PanasonicVieraProfile.cs
+++ b/Emby.Dlna/Profiles/PanasonicVieraProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/PopcornHourProfile.cs b/Emby.Dlna/Profiles/PopcornHourProfile.cs
index 3765d01dc..9e9f6966f 100644
--- a/Emby.Dlna/Profiles/PopcornHourProfile.cs
+++ b/Emby.Dlna/Profiles/PopcornHourProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs b/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs
index 61c5f4dce..4ff2ab9be 100644
--- a/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs
+++ b/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SharpSmartTvProfile.cs b/Emby.Dlna/Profiles/SharpSmartTvProfile.cs
index 8967dc16a..aa8d434e3 100644
--- a/Emby.Dlna/Profiles/SharpSmartTvProfile.cs
+++ b/Emby.Dlna/Profiles/SharpSmartTvProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs
index 308d74aa8..42b066d52 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs
index 496c24316..fbdf2c18e 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs
index 987a9af4b..ce32179a1 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs
index 560193ded..aa1721d39 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs b/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs
index c983d98ba..ecdd2e7a4 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBravia2010Profile.cs b/Emby.Dlna/Profiles/SonyBravia2010Profile.cs
index 186c89473..68365ba4a 100644
--- a/Emby.Dlna/Profiles/SonyBravia2010Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2010Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBravia2011Profile.cs b/Emby.Dlna/Profiles/SonyBravia2011Profile.cs
index a29d143f6..b34af04a5 100644
--- a/Emby.Dlna/Profiles/SonyBravia2011Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2011Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBravia2012Profile.cs b/Emby.Dlna/Profiles/SonyBravia2012Profile.cs
index 9bcdd21b8..0e75d0cb5 100644
--- a/Emby.Dlna/Profiles/SonyBravia2012Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2012Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBravia2013Profile.cs b/Emby.Dlna/Profiles/SonyBravia2013Profile.cs
index 900e4ff06..3300863c9 100644
--- a/Emby.Dlna/Profiles/SonyBravia2013Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2013Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyBravia2014Profile.cs b/Emby.Dlna/Profiles/SonyBravia2014Profile.cs
index 963e7993e..4e833441c 100644
--- a/Emby.Dlna/Profiles/SonyBravia2014Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2014Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyPs3Profile.cs b/Emby.Dlna/Profiles/SonyPs3Profile.cs
index 31a764d8d..7f72356bd 100644
--- a/Emby.Dlna/Profiles/SonyPs3Profile.cs
+++ b/Emby.Dlna/Profiles/SonyPs3Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/SonyPs4Profile.cs b/Emby.Dlna/Profiles/SonyPs4Profile.cs
index 9376a564b..411bfe2b0 100644
--- a/Emby.Dlna/Profiles/SonyPs4Profile.cs
+++ b/Emby.Dlna/Profiles/SonyPs4Profile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/WdtvLiveProfile.cs b/Emby.Dlna/Profiles/WdtvLiveProfile.cs
index 8e056792a..2de9a8cd9 100644
--- a/Emby.Dlna/Profiles/WdtvLiveProfile.cs
+++ b/Emby.Dlna/Profiles/WdtvLiveProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Profiles/XboxOneProfile.cs b/Emby.Dlna/Profiles/XboxOneProfile.cs
index 364c43354..2cbe4e6ac 100644
--- a/Emby.Dlna/Profiles/XboxOneProfile.cs
+++ b/Emby.Dlna/Profiles/XboxOneProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index a72c62b12..5ecc81a2f 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index 4704ecbe6..161a3434c 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/Service/BaseService.cs b/Emby.Dlna/Service/BaseService.cs
index d7e5c541d..2de048a37 100644
--- a/Emby.Dlna/Service/BaseService.cs
+++ b/Emby.Dlna/Service/BaseService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using Emby.Dlna.Eventing;
 using MediaBrowser.Common.Net;
diff --git a/Emby.Dlna/Service/ControlErrorHandler.cs b/Emby.Dlna/Service/ControlErrorHandler.cs
index a2f5057fb..047e9f014 100644
--- a/Emby.Dlna/Service/ControlErrorHandler.cs
+++ b/Emby.Dlna/Service/ControlErrorHandler.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Dlna/Service/ServiceXmlBuilder.cs b/Emby.Dlna/Service/ServiceXmlBuilder.cs
index 0787b8df9..62ffd9e42 100644
--- a/Emby.Dlna/Service/ServiceXmlBuilder.cs
+++ b/Emby.Dlna/Service/ServiceXmlBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using System.Text;
diff --git a/Emby.Dlna/Ssdp/DeviceDiscovery.cs b/Emby.Dlna/Ssdp/DeviceDiscovery.cs
index c5e57d0ff..f95b8ce7d 100644
--- a/Emby.Dlna/Ssdp/DeviceDiscovery.cs
+++ b/Emby.Dlna/Ssdp/DeviceDiscovery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Dlna/Ssdp/Extensions.cs b/Emby.Dlna/Ssdp/Extensions.cs
index 836d4abfd..10c1f321b 100644
--- a/Emby.Dlna/Ssdp/Extensions.cs
+++ b/Emby.Dlna/Ssdp/Extensions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Linq;
 
diff --git a/Emby.Naming/Audio/AlbumParser.cs b/Emby.Naming/Audio/AlbumParser.cs
index b807816eb..33f4468d9 100644
--- a/Emby.Naming/Audio/AlbumParser.cs
+++ b/Emby.Naming/Audio/AlbumParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Naming/Audio/AudioFileParser.cs b/Emby.Naming/Audio/AudioFileParser.cs
index 748622102..25d5f8735 100644
--- a/Emby.Naming/Audio/AudioFileParser.cs
+++ b/Emby.Naming/Audio/AudioFileParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
index 8dc2e1b97..5494df9d6 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs b/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
index 68d6ca4d4..e28a58db7 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.AudioBook
 {
diff --git a/Emby.Naming/AudioBook/AudioBookListResolver.cs b/Emby.Naming/AudioBook/AudioBookListResolver.cs
index 835e83a08..081510f95 100644
--- a/Emby.Naming/AudioBook/AudioBookListResolver.cs
+++ b/Emby.Naming/AudioBook/AudioBookListResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Emby.Naming/AudioBook/AudioBookResolver.cs b/Emby.Naming/AudioBook/AudioBookResolver.cs
index 0b0d2035e..5466b4637 100644
--- a/Emby.Naming/AudioBook/AudioBookResolver.cs
+++ b/Emby.Naming/AudioBook/AudioBookResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Naming/Common/EpisodeExpression.cs b/Emby.Naming/Common/EpisodeExpression.cs
index f60f7e84b..07de72851 100644
--- a/Emby.Naming/Common/EpisodeExpression.cs
+++ b/Emby.Naming/Common/EpisodeExpression.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Text.RegularExpressions;
diff --git a/Emby.Naming/Common/MediaType.cs b/Emby.Naming/Common/MediaType.cs
index a61f10489..cc18ce4cd 100644
--- a/Emby.Naming/Common/MediaType.cs
+++ b/Emby.Naming/Common/MediaType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.Common
 {
diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index b4f22ed69..793847f84 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Naming/Subtitles/SubtitleInfo.cs b/Emby.Naming/Subtitles/SubtitleInfo.cs
index fe42846c6..f39c496b7 100644
--- a/Emby.Naming/Subtitles/SubtitleInfo.cs
+++ b/Emby.Naming/Subtitles/SubtitleInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.Subtitles
 {
diff --git a/Emby.Naming/Subtitles/SubtitleParser.cs b/Emby.Naming/Subtitles/SubtitleParser.cs
index b055b1a6c..082696da4 100644
--- a/Emby.Naming/Subtitles/SubtitleParser.cs
+++ b/Emby.Naming/Subtitles/SubtitleParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Naming/TV/EpisodeInfo.cs b/Emby.Naming/TV/EpisodeInfo.cs
index 667129a57..250df4e2d 100644
--- a/Emby.Naming/TV/EpisodeInfo.cs
+++ b/Emby.Naming/TV/EpisodeInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.TV
 {
diff --git a/Emby.Naming/TV/EpisodePathParser.cs b/Emby.Naming/TV/EpisodePathParser.cs
index b97b3137b..d3a822b17 100644
--- a/Emby.Naming/TV/EpisodePathParser.cs
+++ b/Emby.Naming/TV/EpisodePathParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 #nullable enable
 
 using System;
diff --git a/Emby.Naming/TV/EpisodePathParserResult.cs b/Emby.Naming/TV/EpisodePathParserResult.cs
index 3acbbc101..05f921edc 100644
--- a/Emby.Naming/TV/EpisodePathParserResult.cs
+++ b/Emby.Naming/TV/EpisodePathParserResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.TV
 {
diff --git a/Emby.Naming/TV/EpisodeResolver.cs b/Emby.Naming/TV/EpisodeResolver.cs
index 57659ee13..6994f69fc 100644
--- a/Emby.Naming/TV/EpisodeResolver.cs
+++ b/Emby.Naming/TV/EpisodeResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 #nullable enable
 
 using System;
diff --git a/Emby.Naming/TV/SeasonPathParser.cs b/Emby.Naming/TV/SeasonPathParser.cs
index 79fdae573..2fa6b4353 100644
--- a/Emby.Naming/TV/SeasonPathParser.cs
+++ b/Emby.Naming/TV/SeasonPathParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Naming/TV/SeasonPathParserResult.cs b/Emby.Naming/TV/SeasonPathParserResult.cs
index 57c234754..44090c059 100644
--- a/Emby.Naming/TV/SeasonPathParserResult.cs
+++ b/Emby.Naming/TV/SeasonPathParserResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.TV
 {
diff --git a/Emby.Naming/Video/CleanDateTimeParser.cs b/Emby.Naming/Video/CleanDateTimeParser.cs
index 6c74c07d5..579c9e91e 100644
--- a/Emby.Naming/Video/CleanDateTimeParser.cs
+++ b/Emby.Naming/Video/CleanDateTimeParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 #nullable enable
 
 using System.Collections.Generic;
diff --git a/Emby.Naming/Video/CleanDateTimeResult.cs b/Emby.Naming/Video/CleanDateTimeResult.cs
index 73a445612..57eeaa7e3 100644
--- a/Emby.Naming/Video/CleanDateTimeResult.cs
+++ b/Emby.Naming/Video/CleanDateTimeResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 #nullable enable
 
 namespace Emby.Naming.Video
diff --git a/Emby.Naming/Video/CleanStringParser.cs b/Emby.Naming/Video/CleanStringParser.cs
index b7b65d822..3f584d584 100644
--- a/Emby.Naming/Video/CleanStringParser.cs
+++ b/Emby.Naming/Video/CleanStringParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 #nullable enable
 
 using System;
diff --git a/Emby.Naming/Video/ExtraResolver.cs b/Emby.Naming/Video/ExtraResolver.cs
index 3e5d473ec..42a5c88b3 100644
--- a/Emby.Naming/Video/ExtraResolver.cs
+++ b/Emby.Naming/Video/ExtraResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Naming/Video/ExtraResult.cs b/Emby.Naming/Video/ExtraResult.cs
index 4e991d685..15db32e87 100644
--- a/Emby.Naming/Video/ExtraResult.cs
+++ b/Emby.Naming/Video/ExtraResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 
diff --git a/Emby.Naming/Video/ExtraRule.cs b/Emby.Naming/Video/ExtraRule.cs
index cfaa84ed6..cb58a3934 100644
--- a/Emby.Naming/Video/ExtraRule.cs
+++ b/Emby.Naming/Video/ExtraRule.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 using MediaType = Emby.Naming.Common.MediaType;
diff --git a/Emby.Naming/Video/ExtraRuleType.cs b/Emby.Naming/Video/ExtraRuleType.cs
index 2bf2799ff..b021a04a3 100644
--- a/Emby.Naming/Video/ExtraRuleType.cs
+++ b/Emby.Naming/Video/ExtraRuleType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/FileStack.cs b/Emby.Naming/Video/FileStack.cs
index 56adf6add..3ef190b86 100644
--- a/Emby.Naming/Video/FileStack.cs
+++ b/Emby.Naming/Video/FileStack.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Naming/Video/FlagParser.cs b/Emby.Naming/Video/FlagParser.cs
index acf3438c2..a8bd9d5c5 100644
--- a/Emby.Naming/Video/FlagParser.cs
+++ b/Emby.Naming/Video/FlagParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Naming/Video/Format3DParser.cs b/Emby.Naming/Video/Format3DParser.cs
index 25905f33c..51c26af86 100644
--- a/Emby.Naming/Video/Format3DParser.cs
+++ b/Emby.Naming/Video/Format3DParser.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Naming/Video/Format3DResult.cs b/Emby.Naming/Video/Format3DResult.cs
index 6ebd72f6b..fa0e9d3b8 100644
--- a/Emby.Naming/Video/Format3DResult.cs
+++ b/Emby.Naming/Video/Format3DResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 
diff --git a/Emby.Naming/Video/Format3DRule.cs b/Emby.Naming/Video/Format3DRule.cs
index ae9fb5b19..310ec84e8 100644
--- a/Emby.Naming/Video/Format3DRule.cs
+++ b/Emby.Naming/Video/Format3DRule.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/StackResolver.cs b/Emby.Naming/Video/StackResolver.cs
index b9afe998b..ee05904c7 100644
--- a/Emby.Naming/Video/StackResolver.cs
+++ b/Emby.Naming/Video/StackResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Naming/Video/StubResolver.cs b/Emby.Naming/Video/StubResolver.cs
index 4024d6d59..f1b5d7bcc 100644
--- a/Emby.Naming/Video/StubResolver.cs
+++ b/Emby.Naming/Video/StubResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 #nullable enable
 
 using System;
diff --git a/Emby.Naming/Video/StubResult.cs b/Emby.Naming/Video/StubResult.cs
index 5ac85528f..1b8e99b0d 100644
--- a/Emby.Naming/Video/StubResult.cs
+++ b/Emby.Naming/Video/StubResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/StubTypeRule.cs b/Emby.Naming/Video/StubTypeRule.cs
index 17c3ef8c5..8285cb51a 100644
--- a/Emby.Naming/Video/StubTypeRule.cs
+++ b/Emby.Naming/Video/StubTypeRule.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index 136658353..d4b02cf2a 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 699bbe40a..0b75a8cce 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 #nullable enable
 
 using System;
diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
index ac8af66a2..b622a3167 100644
--- a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
+++ b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Activity/ActivityManager.cs b/Emby.Server.Implementations/Activity/ActivityManager.cs
index 6712c4782..ee10845cf 100644
--- a/Emby.Server.Implementations/Activity/ActivityManager.cs
+++ b/Emby.Server.Implementations/Activity/ActivityManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 633343bb6..7be72319e 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index fd0112266..1261773f7 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
index 15aee63a0..93000ae12 100644
--- a/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
+++ b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
diff --git a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs b/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
index aae416b37..6016fed07 100644
--- a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs b/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
index fe64f1b15..62aeb9bcb 100644
--- a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
+++ b/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index de2e123af..6e1baddfe 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
index 6cbd04fea..266d539d0 100644
--- a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index 03e6abcfb..68fd26afe 100644
--- a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
index 8b1407984..21ba0288e 100644
--- a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
+++ b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Collections/CollectionManager.cs b/Emby.Server.Implementations/Collections/CollectionManager.cs
index efdef8481..1d7c11989 100644
--- a/Emby.Server.Implementations/Collections/CollectionManager.cs
+++ b/Emby.Server.Implementations/Collections/CollectionManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index b7f643819..0654132f4 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index 8a5387e9b..2a8f2d6b3 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Threading;
diff --git a/Emby.Server.Implementations/Data/ManagedConnection.cs b/Emby.Server.Implementations/Data/ManagedConnection.cs
index 2c2f19cd3..5c094ddd2 100644
--- a/Emby.Server.Implementations/Data/ManagedConnection.cs
+++ b/Emby.Server.Implementations/Data/ManagedConnection.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 8087419ce..d474f1c6b 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index 55c24ccc0..c87793072 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index f6c37e4e5..22955850a 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index c82c93ffc..a042320c9 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index ff75efa59..f0d43e665 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index 4f8f9f23b..00dda644f 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
index f8b754151..bfa49ac5f 100644
--- a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
+++ b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Diagnostics;
diff --git a/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs b/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
index 219f73c78..02ad3c1a8 100644
--- a/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
+++ b/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Diagnostics;
 
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 960f3f2d6..65711e89d 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 4e4ef3be0..e290c62e1 100644
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index 06458baed..92dca0ef7 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
index e0aa18e89..dbb3503c4 100644
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index 3e22080fc..e431da148 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/FileWriter.cs b/Emby.Server.Implementations/HttpServer/FileWriter.cs
index d36f230d6..82f1e5b52 100644
--- a/Emby.Server.Implementations/HttpServer/FileWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/FileWriter.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index b0126f7fa..2785cdca0 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index 98a4f140e..b42662420 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/IHttpListener.cs b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
index 1c3496e5d..501593725 100644
--- a/Emby.Server.Implementations/HttpServer/IHttpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Threading;
diff --git a/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs b/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
index 7cb113a58..8b9028f6b 100644
--- a/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
index 03b5b748d..58421aaf1 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Linq;
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index e8884bca0..129faeaab 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
index a6a0f5b03..166952c64 100644
--- a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Controller.Entities;
diff --git a/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs b/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
index 5be144452..3150f3367 100644
--- a/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
+++ b/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace Emby.Server.Implementations.IO
 {
diff --git a/Emby.Server.Implementations/IO/FileRefresher.cs b/Emby.Server.Implementations/IO/FileRefresher.cs
index cf92ddbcd..4b5b11f01 100644
--- a/Emby.Server.Implementations/IO/FileRefresher.cs
+++ b/Emby.Server.Implementations/IO/FileRefresher.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/IO/LibraryMonitor.cs b/Emby.Server.Implementations/IO/LibraryMonitor.cs
index 7777efc3b..b1fb8cc63 100644
--- a/Emby.Server.Implementations/IO/LibraryMonitor.cs
+++ b/Emby.Server.Implementations/IO/LibraryMonitor.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index da5a4d50e..48599beb7 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs b/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
index 574b63ae6..e6696b8c4 100644
--- a/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
+++ b/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/IO/StreamHelper.cs b/Emby.Server.Implementations/IO/StreamHelper.cs
index c99018e40..40b397edc 100644
--- a/Emby.Server.Implementations/IO/StreamHelper.cs
+++ b/Emby.Server.Implementations/IO/StreamHelper.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Buffers;
diff --git a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
index acf3a3b23..fd50f156a 100644
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs b/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
index 3eb64c29c..9a7186898 100644
--- a/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
+++ b/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 5d16a9050..3fd89a60e 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index f28f4a538..ed7d8aa40 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index e310065b2..70d5bd9f4 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
index 1652ad974..6b9f4d052 100644
--- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs
+++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/MusicManager.cs b/Emby.Server.Implementations/Library/MusicManager.cs
index 29af6670b..1ec578371 100644
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/ResolverHelper.cs b/Emby.Server.Implementations/Library/ResolverHelper.cs
index 96d1bff92..34dcbbe28 100644
--- a/Emby.Server.Implementations/Library/ResolverHelper.cs
+++ b/Emby.Server.Implementations/Library/ResolverHelper.cs
@@ -9,7 +9,7 @@ using MediaBrowser.Model.IO;
 namespace Emby.Server.Implementations.Library
 {
     /// <summary>
-    /// Class ResolverHelper
+    /// Class ResolverHelper.
     /// </summary>
     public static class ResolverHelper
     {
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index 524fb7c10..fefc8e789 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index 848cdb7bd..fb75593bd 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
index 1e2e0704c..0b93ebeb8 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
index 8ad546f8e..bcfcee9c6 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
index 5e672f221..a68562fc2 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
index eca60b133..1030ed39d 100644
--- a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index b547fc8c9..4f3454592 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
index 6404d6476..62268fce9 100644
--- a/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs
index 76ae14720..11d6c737a 100644
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index f1fb35d9a..071681b08 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 6e203f894..25d733a65 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Concurrent;
diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
index 935deb71c..322819b05 100644
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 4ac48e537..fece99646 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1,4 +1,3 @@
-#pragma warning disable SA1600
 #pragma warning disable CS1591
 
 using System;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
index 498aa3c26..463d0ed0a 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
@@ -1,4 +1,3 @@
-#pragma warning disable SA1600
 #pragma warning disable CS1591
 
 using System;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index e3f9df35a..b64fe8634 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1,4 +1,3 @@
-#pragma warning disable SA1600
 #pragma warning disable CS1591
 
 using System;
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index 0eb184d14..83ec80a85 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -1,6 +1,5 @@
 #pragma warning disable CS1591
 #pragma warning disable SA1402
-#pragma warning disable SA1600
 #pragma warning disable SA1649
 
 using System;
diff --git a/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs b/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
index 828415c18..344aecf53 100644
--- a/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
+++ b/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Common/Configuration/IConfigurationManager.cs b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
index 7773596af..caf2edd83 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationManager.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Common/Cryptography/PasswordHash.cs b/MediaBrowser.Common/Cryptography/PasswordHash.cs
index 3477c1c04..3e12536ec 100644
--- a/MediaBrowser.Common/Cryptography/PasswordHash.cs
+++ b/MediaBrowser.Common/Cryptography/PasswordHash.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Common/Extensions/RateLimitExceededException.cs b/MediaBrowser.Common/Extensions/RateLimitExceededException.cs
index 4e5d4e9ca..95802a462 100644
--- a/MediaBrowser.Common/Extensions/RateLimitExceededException.cs
+++ b/MediaBrowser.Common/Extensions/RateLimitExceededException.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Common/Net/CustomHeaderNames.cs b/MediaBrowser.Common/Net/CustomHeaderNames.cs
index 8cc48c55f..5ca9897eb 100644
--- a/MediaBrowser.Common/Net/CustomHeaderNames.cs
+++ b/MediaBrowser.Common/Net/CustomHeaderNames.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Common.Net
 {
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index 8207a45f3..51962001e 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Common/Net/HttpResponseInfo.cs b/MediaBrowser.Common/Net/HttpResponseInfo.cs
index d711ad64a..d7f7a5622 100644
--- a/MediaBrowser.Common/Net/HttpResponseInfo.cs
+++ b/MediaBrowser.Common/Net/HttpResponseInfo.cs
@@ -11,7 +11,6 @@ namespace MediaBrowser.Common.Net
     public class HttpResponseInfo : IDisposable
     {
 #pragma warning disable CS1591
-#pragma warning disable SA1600
         public HttpResponseInfo()
         {
         }
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 6bd7dd1d6..3ba75abd8 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Common/Plugins/IPlugin.cs b/MediaBrowser.Common/Plugins/IPlugin.cs
index 001ca8be8..d34820961 100644
--- a/MediaBrowser.Common/Plugins/IPlugin.cs
+++ b/MediaBrowser.Common/Plugins/IPlugin.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Plugins;
diff --git a/MediaBrowser.Common/Plugins/IPluginAssembly.cs b/MediaBrowser.Common/Plugins/IPluginAssembly.cs
index 388ac61ab..6df4fbb76 100644
--- a/MediaBrowser.Common/Plugins/IPluginAssembly.cs
+++ b/MediaBrowser.Common/Plugins/IPluginAssembly.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Common/Progress/ActionableProgress.cs b/MediaBrowser.Common/Progress/ActionableProgress.cs
index 92141ba52..af69055aa 100644
--- a/MediaBrowser.Common/Progress/ActionableProgress.cs
+++ b/MediaBrowser.Common/Progress/ActionableProgress.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs b/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs
index a6422e2c8..0445397ad 100644
--- a/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs
+++ b/MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
diff --git a/MediaBrowser.Common/System/OperatingSystem.cs b/MediaBrowser.Common/System/OperatingSystem.cs
index f23af4799..7d38ddb6e 100644
--- a/MediaBrowser.Common/System/OperatingSystem.cs
+++ b/MediaBrowser.Common/System/OperatingSystem.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs
index a09c1916c..8ea492261 100644
--- a/MediaBrowser.Common/Updates/IInstallationManager.cs
+++ b/MediaBrowser.Common/Updates/IInstallationManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Common/Updates/InstallationEventArgs.cs b/MediaBrowser.Common/Updates/InstallationEventArgs.cs
index 8bbb231ce..36e124ddf 100644
--- a/MediaBrowser.Common/Updates/InstallationEventArgs.cs
+++ b/MediaBrowser.Common/Updates/InstallationEventArgs.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Updates;
 
diff --git a/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs b/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs
index c8967f9db..46f10c84f 100644
--- a/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs
+++ b/MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
index 5248ea4c1..4249a9a66 100644
--- a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
+++ b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/Activity/ActivityLogEntry.cs b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
index 48118b5a3..80f01b66e 100644
--- a/MediaBrowser.Model/Activity/ActivityLogEntry.cs
+++ b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using Microsoft.Extensions.Logging;
diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs
index f3d345517..f336f5272 100644
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Events;
diff --git a/MediaBrowser.Model/Activity/IActivityRepository.cs b/MediaBrowser.Model/Activity/IActivityRepository.cs
index 2e45f56c9..66144ec47 100644
--- a/MediaBrowser.Model/Activity/IActivityRepository.cs
+++ b/MediaBrowser.Model/Activity/IActivityRepository.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Querying;
diff --git a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
index 6dfe8ea9b..bb203f895 100644
--- a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.ApiClient
 {
@@ -22,7 +21,7 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the endpoint address.
         /// </summary>
diff --git a/MediaBrowser.Model/Branding/BrandingOptions.cs b/MediaBrowser.Model/Branding/BrandingOptions.cs
index f2e360cca..8ab268a64 100644
--- a/MediaBrowser.Model/Branding/BrandingOptions.cs
+++ b/MediaBrowser.Model/Branding/BrandingOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Branding
 {
@@ -10,7 +9,7 @@ namespace MediaBrowser.Model.Branding
         /// </summary>
         /// <value>The login disclaimer.</value>
         public string LoginDisclaimer { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the custom CSS.
         /// </summary>
diff --git a/MediaBrowser.Model/Channels/ChannelFeatures.cs b/MediaBrowser.Model/Channels/ChannelFeatures.cs
index 8d4b18eaf..c4e97ffe5 100644
--- a/MediaBrowser.Model/Channels/ChannelFeatures.cs
+++ b/MediaBrowser.Model/Channels/ChannelFeatures.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Channels/ChannelFolderType.cs b/MediaBrowser.Model/Channels/ChannelFolderType.cs
index 3411e727b..9ead74261 100644
--- a/MediaBrowser.Model/Channels/ChannelFolderType.cs
+++ b/MediaBrowser.Model/Channels/ChannelFolderType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Channels
 {
diff --git a/MediaBrowser.Model/Channels/ChannelInfo.cs b/MediaBrowser.Model/Channels/ChannelInfo.cs
index 2f1614b06..bfb34db55 100644
--- a/MediaBrowser.Model/Channels/ChannelInfo.cs
+++ b/MediaBrowser.Model/Channels/ChannelInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Channels
 {
diff --git a/MediaBrowser.Model/Channels/ChannelItemSortField.cs b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
index 89d105e44..2c88e99af 100644
--- a/MediaBrowser.Model/Channels/ChannelItemSortField.cs
+++ b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Channels
 {
diff --git a/MediaBrowser.Model/Channels/ChannelMediaContentType.cs b/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
index b52073449..61afcbc56 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Channels
 {
diff --git a/MediaBrowser.Model/Channels/ChannelMediaType.cs b/MediaBrowser.Model/Channels/ChannelMediaType.cs
index 16a28c874..ba2c06d1b 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Channels
 {
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index 542daa0d3..88fc94a6f 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/Collections/CollectionCreationResult.cs b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
index 119bfe7e4..2f1d903a5 100644
--- a/MediaBrowser.Model/Collections/CollectionCreationResult.cs
+++ b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Configuration/AccessSchedule.cs b/MediaBrowser.Model/Configuration/AccessSchedule.cs
index 6003d74e1..120c47dbc 100644
--- a/MediaBrowser.Model/Configuration/AccessSchedule.cs
+++ b/MediaBrowser.Model/Configuration/AccessSchedule.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
index 38361cea7..71b16cfba 100644
--- a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
+++ b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index ff431e44c..81714c640 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/ImageOption.cs b/MediaBrowser.Model/Configuration/ImageOption.cs
index 44e4e369c..2b1268c74 100644
--- a/MediaBrowser.Model/Configuration/ImageOption.cs
+++ b/MediaBrowser.Model/Configuration/ImageOption.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 
@@ -12,7 +11,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The type.</value>
         public ImageType Type { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the limit.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
index 9aa72212e..485a4d2f8 100644
--- a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
+++ b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index 9d5d2b869..4342ccd8a 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
index b24cae8c4..706831bdd 100644
--- a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs
index d52bb4a44..625054b9e 100644
--- a/MediaBrowser.Model/Configuration/MetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Configuration/MetadataPlugin.cs b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
index fa88d4508..c2b47eb9b 100644
--- a/MediaBrowser.Model/Configuration/MetadataPlugin.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
index b99d67f7f..53063810b 100644
--- a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/Configuration/MetadataPluginType.cs b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
index 46a74c94f..bff12799f 100644
--- a/MediaBrowser.Model/Configuration/MetadataPluginType.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 5280d455c..03858f938 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs b/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
index c117a918f..f0aa2b98c 100644
--- a/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
+++ b/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/UnratedItem.cs b/MediaBrowser.Model/Configuration/UnratedItem.cs
index b972ddf4a..e1d1a363d 100644
--- a/MediaBrowser.Model/Configuration/UnratedItem.cs
+++ b/MediaBrowser.Model/Configuration/UnratedItem.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 375c50de3..a475c9910 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
index 7c7866c23..d6c1295f4 100644
--- a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Cryptography/ICryptoProvider.cs b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
index e16e747c5..656c04f46 100644
--- a/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
+++ b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 
diff --git a/MediaBrowser.Model/Devices/ContentUploadHistory.cs b/MediaBrowser.Model/Devices/ContentUploadHistory.cs
index 7b58eadf7..c493760d5 100644
--- a/MediaBrowser.Model/Devices/ContentUploadHistory.cs
+++ b/MediaBrowser.Model/Devices/ContentUploadHistory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Devices
 {
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs
index 55149a02d..d2563d1d0 100644
--- a/MediaBrowser.Model/Devices/DeviceInfo.cs
+++ b/MediaBrowser.Model/Devices/DeviceInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Session;
@@ -12,7 +11,7 @@ namespace MediaBrowser.Model.Devices
         {
             Capabilities = new ClientCapabilities();
         }
-        
+
         public string Name { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs
index 56b9c201a..64e366a56 100644
--- a/MediaBrowser.Model/Devices/DeviceQuery.cs
+++ b/MediaBrowser.Model/Devices/DeviceQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Devices/DevicesOptions.cs b/MediaBrowser.Model/Devices/DevicesOptions.cs
index 95bccd559..02570650e 100644
--- a/MediaBrowser.Model/Devices/DevicesOptions.cs
+++ b/MediaBrowser.Model/Devices/DevicesOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Devices/LocalFileInfo.cs b/MediaBrowser.Model/Devices/LocalFileInfo.cs
index 7a8e31f41..63a8dc2aa 100644
--- a/MediaBrowser.Model/Devices/LocalFileInfo.cs
+++ b/MediaBrowser.Model/Devices/LocalFileInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Devices
 {
diff --git a/MediaBrowser.Model/Diagnostics/IProcess.cs b/MediaBrowser.Model/Diagnostics/IProcess.cs
index d86679876..514d1e737 100644
--- a/MediaBrowser.Model/Diagnostics/IProcess.cs
+++ b/MediaBrowser.Model/Diagnostics/IProcess.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/MediaBrowser.Model/Diagnostics/IProcessFactory.cs b/MediaBrowser.Model/Diagnostics/IProcessFactory.cs
index 870206024..57082acc5 100644
--- a/MediaBrowser.Model/Diagnostics/IProcessFactory.cs
+++ b/MediaBrowser.Model/Diagnostics/IProcessFactory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Diagnostics
 {
diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
index 903cb0337..40081b282 100644
--- a/MediaBrowser.Model/Dlna/AudioOptions.cs
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs
index 2fda1a600..756e500dd 100644
--- a/MediaBrowser.Model/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Model/Dlna/CodecProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Xml.Serialization;
diff --git a/MediaBrowser.Model/Dlna/CodecType.cs b/MediaBrowser.Model/Dlna/CodecType.cs
index 9ed01d842..c9f090e4c 100644
--- a/MediaBrowser.Model/Dlna/CodecType.cs
+++ b/MediaBrowser.Model/Dlna/CodecType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index d07b4022a..7423efaf6 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Globalization;
diff --git a/MediaBrowser.Model/Dlna/ContainerProfile.cs b/MediaBrowser.Model/Dlna/ContainerProfile.cs
index e53ebf6ea..e6691c513 100644
--- a/MediaBrowser.Model/Dlna/ContainerProfile.cs
+++ b/MediaBrowser.Model/Dlna/ContainerProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Xml.Serialization;
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index dd9238193..a20f11503 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dlna/DeviceIdentification.cs b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
index 730c71511..f1699d930 100644
--- a/MediaBrowser.Model/Dlna/DeviceIdentification.cs
+++ b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 32de5b094..0cefbbe01 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Xml.Serialization;
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
index 021d71160..347583965 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileType.cs b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
index 2d6221a9b..46062abd0 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileType.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
index fc74c9afc..a5947bbf4 100644
--- a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
+++ b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Serialization;
 
diff --git a/MediaBrowser.Model/Dlna/DlnaFlags.cs b/MediaBrowser.Model/Dlna/DlnaFlags.cs
index ada782630..02d9ea9c5 100644
--- a/MediaBrowser.Model/Dlna/DlnaFlags.cs
+++ b/MediaBrowser.Model/Dlna/DlnaFlags.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Dlna/DlnaMaps.cs b/MediaBrowser.Model/Dlna/DlnaMaps.cs
index 17d54e373..052b4b78b 100644
--- a/MediaBrowser.Model/Dlna/DlnaMaps.cs
+++ b/MediaBrowser.Model/Dlna/DlnaMaps.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/DlnaProfileType.cs b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
index 0431e4044..e30ed0f3c 100644
--- a/MediaBrowser.Model/Dlna/DlnaProfileType.cs
+++ b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/EncodingContext.cs b/MediaBrowser.Model/Dlna/EncodingContext.cs
index 7f16b4ef7..79ca6366d 100644
--- a/MediaBrowser.Model/Dlna/EncodingContext.cs
+++ b/MediaBrowser.Model/Dlna/EncodingContext.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/HeaderMatchType.cs b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
index 3ff42159c..2a9abb20e 100644
--- a/MediaBrowser.Model/Dlna/HeaderMatchType.cs
+++ b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
index 09aa9ef2d..f23a24084 100644
--- a/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
+++ b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Serialization;
 
diff --git a/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs b/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
index bf2fccbf1..76c9a4b04 100644
--- a/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
+++ b/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Events;
diff --git a/MediaBrowser.Model/Dlna/ITranscoderSupport.cs b/MediaBrowser.Model/Dlna/ITranscoderSupport.cs
index a5da21b94..7e35cc85b 100644
--- a/MediaBrowser.Model/Dlna/ITranscoderSupport.cs
+++ b/MediaBrowser.Model/Dlna/ITranscoderSupport.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
index aa8c53a81..20e05b8a9 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
index 5e28c2e8a..4cd318abb 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
index a006b1671..300fab5c5 100644
--- a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
+++ b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ProfileCondition.cs b/MediaBrowser.Model/Dlna/ProfileCondition.cs
index f167b9e5e..2021038d8 100644
--- a/MediaBrowser.Model/Dlna/ProfileCondition.cs
+++ b/MediaBrowser.Model/Dlna/ProfileCondition.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Serialization;
 
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionType.cs b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
index 12434a798..fbf133857 100644
--- a/MediaBrowser.Model/Dlna/ProfileConditionType.cs
+++ b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
index ea30619a3..eb81fde75 100644
--- a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
+++ b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs b/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs
index f2eb1f9f5..c26eeec77 100644
--- a/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
index 26ca912ef..6a58b4adc 100644
--- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Extensions;
diff --git a/MediaBrowser.Model/Dlna/ResolutionOptions.cs b/MediaBrowser.Model/Dlna/ResolutionOptions.cs
index 2b6f9f568..5ea0252cb 100644
--- a/MediaBrowser.Model/Dlna/ResolutionOptions.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ResponseProfile.cs b/MediaBrowser.Model/Dlna/ResponseProfile.cs
index f0d672a9d..c264cb936 100644
--- a/MediaBrowser.Model/Dlna/ResponseProfile.cs
+++ b/MediaBrowser.Model/Dlna/ResponseProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Serialization;
 
diff --git a/MediaBrowser.Model/Dlna/SearchCriteria.cs b/MediaBrowser.Model/Dlna/SearchCriteria.cs
index c8ef34c1c..dc6d201ae 100644
--- a/MediaBrowser.Model/Dlna/SearchCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SearchCriteria.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Text.RegularExpressions;
diff --git a/MediaBrowser.Model/Dlna/SearchType.cs b/MediaBrowser.Model/Dlna/SearchType.cs
index 446a677ff..8bc7c5249 100644
--- a/MediaBrowser.Model/Dlna/SearchType.cs
+++ b/MediaBrowser.Model/Dlna/SearchType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/SortCriteria.cs b/MediaBrowser.Model/Dlna/SortCriteria.cs
index 901cde8f3..3f8985fdc 100644
--- a/MediaBrowser.Model/Dlna/SortCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SortCriteria.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index a1838acf3..58801280b 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 2699247d8..c9fe679e1 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs b/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs
index cae9ca019..7b0204590 100644
--- a/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -19,7 +18,7 @@ namespace MediaBrowser.Model.Dlna
         /// The external
         /// </summary>
         External = 2,
-        
+
         /// <summary>
         /// The HLS
         /// </summary>
diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
index cd2bcc0c7..6a8f655ac 100644
--- a/MediaBrowser.Model/Dlna/SubtitleProfile.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Serialization;
 using MediaBrowser.Model.Extensions;
diff --git a/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
index 5c332ac26..02b3a198c 100644
--- a/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
index f0b294882..cc0c6069b 100644
--- a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
+++ b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index de5633ae0..570ee7baa 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Serialization;
 
diff --git a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
index 91cb2b68f..3dc1fca36 100644
--- a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
+++ b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dlna/VideoOptions.cs b/MediaBrowser.Model/Dlna/VideoOptions.cs
index 6c7dafba7..5b12fff1c 100644
--- a/MediaBrowser.Model/Dlna/VideoOptions.cs
+++ b/MediaBrowser.Model/Dlna/VideoOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/XmlAttribute.cs b/MediaBrowser.Model/Dlna/XmlAttribute.cs
index 8f8996969..31603a754 100644
--- a/MediaBrowser.Model/Dlna/XmlAttribute.cs
+++ b/MediaBrowser.Model/Dlna/XmlAttribute.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Xml.Serialization;
 
diff --git a/MediaBrowser.Model/Drawing/ImageDimensions.cs b/MediaBrowser.Model/Drawing/ImageDimensions.cs
index 160be11f0..f84fe6830 100644
--- a/MediaBrowser.Model/Drawing/ImageDimensions.cs
+++ b/MediaBrowser.Model/Drawing/ImageDimensions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Globalization;
 
diff --git a/MediaBrowser.Model/Drawing/ImageOrientation.cs b/MediaBrowser.Model/Drawing/ImageOrientation.cs
index f9727a235..5c78aea12 100644
--- a/MediaBrowser.Model/Drawing/ImageOrientation.cs
+++ b/MediaBrowser.Model/Drawing/ImageOrientation.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Drawing
 {
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index fc3e78a81..607355d8d 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dto/IHasServerId.cs b/MediaBrowser.Model/Dto/IHasServerId.cs
index 6d0a6b25e..8c9798c5c 100644
--- a/MediaBrowser.Model/Dto/IHasServerId.cs
+++ b/MediaBrowser.Model/Dto/IHasServerId.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/ImageByNameInfo.cs b/MediaBrowser.Model/Dto/ImageByNameInfo.cs
index 7dc075279..d2e43634d 100644
--- a/MediaBrowser.Model/Dto/ImageByNameInfo.cs
+++ b/MediaBrowser.Model/Dto/ImageByNameInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 48f1e26c3..29613adbf 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dto/MediaSourceType.cs b/MediaBrowser.Model/Dto/MediaSourceType.cs
index 0c6dc79e2..42314d519 100644
--- a/MediaBrowser.Model/Dto/MediaSourceType.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/MetadataEditorInfo.cs b/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
index c54db010b..21d8a31f2 100644
--- a/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
+++ b/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/Dto/NameIdPair.cs b/MediaBrowser.Model/Dto/NameIdPair.cs
index c59d04691..1b4800863 100644
--- a/MediaBrowser.Model/Dto/NameIdPair.cs
+++ b/MediaBrowser.Model/Dto/NameIdPair.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
@@ -12,7 +11,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the identifier.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/NameValuePair.cs b/MediaBrowser.Model/Dto/NameValuePair.cs
index cb98a9e60..74040c2cb 100644
--- a/MediaBrowser.Model/Dto/NameValuePair.cs
+++ b/MediaBrowser.Model/Dto/NameValuePair.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dto
 {
@@ -21,7 +20,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the value.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/RatingType.cs b/MediaBrowser.Model/Dto/RatingType.cs
index b856200e5..033776f9c 100644
--- a/MediaBrowser.Model/Dto/RatingType.cs
+++ b/MediaBrowser.Model/Dto/RatingType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/RecommendationDto.cs b/MediaBrowser.Model/Dto/RecommendationDto.cs
index 0913fd55f..bc97dd6f1 100644
--- a/MediaBrowser.Model/Dto/RecommendationDto.cs
+++ b/MediaBrowser.Model/Dto/RecommendationDto.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Dto/RecommendationType.cs b/MediaBrowser.Model/Dto/RecommendationType.cs
index 904ec4406..384f20c32 100644
--- a/MediaBrowser.Model/Dto/RecommendationType.cs
+++ b/MediaBrowser.Model/Dto/RecommendationType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Entities/ChapterInfo.cs b/MediaBrowser.Model/Entities/ChapterInfo.cs
index c5c925c71..2903ef61b 100644
--- a/MediaBrowser.Model/Entities/ChapterInfo.cs
+++ b/MediaBrowser.Model/Entities/ChapterInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index 5d781e490..354038712 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/ExtraType.cs b/MediaBrowser.Model/Entities/ExtraType.cs
index ab82f73ef..857e92adb 100644
--- a/MediaBrowser.Model/Entities/ExtraType.cs
+++ b/MediaBrowser.Model/Entities/ExtraType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
index 8b45e581d..b98c00240 100644
--- a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
+++ b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 7f626c69b..37f9d7c1a 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs
index 9e30648ad..e44143755 100644
--- a/MediaBrowser.Model/Entities/MediaUrl.cs
+++ b/MediaBrowser.Model/Entities/MediaUrl.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs
index 38c406170..1a44a1661 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProviders.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/PackageReviewInfo.cs b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
index dd6be24bc..a034de8ba 100644
--- a/MediaBrowser.Model/Entities/PackageReviewInfo.cs
+++ b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Entities/ParentalRating.cs b/MediaBrowser.Model/Entities/ParentalRating.cs
index d00341c18..4b37bd64a 100644
--- a/MediaBrowser.Model/Entities/ParentalRating.cs
+++ b/MediaBrowser.Model/Entities/ParentalRating.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/TrailerType.cs b/MediaBrowser.Model/Entities/TrailerType.cs
index e72741d23..68d992b0d 100644
--- a/MediaBrowser.Model/Entities/TrailerType.cs
+++ b/MediaBrowser.Model/Entities/TrailerType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/Video3DFormat.cs b/MediaBrowser.Model/Entities/Video3DFormat.cs
index b7789e858..a4f62e18b 100644
--- a/MediaBrowser.Model/Entities/Video3DFormat.cs
+++ b/MediaBrowser.Model/Entities/Video3DFormat.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
index 0d4acd18b..dd30c9c84 100644
--- a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
+++ b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Configuration;
diff --git a/MediaBrowser.Model/Extensions/ListHelper.cs b/MediaBrowser.Model/Extensions/ListHelper.cs
index 16919d616..90ce6f2e5 100644
--- a/MediaBrowser.Model/Extensions/ListHelper.cs
+++ b/MediaBrowser.Model/Extensions/ListHelper.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Globalization/CultureDto.cs b/MediaBrowser.Model/Globalization/CultureDto.cs
index cfd8d33bd..f415840b0 100644
--- a/MediaBrowser.Model/Globalization/CultureDto.cs
+++ b/MediaBrowser.Model/Globalization/CultureDto.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Globalization/LocalizationOption.cs b/MediaBrowser.Model/Globalization/LocalizationOption.cs
index af617d975..00caf5e11 100644
--- a/MediaBrowser.Model/Globalization/LocalizationOption.cs
+++ b/MediaBrowser.Model/Globalization/LocalizationOption.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Globalization
 {
diff --git a/MediaBrowser.Model/IO/FileSystemMetadata.cs b/MediaBrowser.Model/IO/FileSystemMetadata.cs
index 8010e2dcd..4b9102392 100644
--- a/MediaBrowser.Model/IO/FileSystemMetadata.cs
+++ b/MediaBrowser.Model/IO/FileSystemMetadata.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
@@ -54,7 +53,7 @@ namespace MediaBrowser.Model.IO
         /// </summary>
         /// <value>The creation time UTC.</value>
         public DateTime CreationTimeUtc { get; set; }
-        
+
         /// <summary>
         /// Gets a value indicating whether this instance is directory.
         /// </summary>
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index 7e6fe7c09..53f23a8e0 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/IO/IIsoManager.cs b/MediaBrowser.Model/IO/IIsoManager.cs
index 1a11b6f70..8b6af019d 100644
--- a/MediaBrowser.Model/IO/IIsoManager.cs
+++ b/MediaBrowser.Model/IO/IIsoManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/IO/IIsoMounter.cs b/MediaBrowser.Model/IO/IIsoMounter.cs
index 1d110e82f..83fdb5fd6 100644
--- a/MediaBrowser.Model/IO/IIsoMounter.cs
+++ b/MediaBrowser.Model/IO/IIsoMounter.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/MediaBrowser.Model/IO/IShortcutHandler.cs b/MediaBrowser.Model/IO/IShortcutHandler.cs
index 69b6f35e7..5c663aa0d 100644
--- a/MediaBrowser.Model/IO/IShortcutHandler.cs
+++ b/MediaBrowser.Model/IO/IShortcutHandler.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.IO
 {
diff --git a/MediaBrowser.Model/IO/IStreamHelper.cs b/MediaBrowser.Model/IO/IStreamHelper.cs
index 21a592971..e348cd725 100644
--- a/MediaBrowser.Model/IO/IStreamHelper.cs
+++ b/MediaBrowser.Model/IO/IStreamHelper.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/MediaBrowser.Model/IO/IZipClient.cs b/MediaBrowser.Model/IO/IZipClient.cs
index 1ae3893ac..83e8a018d 100644
--- a/MediaBrowser.Model/IO/IZipClient.cs
+++ b/MediaBrowser.Model/IO/IZipClient.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.IO;
 
diff --git a/MediaBrowser.Model/Library/PlayAccess.cs b/MediaBrowser.Model/Library/PlayAccess.cs
index fd7cf8d32..a2f263ce5 100644
--- a/MediaBrowser.Model/Library/PlayAccess.cs
+++ b/MediaBrowser.Model/Library/PlayAccess.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Library
 {
diff --git a/MediaBrowser.Model/Library/UserViewQuery.cs b/MediaBrowser.Model/Library/UserViewQuery.cs
index ac2583179..a538efd25 100644
--- a/MediaBrowser.Model/Library/UserViewQuery.cs
+++ b/MediaBrowser.Model/Library/UserViewQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
index b5f3ccd3f..064ce6520 100644
--- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/LiveTv/DayPattern.cs b/MediaBrowser.Model/LiveTv/DayPattern.cs
index 0fd856fbf..17efe3908 100644
--- a/MediaBrowser.Model/LiveTv/DayPattern.cs
+++ b/MediaBrowser.Model/LiveTv/DayPattern.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/GuideInfo.cs b/MediaBrowser.Model/LiveTv/GuideInfo.cs
index e0d4d8326..a224d73b7 100644
--- a/MediaBrowser.Model/LiveTv/GuideInfo.cs
+++ b/MediaBrowser.Model/LiveTv/GuideInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index 95d13761a..8154fbd0e 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
index 42d5a21a2..85b77af24 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index f88a0195f..dc8e0f91b 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
index ee0696176..09e900643 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs
index 5c0cb1baa..72a0e2d7b 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs
index d52efe55b..80a646195 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/ProgramAudio.cs b/MediaBrowser.Model/LiveTv/ProgramAudio.cs
index f9c9ee411..727d34695 100644
--- a/MediaBrowser.Model/LiveTv/ProgramAudio.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramAudio.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index be2e273d9..c75092b79 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index 17e498c88..b0ba42d43 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
index bd518c1db..e30dd84dc 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
index 22d408b04..bb553a576 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index d6d112572..a1fbc5177 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dto;
 
diff --git a/MediaBrowser.Model/LiveTv/TimerQuery.cs b/MediaBrowser.Model/LiveTv/TimerQuery.cs
index e7f37b536..1ef6dd67e 100644
--- a/MediaBrowser.Model/LiveTv/TimerQuery.cs
+++ b/MediaBrowser.Model/LiveTv/TimerQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/MediaInfo/AudioCodec.cs b/MediaBrowser.Model/MediaInfo/AudioCodec.cs
index 171a06114..dcb6fa270 100644
--- a/MediaBrowser.Model/MediaInfo/AudioCodec.cs
+++ b/MediaBrowser.Model/MediaInfo/AudioCodec.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.MediaInfo
 {
diff --git a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
index dc46fb7b2..29ba10dbb 100644
--- a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
index 94eab8d37..52348f802 100644
--- a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dlna;
diff --git a/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs b/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs
index aa27f699f..45b8fcce9 100644
--- a/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Dto;
 
diff --git a/MediaBrowser.Model/MediaInfo/MediaInfo.cs b/MediaBrowser.Model/MediaInfo/MediaInfo.cs
index 237a2b36c..ad174f15d 100644
--- a/MediaBrowser.Model/MediaInfo/MediaInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/MediaInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
@@ -55,7 +54,7 @@ namespace MediaBrowser.Model.MediaInfo
         /// </summary>
         /// <value>The official rating description.</value>
         public string OfficialRatingDescription { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the overview.
         /// </summary>
diff --git a/MediaBrowser.Model/MediaInfo/MediaProtocol.cs b/MediaBrowser.Model/MediaInfo/MediaProtocol.cs
index 8b6b03625..b9df01f27 100644
--- a/MediaBrowser.Model/MediaInfo/MediaProtocol.cs
+++ b/MediaBrowser.Model/MediaInfo/MediaProtocol.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.MediaInfo
 {
diff --git a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
index f09494039..a2f163422 100644
--- a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dlna;
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
index 58edb7e73..2bd45695a 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.MediaInfo
 {
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
index 18ea69afb..5b0ccb28a 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.MediaInfo
 {
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs b/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
index bec0e02aa..37f5c55da 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
index b229f44d8..b7ee5747a 100644
--- a/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
+++ b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.MediaInfo
 {
diff --git a/MediaBrowser.Model/Net/EndPointInfo.cs b/MediaBrowser.Model/Net/EndPointInfo.cs
index f5b5a406f..f5ac3d169 100644
--- a/MediaBrowser.Model/Net/EndPointInfo.cs
+++ b/MediaBrowser.Model/Net/EndPointInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Net
 {
diff --git a/MediaBrowser.Model/Net/ISocket.cs b/MediaBrowser.Model/Net/ISocket.cs
index f7e4adb91..2bfbfcb20 100644
--- a/MediaBrowser.Model/Net/ISocket.cs
+++ b/MediaBrowser.Model/Net/ISocket.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Net;
diff --git a/MediaBrowser.Model/Net/ISocketFactory.cs b/MediaBrowser.Model/Net/ISocketFactory.cs
index eb81af9a7..363abefc1 100644
--- a/MediaBrowser.Model/Net/ISocketFactory.cs
+++ b/MediaBrowser.Model/Net/ISocketFactory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Net;
 
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index d746b921f..1fd2b7425 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Net/NetworkShare.cs b/MediaBrowser.Model/Net/NetworkShare.cs
index 061e9982c..744c6ec14 100644
--- a/MediaBrowser.Model/Net/NetworkShare.cs
+++ b/MediaBrowser.Model/Net/NetworkShare.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Net
 {
diff --git a/MediaBrowser.Model/Net/SocketReceiveResult.cs b/MediaBrowser.Model/Net/SocketReceiveResult.cs
index a49e7e635..141ae1608 100644
--- a/MediaBrowser.Model/Net/SocketReceiveResult.cs
+++ b/MediaBrowser.Model/Net/SocketReceiveResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Net;
 
diff --git a/MediaBrowser.Model/Net/WebSocketMessage.cs b/MediaBrowser.Model/Net/WebSocketMessage.cs
index afa8cea92..7575224d4 100644
--- a/MediaBrowser.Model/Net/WebSocketMessage.cs
+++ b/MediaBrowser.Model/Net/WebSocketMessage.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Net
 {
diff --git a/MediaBrowser.Model/Notifications/NotificationLevel.cs b/MediaBrowser.Model/Notifications/NotificationLevel.cs
index b02cb6c7a..14fead3f0 100644
--- a/MediaBrowser.Model/Notifications/NotificationLevel.cs
+++ b/MediaBrowser.Model/Notifications/NotificationLevel.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Notifications
 {
diff --git a/MediaBrowser.Model/Notifications/NotificationOption.cs b/MediaBrowser.Model/Notifications/NotificationOption.cs
index 16183a079..4fb724515 100644
--- a/MediaBrowser.Model/Notifications/NotificationOption.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOption.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs
index 3bf0fbb6f..79a128e9b 100644
--- a/MediaBrowser.Model/Notifications/NotificationOptions.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Extensions;
diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs
index 5aca15c66..ffcfab24f 100644
--- a/MediaBrowser.Model/Notifications/NotificationRequest.cs
+++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Notifications/NotificationType.cs b/MediaBrowser.Model/Notifications/NotificationType.cs
index a1d8e29a4..d58fbbc21 100644
--- a/MediaBrowser.Model/Notifications/NotificationType.cs
+++ b/MediaBrowser.Model/Notifications/NotificationType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Notifications
 {
diff --git a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
index efde211ed..bfa163b40 100644
--- a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
+++ b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Notifications
 {
diff --git a/MediaBrowser.Model/Notifications/SendToUserType.cs b/MediaBrowser.Model/Notifications/SendToUserType.cs
index 07b1ac018..65fc4e1ab 100644
--- a/MediaBrowser.Model/Notifications/SendToUserType.cs
+++ b/MediaBrowser.Model/Notifications/SendToUserType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Notifications
 {
diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs b/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs
index d5b85a5f4..b7003c4c8 100644
--- a/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs
+++ b/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
index 91a2af7d1..4f2067b98 100644
--- a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
+++ b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Playlists
 {
diff --git a/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs b/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs
index ec8c7eb09..324a38e70 100644
--- a/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs
+++ b/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Querying;
 
diff --git a/MediaBrowser.Model/Plugins/IHasWebPages.cs b/MediaBrowser.Model/Plugins/IHasWebPages.cs
index 74f2ac0ee..765c2d373 100644
--- a/MediaBrowser.Model/Plugins/IHasWebPages.cs
+++ b/MediaBrowser.Model/Plugins/IHasWebPages.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 
diff --git a/MediaBrowser.Model/Plugins/PluginPageInfo.cs b/MediaBrowser.Model/Plugins/PluginPageInfo.cs
index e692c4431..eb6a1527d 100644
--- a/MediaBrowser.Model/Plugins/PluginPageInfo.cs
+++ b/MediaBrowser.Model/Plugins/PluginPageInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Plugins
 {
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 8c23a31ed..2b481ad7e 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Providers
 {
diff --git a/MediaBrowser.Model/Providers/ExternalUrl.cs b/MediaBrowser.Model/Providers/ExternalUrl.cs
index 0143e005f..d4f4fa840 100644
--- a/MediaBrowser.Model/Providers/ExternalUrl.cs
+++ b/MediaBrowser.Model/Providers/ExternalUrl.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Providers
 {
diff --git a/MediaBrowser.Model/Providers/ImageProviderInfo.cs b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
index 765fc2ced..a22ec3c07 100644
--- a/MediaBrowser.Model/Providers/ImageProviderInfo.cs
+++ b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/Providers/RemoteImageQuery.cs b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
index e1762e6a4..2873c1003 100644
--- a/MediaBrowser.Model/Providers/RemoteImageQuery.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/Providers/RemoteSearchResult.cs b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
index 64d70e18a..161e04821 100644
--- a/MediaBrowser.Model/Providers/RemoteSearchResult.cs
+++ b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
index c252fb6e6..06f29df3f 100644
--- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Providers/SubtitleOptions.cs b/MediaBrowser.Model/Providers/SubtitleOptions.cs
index d53fcef3b..9e6049246 100644
--- a/MediaBrowser.Model/Providers/SubtitleOptions.cs
+++ b/MediaBrowser.Model/Providers/SubtitleOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
index 66c771a2c..fca93d176 100644
--- a/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
+++ b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Providers
 {
diff --git a/MediaBrowser.Model/Querying/AllThemeMediaResult.cs b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
index d94928b0d..a264c6178 100644
--- a/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
+++ b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Querying
 {
diff --git a/MediaBrowser.Model/Querying/EpisodeQuery.cs b/MediaBrowser.Model/Querying/EpisodeQuery.cs
index 2aeb97925..6fb4df676 100644
--- a/MediaBrowser.Model/Querying/EpisodeQuery.cs
+++ b/MediaBrowser.Model/Querying/EpisodeQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 324f242e4..d7cc5ebbe 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Querying
 {
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index 553ba7c49..15b60ad84 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Querying
 {
diff --git a/MediaBrowser.Model/Querying/LatestItemsQuery.cs b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
index d08ec8420..84e29e76a 100644
--- a/MediaBrowser.Model/Querying/LatestItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
index ea6b23384..93de0a8cd 100644
--- a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
+++ b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
@@ -30,7 +29,7 @@ namespace MediaBrowser.Model.Querying
         /// </summary>
         /// <value>The category limit.</value>
         public int CategoryLimit { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the fields.
         /// </summary>
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index 14b10f4ce..1543aea16 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/Querying/QueryFilters.cs b/MediaBrowser.Model/Querying/QueryFilters.cs
index f32ac4663..8d879c174 100644
--- a/MediaBrowser.Model/Querying/QueryFilters.cs
+++ b/MediaBrowser.Model/Querying/QueryFilters.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/Querying/QueryResult.cs b/MediaBrowser.Model/Querying/QueryResult.cs
index 5d4d6226b..266f1c7e6 100644
--- a/MediaBrowser.Model/Querying/QueryResult.cs
+++ b/MediaBrowser.Model/Querying/QueryResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
index 6831dfbfd..123d0fad2 100644
--- a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
+++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/Search/SearchHint.cs b/MediaBrowser.Model/Search/SearchHint.cs
index d67876036..6e52314fa 100644
--- a/MediaBrowser.Model/Search/SearchHint.cs
+++ b/MediaBrowser.Model/Search/SearchHint.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Search/SearchQuery.cs b/MediaBrowser.Model/Search/SearchQuery.cs
index af26ee2ad..8a018312e 100644
--- a/MediaBrowser.Model/Search/SearchQuery.cs
+++ b/MediaBrowser.Model/Search/SearchQuery.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Serialization/IJsonSerializer.cs b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
index 302cb0dae..6223bb559 100644
--- a/MediaBrowser.Model/Serialization/IJsonSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/MediaBrowser.Model/Serialization/IXmlSerializer.cs b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
index 64a6b5eb8..1edd98fad 100644
--- a/MediaBrowser.Model/Serialization/IXmlSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.IO;
diff --git a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs b/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
index c93e05c56..afbca78a2 100644
--- a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
+++ b/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.IO;
 using System.Threading;
diff --git a/MediaBrowser.Model/Services/IHasHeaders.cs b/MediaBrowser.Model/Services/IHasHeaders.cs
index 484346d22..313f34b41 100644
--- a/MediaBrowser.Model/Services/IHasHeaders.cs
+++ b/MediaBrowser.Model/Services/IHasHeaders.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Collections.Generic;
 
diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
index c81e49e4e..3d2e9c0dc 100644
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ b/MediaBrowser.Model/Services/IHasRequestFilter.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using Microsoft.AspNetCore.Http;
 
diff --git a/MediaBrowser.Model/Services/IHttpRequest.cs b/MediaBrowser.Model/Services/IHttpRequest.cs
index ab0cb52dc..4dccd2d68 100644
--- a/MediaBrowser.Model/Services/IHttpRequest.cs
+++ b/MediaBrowser.Model/Services/IHttpRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
index 4c7bfda05..b153f15ec 100644
--- a/MediaBrowser.Model/Services/IHttpResult.cs
+++ b/MediaBrowser.Model/Services/IHttpResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.Net;
 
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 7acc0aa8a..3f4edced6 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Services/IRequiresRequestStream.cs b/MediaBrowser.Model/Services/IRequiresRequestStream.cs
index 2c7cd71f1..622626edc 100644
--- a/MediaBrowser.Model/Services/IRequiresRequestStream.cs
+++ b/MediaBrowser.Model/Services/IRequiresRequestStream.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.IO;
 
diff --git a/MediaBrowser.Model/Services/IService.cs b/MediaBrowser.Model/Services/IService.cs
index 5a72ba333..a26d39455 100644
--- a/MediaBrowser.Model/Services/IService.cs
+++ b/MediaBrowser.Model/Services/IService.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IStreamWriter.cs b/MediaBrowser.Model/Services/IStreamWriter.cs
index 0d477a125..3ebfef66b 100644
--- a/MediaBrowser.Model/Services/IStreamWriter.cs
+++ b/MediaBrowser.Model/Services/IStreamWriter.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System.IO;
 
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
index fb100d4b4..19e9e53e7 100644
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ b/MediaBrowser.Model/Services/QueryParamCollection.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Services/RouteAttribute.cs b/MediaBrowser.Model/Services/RouteAttribute.cs
index 054abe219..197ba05e5 100644
--- a/MediaBrowser.Model/Services/RouteAttribute.cs
+++ b/MediaBrowser.Model/Services/RouteAttribute.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs
index 1c3aa0313..5da4998e8 100644
--- a/MediaBrowser.Model/Session/ClientCapabilities.cs
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dlna;
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 0d1ad1e48..980e1f88b 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index 5d85cef06..5a9042d5f 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs
index 3c9d04c78..473a7bccc 100644
--- a/MediaBrowser.Model/Session/MessageCommand.cs
+++ b/MediaBrowser.Model/Session/MessageCommand.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Session/PlayMethod.cs b/MediaBrowser.Model/Session/PlayMethod.cs
index 9b8f0052a..806762784 100644
--- a/MediaBrowser.Model/Session/PlayMethod.cs
+++ b/MediaBrowser.Model/Session/PlayMethod.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index ff53db15d..bdb2b2439 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Services;
diff --git a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index 6401f8dcc..5687ba84b 100644
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/Session/PlaybackStopInfo.cs b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
index 8ccf3cab7..f8cfacc20 100644
--- a/MediaBrowser.Model/Session/PlaybackStopInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Dto;
diff --git a/MediaBrowser.Model/Session/PlayerStateInfo.cs b/MediaBrowser.Model/Session/PlayerStateInfo.cs
index d7b74fb6c..0f9956873 100644
--- a/MediaBrowser.Model/Session/PlayerStateInfo.cs
+++ b/MediaBrowser.Model/Session/PlayerStateInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs
index 64dd948bf..3aa091f79 100644
--- a/MediaBrowser.Model/Session/PlaystateCommand.cs
+++ b/MediaBrowser.Model/Session/PlaystateCommand.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Session/PlaystateRequest.cs b/MediaBrowser.Model/Session/PlaystateRequest.cs
index 504dcd25b..493a8063a 100644
--- a/MediaBrowser.Model/Session/PlaystateRequest.cs
+++ b/MediaBrowser.Model/Session/PlaystateRequest.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Session/TranscodingInfo.cs b/MediaBrowser.Model/Session/TranscodingInfo.cs
index 68edb42ff..8f4e688f0 100644
--- a/MediaBrowser.Model/Session/TranscodingInfo.cs
+++ b/MediaBrowser.Model/Session/TranscodingInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Sync/SyncCategory.cs b/MediaBrowser.Model/Sync/SyncCategory.cs
index 8981f479b..215ac301e 100644
--- a/MediaBrowser.Model/Sync/SyncCategory.cs
+++ b/MediaBrowser.Model/Sync/SyncCategory.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Sync
 {
diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs
index 4295d5a3e..30bf27f38 100644
--- a/MediaBrowser.Model/Sync/SyncJob.cs
+++ b/MediaBrowser.Model/Sync/SyncJob.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Sync/SyncJobStatus.cs b/MediaBrowser.Model/Sync/SyncJobStatus.cs
index e8cc8d2bf..226a47d4c 100644
--- a/MediaBrowser.Model/Sync/SyncJobStatus.cs
+++ b/MediaBrowser.Model/Sync/SyncJobStatus.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Sync
 {
diff --git a/MediaBrowser.Model/Sync/SyncTarget.cs b/MediaBrowser.Model/Sync/SyncTarget.cs
index b6c4dba4b..20a0c8cc7 100644
--- a/MediaBrowser.Model/Sync/SyncTarget.cs
+++ b/MediaBrowser.Model/Sync/SyncTarget.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Sync
 {
diff --git a/MediaBrowser.Model/System/LogFile.cs b/MediaBrowser.Model/System/LogFile.cs
index 1e21203d0..a2b701664 100644
--- a/MediaBrowser.Model/System/LogFile.cs
+++ b/MediaBrowser.Model/System/LogFile.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/System/OperatingSystemId.cs b/MediaBrowser.Model/System/OperatingSystemId.cs
index 6ccbe40e2..2e417f6b5 100644
--- a/MediaBrowser.Model/System/OperatingSystemId.cs
+++ b/MediaBrowser.Model/System/OperatingSystemId.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.System
 {
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
index 34257de38..1775470b5 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.System
 {
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 190411c9b..cfa7684c9 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs b/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
index 8a873163a..fbfaed22e 100644
--- a/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
+++ b/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Tasks
 {
diff --git a/MediaBrowser.Model/Tasks/IScheduledTask.cs b/MediaBrowser.Model/Tasks/IScheduledTask.cs
index 7708cd307..ed160e176 100644
--- a/MediaBrowser.Model/Tasks/IScheduledTask.cs
+++ b/MediaBrowser.Model/Tasks/IScheduledTask.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Tasks/ITaskManager.cs b/MediaBrowser.Model/Tasks/ITaskManager.cs
index f962d3b30..4a7f579ec 100644
--- a/MediaBrowser.Model/Tasks/ITaskManager.cs
+++ b/MediaBrowser.Model/Tasks/ITaskManager.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs b/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs
index 29c9b740d..cc6c2b62b 100644
--- a/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs
+++ b/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Tasks/TaskOptions.cs b/MediaBrowser.Model/Tasks/TaskOptions.cs
index 4ff6b82d4..3a221b878 100644
--- a/MediaBrowser.Model/Tasks/TaskOptions.cs
+++ b/MediaBrowser.Model/Tasks/TaskOptions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Tasks
 {
diff --git a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
index e7b54f3a7..699e0ea3a 100644
--- a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
+++ b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index 85d8fde86..3eef965dd 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using System.Text.Json.Serialization;
diff --git a/MediaBrowser.Model/Users/ForgotPasswordAction.cs b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
index 1e4812849..f198476e3 100644
--- a/MediaBrowser.Model/Users/ForgotPasswordAction.cs
+++ b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Users
 {
diff --git a/MediaBrowser.Model/Users/ForgotPasswordResult.cs b/MediaBrowser.Model/Users/ForgotPasswordResult.cs
index 90c9313be..368c642e8 100644
--- a/MediaBrowser.Model/Users/ForgotPasswordResult.cs
+++ b/MediaBrowser.Model/Users/ForgotPasswordResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Users/PinRedeemResult.cs b/MediaBrowser.Model/Users/PinRedeemResult.cs
index 30ad41f19..ab868cad4 100644
--- a/MediaBrowser.Model/Users/PinRedeemResult.cs
+++ b/MediaBrowser.Model/Users/PinRedeemResult.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Users
 {
diff --git a/MediaBrowser.Model/Users/UserAction.cs b/MediaBrowser.Model/Users/UserAction.cs
index fdc7d5bf4..f6bb6451b 100644
--- a/MediaBrowser.Model/Users/UserAction.cs
+++ b/MediaBrowser.Model/Users/UserAction.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 
diff --git a/MediaBrowser.Model/Users/UserActionType.cs b/MediaBrowser.Model/Users/UserActionType.cs
index 241759caf..dbb1513f2 100644
--- a/MediaBrowser.Model/Users/UserActionType.cs
+++ b/MediaBrowser.Model/Users/UserActionType.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 namespace MediaBrowser.Model.Users
 {
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index e5f66b34b..323b4fc2e 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable SA1600
 
 using System;
 using MediaBrowser.Model.Configuration;
@@ -83,7 +82,7 @@ namespace MediaBrowser.Model.Users
         public UserPolicy()
         {
             IsHidden = true;
-            
+
             EnableContentDeletion = false;
             EnableContentDeletionFromFolders = Array.Empty<string>();
 
diff --git a/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs b/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs
index b8f9e09b5..e49a4be8a 100644
--- a/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs
+++ b/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Plugins;
@@ -6,29 +8,6 @@ namespace MediaBrowser.WebDashboard.Api
 {
     public class ConfigurationPageInfo
     {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
-        public bool EnableInMainMenu { get; set; }
-        public string MenuSection { get; set; }
-        public string MenuIcon { get; set; }
-
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets the type of the configuration page.
-        /// </summary>
-        /// <value>The type of the configuration page.</value>
-        public ConfigurationPageType ConfigurationPageType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the plugin id.
-        /// </summary>
-        /// <value>The plugin id.</value>
-        public string PluginId { get; set; }
-
         public ConfigurationPageInfo(IPluginConfigurationPage page)
         {
             Name = page.Name;
@@ -54,5 +33,31 @@ namespace MediaBrowser.WebDashboard.Api
             // Don't use "N" because it needs to match Plugin.Id
             PluginId = plugin.Id.ToString();
         }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+
+        public bool EnableInMainMenu { get; set; }
+
+        public string MenuSection { get; set; }
+
+        public string MenuIcon { get; set; }
+
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the configuration page.
+        /// </summary>
+        /// <value>The type of the configuration page.</value>
+        public ConfigurationPageType ConfigurationPageType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the plugin id.
+        /// </summary>
+        /// <value>The plugin id.</value>
+        public string PluginId { get; set; }
     }
 }
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index a8768459a..3d791a319 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -1,5 +1,10 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1402
+#pragma warning disable SA1649
+
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -18,7 +23,7 @@ using Microsoft.Extensions.Logging;
 namespace MediaBrowser.WebDashboard.Api
 {
     /// <summary>
-    /// Class GetDashboardConfigurationPages
+    /// Class GetDashboardConfigurationPages.
     /// </summary>
     [Route("/web/ConfigurationPages", "GET")]
     public class GetDashboardConfigurationPages : IReturn<List<ConfigurationPageInfo>>
@@ -28,11 +33,12 @@ namespace MediaBrowser.WebDashboard.Api
         /// </summary>
         /// <value>The type of the page.</value>
         public ConfigurationPageType? PageType { get; set; }
+
         public bool? EnableInMainMenu { get; set; }
     }
 
     /// <summary>
-    /// Class GetDashboardConfigurationPage
+    /// Class GetDashboardConfigurationPage.
     /// </summary>
     [Route("/web/ConfigurationPage", "GET")]
     public class GetDashboardConfigurationPage
@@ -56,7 +62,7 @@ namespace MediaBrowser.WebDashboard.Api
     }
 
     /// <summary>
-    /// Class GetDashboardResource
+    /// Class GetDashboardResource.
     /// </summary>
     [Route("/web/{ResourceName*}", "GET", IsHidden = true)]
     public class GetDashboardResource
@@ -66,6 +72,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// </summary>
         /// <value>The name.</value>
         public string ResourceName { get; set; }
+
         /// <summary>
         /// Gets or sets the V.
         /// </summary>
@@ -79,7 +86,7 @@ namespace MediaBrowser.WebDashboard.Api
     }
 
     /// <summary>
-    /// Class DashboardService
+    /// Class DashboardService.
     /// </summary>
     public class DashboardService : IService, IRequiresRequest
     {
@@ -96,18 +103,12 @@ namespace MediaBrowser.WebDashboard.Api
         private readonly IHttpResultFactory _resultFactory;
 
         /// <summary>
-        /// Gets or sets the request context.
-        /// </summary>
-        /// <value>The request context.</value>
-        public IRequest Request { get; set; }
-
-        /// <summary>
-        /// The _app host
+        /// The _app host.
         /// </summary>
         private readonly IServerApplicationHost _appHost;
 
         /// <summary>
-        /// The _server configuration manager
+        /// The _server configuration manager.
         /// </summary>
         private readonly IServerConfigurationManager _serverConfigurationManager;
 
@@ -117,22 +118,34 @@ namespace MediaBrowser.WebDashboard.Api
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardService" /> class.
         /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="appHost">The application host.</param>
+        /// <param name="resourceFileManager">The resource file manager.</param>
+        /// <param name="serverConfigurationManager">The server configuration manager.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="resultFactory">The result factory.</param>
         public DashboardService(
+            ILogger<DashboardService> logger,
             IServerApplicationHost appHost,
             IResourceFileManager resourceFileManager,
             IServerConfigurationManager serverConfigurationManager,
             IFileSystem fileSystem,
-            ILogger logger,
             IHttpResultFactory resultFactory)
         {
+            _logger = logger;
             _appHost = appHost;
+            _resourceFileManager = resourceFileManager;
             _serverConfigurationManager = serverConfigurationManager;
             _fileSystem = fileSystem;
-            _logger = logger;
             _resultFactory = resultFactory;
-            _resourceFileManager = resourceFileManager;
         }
 
+        /// <summary>
+        /// Gets or sets the request context.
+        /// </summary>
+        /// <value>The request context.</value>
+        public IRequest Request { get; set; }
+
         /// <summary>
         /// Gets the path for the web interface.
         /// </summary>
@@ -150,6 +163,7 @@ namespace MediaBrowser.WebDashboard.Api
             }
         }
 
+        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
         public object Get(GetFavIcon request)
         {
             return Get(new GetDashboardResource
@@ -163,6 +177,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns>System.Object.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
         public Task<object> Get(GetDashboardConfigurationPage request)
         {
             IPlugin plugin = null;
@@ -187,7 +202,7 @@ namespace MediaBrowser.WebDashboard.Api
                     stream = plugin.GetType().Assembly.GetManifestResourceStream(altPage.Item1.EmbeddedResourcePath);
 
                     isJs = string.Equals(Path.GetExtension(altPage.Item1.EmbeddedResourcePath), ".js", StringComparison.OrdinalIgnoreCase);
-                    isTemplate = altPage.Item1.EmbeddedResourcePath.EndsWith(".template.html");
+                    isTemplate = altPage.Item1.EmbeddedResourcePath.EndsWith(".template.html", StringComparison.Ordinal);
                 }
             }
 
@@ -235,7 +250,6 @@ namespace MediaBrowser.WebDashboard.Api
             // Don't allow a failing plugin to fail them all
             var configPages = pages.Select(p =>
             {
-
                 try
                 {
                     return new ConfigurationPageInfo(p);
@@ -286,6 +300,7 @@ namespace MediaBrowser.WebDashboard.Api
             return GetPluginPages(plugin).Select(i => new ConfigurationPageInfo(plugin, i.Item1));
         }
 
+        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
         public object Get(GetRobotsTxt request)
         {
             return Get(new GetDashboardResource
@@ -348,7 +363,7 @@ namespace MediaBrowser.WebDashboard.Api
                 return await _resultFactory.GetStaticResult(Request, cacheKey, null, cacheDuration, contentType, () => GetResourceStream(basePath, path, localizationCulture)).ConfigureAwait(false);
             }
 
-            return await _resultFactory.GetStaticFileResult(Request, _resourceFileManager.GetResourcePath(basePath, path));
+            return await _resultFactory.GetStaticFileResult(Request, _resourceFileManager.GetResourcePath(basePath, path)).ConfigureAwait(false);
         }
 
         private string GetLocalizationCulture()
@@ -390,9 +405,9 @@ namespace MediaBrowser.WebDashboard.Api
                 {
                     Directory.Delete(targetPath, true);
                 }
-                catch (IOException)
+                catch (IOException ex)
                 {
-
+                    _logger.LogError(ex, "Error deleting {Path}", targetPath);
                 }
 
                 CopyDirectory(inputPath, targetPath);
@@ -400,9 +415,9 @@ namespace MediaBrowser.WebDashboard.Api
 
             var appVersion = _appHost.ApplicationVersionString;
 
-            await DumpHtml(packageCreator, inputPath, targetPath, mode, appVersion);
+            await DumpHtml(packageCreator, inputPath, targetPath, mode, appVersion).ConfigureAwait(false);
 
-            return "";
+            return string.Empty;
         }
 
         private async Task DumpHtml(PackageCreator packageCreator, string source, string destination, string mode, string appVersion)
@@ -425,7 +440,7 @@ namespace MediaBrowser.WebDashboard.Api
             using (var stream = await packageCreator.GetResource(resourceVirtualPath, mode, null, appVersion).ConfigureAwait(false))
             using (var fs = new FileStream(destinationFilePath, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
-                await stream.CopyToAsync(fs);
+                await stream.CopyToAsync(fs).ConfigureAwait(false);
             }
         }
 
@@ -433,14 +448,17 @@ namespace MediaBrowser.WebDashboard.Api
         {
             Directory.CreateDirectory(destination);
 
-            //Now Create all of the directories
+            // Now Create all of the directories
             foreach (var dirPath in _fileSystem.GetDirectories(source, true))
-                Directory.CreateDirectory(dirPath.FullName.Replace(source, destination));
+            {
+                Directory.CreateDirectory(dirPath.FullName.Replace(source, destination, StringComparison.Ordinal));
+            }
 
-            //Copy all the files & Replaces any files with the same name
+            // Copy all the files & Replaces any files with the same name
             foreach (var newPath in _fileSystem.GetFiles(source, true))
-                File.Copy(newPath.FullName, newPath.FullName.Replace(source, destination), true);
+            {
+                File.Copy(newPath.FullName, newPath.FullName.Replace(source, destination, StringComparison.Ordinal), true);
+            }
         }
     }
-
 }
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 133bf61e8..54e5828e8 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -1,4 +1,7 @@
+#pragma warning disable CS1591
+
 using System;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -44,10 +47,6 @@ namespace MediaBrowser.WebDashboard.Api
             return string.Equals(Path.GetExtension(path), ".html", StringComparison.OrdinalIgnoreCase);
         }
 
-        /// <summary>
-        /// Modifies the HTML by adding common meta tags, css and js.
-        /// </summary>
-        /// <returns>Task{Stream}.</returns>
         public async Task<Stream> ModifyHtml(
             string path,
             Stream sourceStream,
@@ -67,30 +66,29 @@ namespace MediaBrowser.WebDashboard.Api
             {
                 var lang = localizationCulture.Split('-')[0];
 
-                html = html.Replace("<html", "<html data-culture=\"" + localizationCulture + "\" lang=\"" + lang + "\"");
+                html = html.Replace("<html", "<html data-culture=\"" + localizationCulture + "\" lang=\"" + lang + "\"", StringComparison.Ordinal);
             }
 
             if (isMainIndexPage)
             {
-                html = html.Replace("<head>", "<head>" + GetMetaTags(mode));
+                html = html.Replace("<head>", "<head>" + GetMetaTags(mode), StringComparison.Ordinal);
             }
 
             // Disable embedded scripts from plugins. We'll run them later once resources have loaded
             if (html.IndexOf("<script", StringComparison.OrdinalIgnoreCase) != -1)
             {
-                html = html.Replace("<script", "<!--<script");
-                html = html.Replace("</script>", "</script>-->");
+                html = html.Replace("<script", "<!--<script", StringComparison.Ordinal);
+                html = html.Replace("</script>", "</script>-->", StringComparison.Ordinal);
             }
 
             if (isMainIndexPage)
             {
-                html = html.Replace("</body>", GetCommonJavascript(mode, appVersion) + "</body>");
+                html = html.Replace("</body>", GetCommonJavascript(mode, appVersion) + "</body>", StringComparison.Ordinal);
             }
 
             var bytes = Encoding.UTF8.GetBytes(html);
 
             return new MemoryStream(bytes);
-
         }
 
         /// <summary>
@@ -123,11 +121,11 @@ namespace MediaBrowser.WebDashboard.Api
             builder.Append("<script>");
             if (!string.IsNullOrWhiteSpace(mode))
             {
-                builder.AppendFormat("window.appMode='{0}';", mode);
+                builder.AppendFormat(CultureInfo.InvariantCulture, "window.appMode='{0}';", mode);
             }
             else
             {
-                builder.AppendFormat("window.dashboardVersion='{0}';", version);
+                builder.AppendFormat(CultureInfo.InvariantCulture, "window.dashboardVersion='{0}';", version);
             }
 
             builder.Append("</script>");
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 1d256d689..da52b852a 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -19,6 +19,19 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <!-- Code Analyzers-->
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.WebDashboard/ServerEntryPoint.cs b/MediaBrowser.WebDashboard/ServerEntryPoint.cs
index 18ed54a78..5c7e8b3c7 100644
--- a/MediaBrowser.WebDashboard/ServerEntryPoint.cs
+++ b/MediaBrowser.WebDashboard/ServerEntryPoint.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -6,24 +8,25 @@ using MediaBrowser.Controller.Plugins;
 
 namespace MediaBrowser.WebDashboard
 {
-    public class ServerEntryPoint : IServerEntryPoint
+    public sealed class ServerEntryPoint : IServerEntryPoint
     {
-        /// <summary>
-        /// Gets the list of plugin configuration pages
-        /// </summary>
-        /// <value>The configuration pages.</value>
-        public List<IPluginConfigurationPage> PluginConfigurationPages { get; private set; }
-
         private readonly IApplicationHost _appHost;
 
-        public static ServerEntryPoint Instance { get; private set; }
-
         public ServerEntryPoint(IApplicationHost appHost)
         {
             _appHost = appHost;
             Instance = this;
         }
 
+        public static ServerEntryPoint Instance { get; private set; }
+
+        /// <summary>
+        /// Gets the list of plugin configuration pages.
+        /// </summary>
+        /// <value>The configuration pages.</value>
+        public List<IPluginConfigurationPage> PluginConfigurationPages { get; private set; }
+
+        /// <inheritdoc />
         public Task RunAsync()
         {
             PluginConfigurationPages = _appHost.GetExports<IPluginConfigurationPage>().ToList();
@@ -31,6 +34,7 @@ namespace MediaBrowser.WebDashboard
             return Task.CompletedTask;
         }
 
+        /// <inheritdoc />
         public void Dispose()
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationExtension.cs b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationExtension.cs
new file mode 100644
index 000000000..fe3bc3cd3
--- /dev/null
+++ b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationExtension.cs
@@ -0,0 +1,15 @@
+#pragma warning disable CS1591
+
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.XbmcMetadata.Configuration
+{
+    public static class NfoConfigurationExtension
+    {
+        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager manager)
+        {
+            return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
+        }
+    }
+}
diff --git a/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationFactory.cs b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationFactory.cs
new file mode 100644
index 000000000..8325bfdbd
--- /dev/null
+++ b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationFactory.cs
@@ -0,0 +1,24 @@
+#pragma warning disable CS1591
+
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.XbmcMetadata.Configuration
+{
+    public class NfoConfigurationFactory : IConfigurationFactory
+    {
+        /// <inheritdoc />
+        public IEnumerable<ConfigurationStore> GetConfigurations()
+        {
+            return new[]
+            {
+                new ConfigurationStore
+                {
+                     ConfigurationType = typeof(XbmcMetadataOptions),
+                     Key = "xbmcmetadata"
+                }
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.XbmcMetadata/Configuration/NfoOptions.cs b/MediaBrowser.XbmcMetadata/Configuration/NfoOptions.cs
deleted file mode 100644
index 60dcde4db..000000000
--- a/MediaBrowser.XbmcMetadata/Configuration/NfoOptions.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
-
-namespace MediaBrowser.XbmcMetadata.Configuration
-{
-    public class ConfigurationFactory : IConfigurationFactory
-    {
-        /// <inheritdoc />
-        public IEnumerable<ConfigurationStore> GetConfigurations()
-        {
-            return new[]
-            {
-                new ConfigurationStore
-                {
-                     ConfigurationType = typeof(XbmcMetadataOptions),
-                     Key = "xbmcmetadata"
-                }
-            };
-        }
-    }
-
-    public static class ConfigurationExtension
-    {
-        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager manager)
-        {
-            return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
-        }
-    }
-}
diff --git a/MediaBrowser.XbmcMetadata/EntryPoint.cs b/MediaBrowser.XbmcMetadata/EntryPoint.cs
index fe4d50efa..69b91586e 100644
--- a/MediaBrowser.XbmcMetadata/EntryPoint.cs
+++ b/MediaBrowser.XbmcMetadata/EntryPoint.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
@@ -12,7 +14,7 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata
 {
-    public class EntryPoint : IServerEntryPoint
+    public sealed class EntryPoint : IServerEntryPoint
     {
         private readonly IUserDataManager _userDataManager;
         private readonly ILogger _logger;
diff --git a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
index 0d62cf8c5..e26282095 100644
--- a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
+++ b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
@@ -13,6 +13,19 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <!-- Code Analyzers-->
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 62d7a8cf4..36b9a9c1f 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -27,6 +29,9 @@ namespace MediaBrowser.XbmcMetadata.Parsers
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseNfoParser{T}" /> class.
         /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
         public BaseNfoParser(ILogger logger, IConfigurationManager config, IProviderManager providerManager)
         {
             Logger = logger;
@@ -48,13 +53,13 @@ namespace MediaBrowser.XbmcMetadata.Parsers
         protected virtual string MovieDbParserSearchString => "themoviedb.org/movie/";
 
         /// <summary>
-        /// Fetches metadata for an item from one xml file
+        /// Fetches metadata for an item from one xml file.
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="metadataFile">The metadata file.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <exception cref="ArgumentNullException">
-        /// </exception>
+        /// <exception cref="ArgumentNullException"><c>item</c> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><c>metadataFile</c> is <c>null</c> or empty.</exception>
         public void Fetch(MetadataResult<T> item, string metadataFile, CancellationToken cancellationToken)
         {
             if (item == null)
@@ -80,7 +85,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                 }
             }
 
-            //Additional Mappings
+            // Additional Mappings
             _validProviderIds.Add("collectionnumber", "TmdbCollection");
             _validProviderIds.Add("tmdbcolid", "TmdbCollection");
             _validProviderIds.Add("imdb_id", "Imdb");
@@ -123,6 +128,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         }
                     }
                 }
+
                 return;
             }
 
@@ -196,14 +202,13 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                 }
                 catch (XmlException)
                 {
-
                 }
             }
         }
 
         protected void ParseProviderLinks(T item, string xml)
         {
-            //Look for a match for the Regex pattern "tt" followed by 7 digits
+            // Look for a match for the Regex pattern "tt" followed by 7 digits
             var m = Regex.Match(xml, @"tt([0-9]{7})", RegexOptions.IgnoreCase);
             if (m.Success)
             {
@@ -267,6 +272,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 Logger.LogWarning("Invalid Added value found: " + val);
                             }
                         }
+
                         break;
                     }
 
@@ -278,6 +284,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.OriginalTitle = val;
                         }
+
                         break;
                     }
 
@@ -309,6 +316,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.ForcedSortName = val;
                         }
+
                         break;
                     }
 
@@ -358,7 +366,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 }
 
                                 return null;
-
                             }).Where(i => i.HasValue).Select(i => i.Value).ToArray();
                         }
 
@@ -373,6 +380,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.Tagline = val;
                         }
+
                         break;
                     }
 
@@ -387,6 +395,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 .Where(i => !string.IsNullOrWhiteSpace(i))
                                 .ToArray();
                         }
+
                         break;
                     }
 
@@ -398,6 +407,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.OfficialRating = rating;
                         }
+
                         break;
                     }
 
@@ -409,6 +419,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.CustomRating = val;
                         }
+
                         break;
                     }
 
@@ -423,6 +434,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 item.RunTimeTicks = TimeSpan.FromMinutes(runtime).Ticks;
                             }
                         }
+
                         break;
                     }
 
@@ -435,6 +447,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             hasAspectRatio.AspectRatio = val;
                         }
+
                         break;
                     }
 
@@ -446,6 +459,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.IsLocked = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
                         }
+
                         break;
                     }
 
@@ -455,16 +469,9 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            //var parts = val.Split('/')
-                            //    .Select(i => i.Trim())
-                            //    .Where(i => !string.IsNullOrWhiteSpace(i));
-
-                            //foreach (var p in parts)
-                            //{
-                            //    item.AddStudio(p);
-                            //}
                             item.AddStudio(val);
                         }
+
                         break;
                     }
 
@@ -477,10 +484,13 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                             {
                                 continue;
                             }
+
                             itemResult.AddPerson(p);
                         }
+
                         break;
                     }
+
                 case "credits":
                     {
                         var val = reader.ReadElementContentAsString();
@@ -496,9 +506,11 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 {
                                     continue;
                                 }
+
                                 itemResult.AddPerson(p);
                             }
                         }
+
                         break;
                     }
 
@@ -511,8 +523,10 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                             {
                                 continue;
                             }
+
                             itemResult.AddPerson(p);
                         }
+
                         break;
                     }
 
@@ -534,6 +548,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             reader.Read();
                         }
+
                         break;
                     }
 
@@ -547,6 +562,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                             item.AddTrailerUrl(val);
                         }
+
                         break;
                     }
 
@@ -562,6 +578,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 hasDisplayOrder.DisplayOrder = val;
                             }
                         }
+
                         break;
                     }
 
@@ -582,7 +599,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                 case "rating":
                     {
-
                         var rating = reader.ReadElementContentAsString();
 
                         if (!string.IsNullOrWhiteSpace(rating))
@@ -593,6 +609,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 item.CommunityRating = val;
                             }
                         }
+
                         break;
                     }
 
@@ -649,6 +666,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 item.AddGenre(p);
                             }
                         }
+
                         break;
                     }
 
@@ -660,6 +678,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.AddTag(val);
                         }
+
                         break;
                     }
 
@@ -676,6 +695,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             reader.Read();
                         }
+
                         break;
                     }
 
@@ -693,6 +713,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                     {
                         reader.Skip();
                     }
+
                     break;
             }
         }
@@ -716,10 +737,12 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                     reader.Read();
                                     continue;
                                 }
+
                                 using (var subtree = reader.ReadSubtree())
                                 {
                                     FetchFromStreamDetailsNode(subtree, item);
                                 }
+
                                 break;
                             }
 
@@ -754,10 +777,12 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                     reader.Read();
                                     continue;
                                 }
+
                                 using (var subtree = reader.ReadSubtree())
                                 {
                                     FetchFromVideoNode(subtree, item);
                                 }
+
                                 break;
                             }
 
@@ -814,6 +839,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                         video.Video3DFormat = Video3DFormat.MVC;
                                     }
                                 }
+
                                 break;
                             }
 
@@ -863,8 +889,10 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 {
                                     role = val;
                                 }
+
                                 break;
                             }
+
                         case "sortorder":
                             {
                                 var val = reader.ReadElementContentAsString();
@@ -876,6 +904,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                         sortOrder = intVal;
                                     }
                                 }
+
                                 break;
                             }
 
@@ -909,7 +938,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
             };
 
         /// <summary>
-        /// Used to split names of comma or pipe delimeted genres and people
+        /// Used to split names of comma or pipe delimeted genres and people.
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>IEnumerable{System.String}.</returns>
@@ -919,7 +948,9 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
             // Only split by comma if there is no pipe in the string
             // We have to be careful to not split names like Matthew, Jr.
-            var separator = value.IndexOf('|') == -1 && value.IndexOf(';') == -1 ? new[] { ',' } : new[] { '|', ';' };
+            var separator = value.IndexOf('|', StringComparison.Ordinal) == -1 && value.IndexOf(';', StringComparison.Ordinal) == -1
+                ? new[] { ',' }
+                : new[] { '|', ';' };
 
             value = value.Trim().Trim(separator);
 
diff --git a/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
index 82ac6c548..9cc0344c1 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
@@ -11,8 +11,17 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Parsers
 {
+    /// <summary>
+    /// Nfo parser for episodes.
+    /// </summary>
     public class EpisodeNfoParser : BaseNfoParser<Episode>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EpisodeNfoParser"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
         public EpisodeNfoParser(ILogger logger, IConfigurationManager config, IProviderManager providerManager)
             : base(logger, config, providerManager)
         {
@@ -63,7 +72,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                 }
                 catch (XmlException)
                 {
-
                 }
             }
         }
@@ -86,6 +94,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 item.ParentIndexNumber = num;
                             }
                         }
+
                         break;
                     }
 
@@ -100,6 +109,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 item.IndexNumber = num;
                             }
                         }
+
                         break;
                     }
 
@@ -114,6 +124,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 item.IndexNumberEnd = num;
                             }
                         }
+
                         break;
                     }
 
@@ -197,7 +208,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         break;
                     }
 
-
                 default:
                     base.FetchDataFromXmlNode(reader, itemResult);
                     break;
diff --git a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
index 79d9111fe..c17212f31 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
@@ -11,8 +11,17 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Parsers
 {
+    /// <summary>
+    /// Nfo parser for movies.
+    /// </summary>
     public class MovieNfoParser : BaseNfoParser<Video>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovieNfoParser"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
         public MovieNfoParser(ILogger logger, IConfigurationManager config, IProviderManager providerManager)
             : base(logger, config, providerManager)
         {
@@ -50,6 +59,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         break;
                     }
+
                 case "set":
                     {
                         var movie = item as Movie;
@@ -65,7 +75,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         if (!string.IsNullOrWhiteSpace(val) && movie != null)
                         {
                             // TODO Handle this better later
-                            if (val.IndexOf('<') == -1)
+                            if (val.IndexOf('<', StringComparison.Ordinal) == -1)
                             {
                                 movie.CollectionName = val;
                             }
@@ -119,9 +129,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
         private void ParseSetXml(string xml, Movie movie)
         {
-            //xml = xml.Substring(xml.IndexOf('<'));
-            //xml = xml.Substring(0, xml.LastIndexOf('>'));
-
             // These are not going to be valid xml so no sense in causing the provider to fail and spamming the log with exceptions
             try
             {
@@ -155,7 +162,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
             }
             catch (XmlException)
             {
-
             }
         }
     }
diff --git a/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
index d6c06f982..d8cd88b9a 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
@@ -7,8 +7,17 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Parsers
 {
+    /// <summary>
+    /// Nfo parser for seasons.
+    /// </summary>
     public class SeasonNfoParser : BaseNfoParser<Season>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeasonNfoParser"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
         public SeasonNfoParser(ILogger logger, IConfigurationManager config, IProviderManager providerManager)
             : base(logger, config, providerManager)
         {
@@ -32,6 +41,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                 item.IndexNumber = num;
                             }
                         }
+
                         break;
                     }
 
diff --git a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
index 278858b4a..0954ae206 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
@@ -9,8 +9,17 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Parsers
 {
+    /// <summary>
+    /// Nfo parser for series.
+    /// </summary>
     public class SeriesNfoParser : BaseNfoParser<Series>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeriesNfoParser"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
         public SeriesNfoParser(ILogger logger, IConfigurationManager config, IProviderManager providerManager)
             : base(logger, config, providerManager)
         {
@@ -39,20 +48,25 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             tvdbId = reader.ReadElementContentAsString();
                         }
+
                         if (!string.IsNullOrWhiteSpace(imdbId))
                         {
                             item.SetProviderId(MetadataProviders.Imdb, imdbId);
                         }
+
                         if (!string.IsNullOrWhiteSpace(tmdbId))
                         {
                             item.SetProviderId(MetadataProviders.Tmdb, tmdbId);
                         }
+
                         if (!string.IsNullOrWhiteSpace(tvdbId))
                         {
                             item.SetProviderId(MetadataProviders.Tvdb, tvdbId);
                         }
+
                         break;
                     }
+
                 case "airs_dayofweek":
                     {
                         item.AirDays = TVUtils.GetAirDays(reader.ReadElementContentAsString());
@@ -67,6 +81,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.AirTime = val;
                         }
+
                         break;
                     }
 
diff --git a/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
index 3517bc32c..4b1ee4c9c 100644
--- a/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
@@ -9,13 +9,27 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Providers
 {
+    /// <summary>
+    /// Nfo provider for albums.
+    /// </summary>
     public class AlbumNfoProvider : BaseNfoProvider<MusicAlbum>
     {
         private readonly ILogger _logger;
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public AlbumNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AlbumNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
+        public AlbumNfoProvider(
+            ILogger<AlbumNfoProvider> logger,
+            IFileSystem fileSystem,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
index 03d8dbc7e..9c4629d9a 100644
--- a/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
@@ -9,12 +9,22 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Providers
 {
+    /// <summary>
+    /// Nfo provider for artists.
+    /// </summary>
     public class ArtistNfoProvider : BaseNfoProvider<MusicArtist>
     {
         private readonly ILogger _logger;
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArtistNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
         public ArtistNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
             : base(fileSystem)
         {
diff --git a/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
index ff3368bb9..6ad6c18a5 100644
--- a/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -18,6 +20,9 @@ namespace MediaBrowser.XbmcMetadata.Providers
             _fileSystem = fileSystem;
         }
 
+        /// <inheritdoc />
+        public string Name => BaseNfoSaver.SaverName;
+
         /// <inheritdoc />
         public Task<MetadataResult<T>> GetMetadata(
             ItemInfo info,
@@ -54,12 +59,6 @@ namespace MediaBrowser.XbmcMetadata.Providers
             return Task.FromResult(result);
         }
 
-        /// <inheritdoc />
-        protected abstract void Fetch(MetadataResult<T> result, string path, CancellationToken cancellationToken);
-
-        /// <inheritdoc />
-        protected abstract FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService);
-
         /// <inheritdoc />
         public bool HasChanged(BaseItem item, IDirectoryService directoryService)
         {
@@ -73,6 +72,8 @@ namespace MediaBrowser.XbmcMetadata.Providers
             return file.Exists && _fileSystem.GetLastWriteTimeUtc(file) > item.DateLastSaved;
         }
 
-        public string Name => BaseNfoSaver.SaverName;
+        protected abstract void Fetch(MetadataResult<T> result, string path, CancellationToken cancellationToken);
+
+        protected abstract FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService);
     }
 }
diff --git a/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
index 7410b97e0..84c99664a 100644
--- a/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Linq;
 using System.Threading;
 using MediaBrowser.Common.Configuration;
@@ -10,14 +12,18 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Providers
 {
-    public class BaseVideoNfoProvider<T> : BaseNfoProvider<T>
+    public abstract class BaseVideoNfoProvider<T> : BaseNfoProvider<T>
         where T : Video, new()
     {
         private readonly ILogger _logger;
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public BaseVideoNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public BaseVideoNfoProvider(
+            ILogger logger,
+            IFileSystem fileSystem,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
index b2278ba4a..b2dc2e38e 100644
--- a/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
@@ -9,13 +9,27 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Providers
 {
+    /// <summary>
+    /// Nfo provider for episodes.
+    /// </summary>
     public class EpisodeNfoProvider : BaseNfoProvider<Episode>
     {
         private readonly ILogger _logger;
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public EpisodeNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EpisodeNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
+        public EpisodeNfoProvider(
+            ILogger<EpisodeNfoProvider> logger,
+            IFileSystem fileSystem,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs
index d21164c02..ffa657703 100644
--- a/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
@@ -7,26 +6,20 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Providers
 {
+    /// <summary>
+    /// Nfo provider for movies.
+    /// </summary>
     public class MovieNfoProvider : BaseVideoNfoProvider<Movie>
     {
-        public MovieNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
-            : base(fileSystem, logger, config, providerManager)
-        {
-        }
-    }
-
-    public class MusicVideoNfoProvider : BaseVideoNfoProvider<MusicVideo>
-    {
-        public MusicVideoNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
-            : base(fileSystem, logger, config, providerManager)
-        {
-        }
-    }
-
-    public class VideoNfoProvider : BaseVideoNfoProvider<Video>
-    {
-        public VideoNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
-            : base(fileSystem, logger, config, providerManager)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovieNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
+        public MovieNfoProvider(ILogger<MovieNfoProvider> logger, IFileSystem fileSystem, IConfigurationManager config, IProviderManager providerManager)
+            : base(logger, fileSystem, config, providerManager)
         {
         }
     }
diff --git a/MediaBrowser.XbmcMetadata/Providers/MusicVideoNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/MusicVideoNfoProvider.cs
new file mode 100644
index 000000000..b490a7120
--- /dev/null
+++ b/MediaBrowser.XbmcMetadata/Providers/MusicVideoNfoProvider.cs
@@ -0,0 +1,26 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.IO;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.XbmcMetadata.Providers
+{
+    /// <summary>
+    /// Nfo provider for music videos.
+    /// </summary>
+    public class MusicVideoNfoProvider : BaseVideoNfoProvider<MusicVideo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MusicVideoNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
+        public MusicVideoNfoProvider(ILogger<MusicVideoNfoProvider> logger, IFileSystem fileSystem, IConfigurationManager config, IProviderManager providerManager)
+            : base(logger, fileSystem, config, providerManager)
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
index 2cf542054..3aab7df1b 100644
--- a/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
@@ -9,13 +9,27 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Providers
 {
+    /// <summary>
+    /// Nfo provider for seasons.
+    /// </summary>
     public class SeasonNfoProvider : BaseNfoProvider<Season>
     {
         private readonly ILogger _logger;
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public SeasonNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeasonNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
+        public SeasonNfoProvider(
+            ILogger logger,
+            IFileSystem fileSystem,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
@@ -34,4 +48,3 @@ namespace MediaBrowser.XbmcMetadata.Providers
             => directoryService.GetFile(Path.Combine(info.Path, "season.nfo"));
     }
 }
-
diff --git a/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
index 25c8e0faf..f244dcd38 100644
--- a/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
@@ -9,13 +9,23 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Providers
 {
+    /// <summary>
+    /// Nfo provider for series.
+    /// </summary>
     public class SeriesNfoProvider : BaseNfoProvider<Series>
     {
         private readonly ILogger _logger;
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public SeriesNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeriesNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
+        public SeriesNfoProvider(ILogger<SeriesNfoProvider> logger, IFileSystem fileSystem, IConfigurationManager config, IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/VideoNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/VideoNfoProvider.cs
new file mode 100644
index 000000000..f66ad30ca
--- /dev/null
+++ b/MediaBrowser.XbmcMetadata/Providers/VideoNfoProvider.cs
@@ -0,0 +1,26 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.IO;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.XbmcMetadata.Providers
+{
+    /// <summary>
+    /// Nfo provider for videos.
+    /// </summary>
+    public class VideoNfoProvider : BaseVideoNfoProvider<Video>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VideoNfoProvider"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="config">the configuration manager.</param>
+        /// <param name="providerManager">The provider manager.</param>
+        public VideoNfoProvider(ILogger<VideoNfoProvider> logger, IFileSystem fileSystem, IConfigurationManager config, IProviderManager providerManager)
+            : base(logger, fileSystem, config, providerManager)
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
index 233b3cb89..c22f77dcd 100644
--- a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
@@ -13,15 +13,27 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Savers
 {
+    /// <summary>
+    /// Nfo saver for albums.
+    /// </summary>
     public class AlbumNfoSaver : BaseNfoSaver
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AlbumNfoSaver"/> class.
+        /// </summary>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="configurationManager">the server configuration manager.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="userDataManager">The user data manager.</param>
+        /// <param name="logger">The logger.</param>
         public AlbumNfoSaver(
             IFileSystem fileSystem,
             IServerConfigurationManager configurationManager,
             ILibraryManager libraryManager,
             IUserManager userManager,
             IUserDataManager userDataManager,
-            ILogger logger)
+            ILogger<AlbumNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
@@ -74,7 +86,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
                 if (track.RunTimeTicks.HasValue)
                 {
-                    var time = TimeSpan.FromTicks(track.RunTimeTicks.Value).ToString(@"mm\:ss");
+                    var time = TimeSpan.FromTicks(track.RunTimeTicks.Value).ToString(@"mm\:ss", CultureInfo.InvariantCulture);
 
                     writer.WriteElementString("duration", time);
                 }
diff --git a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
index 04565ff7e..6365cdecb 100644
--- a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
@@ -12,9 +12,27 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Savers
 {
+    /// <summary>
+    /// Nfo saver for artsist.
+    /// </summary>
     public class ArtistNfoSaver : BaseNfoSaver
     {
-        public ArtistNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArtistNfoSaver"/> class.
+        /// </summary>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="configurationManager">the server configuration manager.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="userDataManager">The user data manager.</param>
+        /// <param name="logger">The logger.</param>
+        public ArtistNfoSaver(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IUserDataManager userDataManager,
+            ILogger<ArtistNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
@@ -40,7 +58,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             {
                 var formatString = ConfigurationManager.GetNfoConfiguration().ReleaseDateFormat;
 
-                writer.WriteElementString("disbanded", artist.EndDate.Value.ToLocalTime().ToString(formatString));
+                writer.WriteElementString("disbanded", artist.EndDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
             }
 
             var albums = artist
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 981c3a53a..90e8b4b99 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -28,6 +30,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public const string YouTubeWatchUrl = "https://www.youtube.com/watch?v=";
 
+        // filters control characters but allows only properly-formed surrogate sequences
+        private const string _invalidXMLCharsRegex = @"(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F\uFEFF\uFFFE\uFFFF]";
+
         private static readonly HashSet<string> _commonTags = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "plot",
@@ -94,9 +99,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
             "countrycode"
         };
 
-        // filters control characters but allows only properly-formed surrogate sequences
-        private const string _invalidXMLCharsRegex = @"(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F\uFEFF\uFFFE\uFFFF]";
-
         protected BaseNfoSaver(
             IFileSystem fileSystem,
             IServerConfigurationManager configurationManager,
@@ -247,7 +249,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
                 if (baseItem != null)
                 {
-                    AddCommonNodes(baseItem, writer, LibraryManager, UserManager, UserDataManager, FileSystem, ConfigurationManager);
+                    AddCommonNodes(baseItem, writer, LibraryManager, UserManager, UserDataManager, ConfigurationManager);
                 }
 
                 WriteCustomElements(item, writer);
@@ -265,11 +267,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 }
                 catch (FileNotFoundException)
                 {
-
                 }
                 catch (IOException)
                 {
-
                 }
                 catch (XmlException ex)
                 {
@@ -364,8 +364,8 @@ namespace MediaBrowser.XbmcMetadata.Savers
                     writer.WriteElementString("samplingrate", stream.SampleRate.Value.ToString(CultureInfo.InvariantCulture));
                 }
 
-                writer.WriteElementString("default", stream.IsDefault.ToString());
-                writer.WriteElementString("forced", stream.IsForced.ToString());
+                writer.WriteElementString("default", stream.IsDefault.ToString(CultureInfo.InvariantCulture));
+                writer.WriteElementString("forced", stream.IsForced.ToString(CultureInfo.InvariantCulture));
 
                 if (stream.Type == MediaStreamType.Video)
                 {
@@ -384,7 +384,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
                     if (item is Video video)
                     {
-                        //AddChapters(video, builder, itemRepository);
+                        // AddChapters(video, builder, itemRepository);
 
                         if (video.Video3DFormat.HasValue)
                         {
@@ -420,21 +420,19 @@ namespace MediaBrowser.XbmcMetadata.Savers
         /// <summary>
         /// Adds the common nodes.
         /// </summary>
-        /// <returns>Task.</returns>
         private void AddCommonNodes(
             BaseItem item,
             XmlWriter writer,
             ILibraryManager libraryManager,
             IUserManager userManager,
             IUserDataManager userDataRepo,
-            IFileSystem fileSystem,
             IServerConfigurationManager config)
         {
             var writtenProviderIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
             var overview = (item.Overview ?? string.Empty)
                 .StripHtml()
-                .Replace("&quot;", "'");
+                .Replace("&quot;", "'", StringComparison.Ordinal);
 
             var options = config.GetNfoConfiguration();
 
@@ -455,7 +453,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             {
                 var outline = (item.Tagline ?? string.Empty)
                     .StripHtml()
-                    .Replace("&quot;", "'");
+                    .Replace("&quot;", "'", StringComparison.Ordinal);
 
                 writer.WriteElementString("outline", outline);
             }
@@ -476,7 +474,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 writer.WriteElementString("lockedfields", string.Join("|", item.LockedFields));
             }
 
-            writer.WriteElementString("dateadded", item.DateCreated.ToLocalTime().ToString(DateAddedFormat));
+            writer.WriteElementString("dateadded", item.DateCreated.ToLocalTime().ToString(DateAddedFormat, CultureInfo.InvariantCulture));
 
             writer.WriteElementString("title", item.Name ?? string.Empty);
 
@@ -590,6 +588,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             {
                 writer.WriteElementString("language", item.PreferredMetadataLanguage);
             }
+
             if (!string.IsNullOrEmpty(item.PreferredMetadataCountryCode))
             {
                 writer.WriteElementString("countrycode", item.PreferredMetadataCountryCode);
@@ -603,16 +602,16 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 {
                     writer.WriteElementString(
                         "formed",
-                        item.PremiereDate.Value.ToLocalTime().ToString(formatString));
+                        item.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                 }
                 else
                 {
                     writer.WriteElementString(
                         "premiered",
-                        item.PremiereDate.Value.ToLocalTime().ToString(formatString));
+                        item.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                     writer.WriteElementString(
                         "releasedate",
-                        item.PremiereDate.Value.ToLocalTime().ToString(formatString));
+                        item.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                 }
             }
 
@@ -624,7 +623,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
                     writer.WriteElementString(
                         "enddate",
-                        item.EndDate.Value.ToLocalTime().ToString(formatString));
+                        item.EndDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                 }
             }
 
@@ -780,12 +779,12 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
             if (options.SaveImagePathsInNfo)
             {
-                AddImages(item, writer, libraryManager, config);
+                AddImages(item, writer, libraryManager);
             }
 
             AddUserData(item, writer, userManager, userDataRepo, options);
 
-            AddActors(people, writer, libraryManager, fileSystem, config, options.SaveImagePathsInNfo);
+            AddActors(people, writer, libraryManager, options.SaveImagePathsInNfo);
 
             if (item is BoxSet folder)
             {
@@ -828,7 +827,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             return url.Replace(YouTubeWatchUrl, "plugin://plugin.video.youtube/?action=play_video&videoid=", StringComparison.OrdinalIgnoreCase);
         }
 
-        private void AddImages(BaseItem item, XmlWriter writer, ILibraryManager libraryManager, IServerConfigurationManager config)
+        private void AddImages(BaseItem item, XmlWriter writer, ILibraryManager libraryManager)
         {
             writer.WriteStartElement("art");
 
@@ -836,12 +835,12 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
             if (image != null)
             {
-                writer.WriteElementString("poster", GetImagePathToSave(image, libraryManager, config));
+                writer.WriteElementString("poster", GetImagePathToSave(image, libraryManager));
             }
 
             foreach (var backdrop in item.GetImages(ImageType.Backdrop))
             {
-                writer.WriteElementString("fanart", GetImagePathToSave(backdrop, libraryManager, config));
+                writer.WriteElementString("fanart", GetImagePathToSave(backdrop, libraryManager));
             }
 
             writer.WriteEndElement();
@@ -893,7 +892,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 {
                     writer.WriteElementString(
                         "lastplayed",
-                        userdata.LastPlayedDate.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss").ToLowerInvariant());
+                        userdata.LastPlayedDate.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture).ToLowerInvariant());
                 }
 
                 writer.WriteStartElement("resume");
@@ -911,7 +910,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             writer.WriteEndElement();
         }
 
-        private void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, IFileSystem fileSystem, IServerConfigurationManager config, bool saveImagePath)
+        private void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, bool saveImagePath)
         {
             foreach (var person in people)
             {
@@ -953,7 +952,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                     {
                         writer.WriteElementString(
                             "thumb",
-                            GetImagePathToSave(image, libraryManager, config));
+                            GetImagePathToSave(image, libraryManager));
                     }
                 }
 
@@ -961,7 +960,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
         }
 
-        private string GetImagePathToSave(ItemImageInfo image, ILibraryManager libraryManager, IServerConfigurationManager config)
+        private string GetImagePathToSave(ItemImageInfo image, ILibraryManager libraryManager)
         {
             if (!image.IsLocalFile)
             {
diff --git a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
index 091c1957e..ac2fbb8d2 100644
--- a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
@@ -12,15 +12,33 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Savers
 {
+    /// <summary>
+    /// Nfo saver for episodes.
+    /// </summary>
     public class EpisodeNfoSaver : BaseNfoSaver
     {
-        public EpisodeNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EpisodeNfoSaver"/> class.
+        /// </summary>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="configurationManager">the server configuration manager.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="userDataManager">The user data manager.</param>
+        /// <param name="logger">The logger.</param>
+        public EpisodeNfoSaver(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IUserDataManager userDataManager,
+            ILogger<EpisodeNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
 
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
         /// <inheritdoc />
         protected override string GetLocalSavePath(BaseItem item)
             => Path.ChangeExtension(item.Path, ".nfo");
@@ -57,7 +75,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             {
                 var formatString = ConfigurationManager.GetNfoConfiguration().ReleaseDateFormat;
 
-                writer.WriteElementString("aired", episode.PremiereDate.Value.ToLocalTime().ToString(formatString));
+                writer.WriteElementString("aired", episode.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
             }
 
             if (!episode.ParentIndexNumber.HasValue || episode.ParentIndexNumber.Value == 0)
diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
index 08a752e33..eef989a5b 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
@@ -14,9 +14,27 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Savers
 {
+    /// <summary>
+    /// Nfo saver for movies.
+    /// </summary>
     public class MovieNfoSaver : BaseNfoSaver
     {
-        public MovieNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovieNfoSaver"/> class.
+        /// </summary>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="configurationManager">the server configuration manager.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="userDataManager">The user data manager.</param>
+        /// <param name="logger">The logger.</param>
+        public MovieNfoSaver(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IUserDataManager userDataManager,
+            ILogger<MovieNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
@@ -25,7 +43,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
         protected override string GetLocalSavePath(BaseItem item)
             => GetMovieSavePaths(new ItemInfo(item)).FirstOrDefault();
 
-        public static IEnumerable<string> GetMovieSavePaths(ItemInfo item)
+        internal static IEnumerable<string> GetMovieSavePaths(ItemInfo item)
         {
             if (item.VideoType == VideoType.Dvd && !item.IsPlaceHolder)
             {
@@ -42,13 +60,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
             else
             {
-                // http://kodi.wiki/view/NFO_files/Movies
-                // movie.nfo will override all and any .nfo files in the same folder as the media files if you use the "Use foldernames for lookups" setting. If you don't, then moviename.nfo is used
-                //if (!item.IsInMixedFolder && item.ItemType == typeof(Movie))
-                //{
-                //    list.Add(Path.Combine(item.ContainingFolderPath, "movie.nfo"));
-                //}
-
                 yield return Path.ChangeExtension(item.Path, ".nfo");
 
                 if (!item.IsInMixedFolder)
@@ -95,6 +106,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 {
                     writer.WriteElementString("artist", artist);
                 }
+
                 if (!string.IsNullOrEmpty(musicVideo.Album))
                 {
                     writer.WriteElementString("album", musicVideo.Album);
diff --git a/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
index 25695121d..925a230bd 100644
--- a/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
@@ -11,15 +11,27 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Savers
 {
+    /// <summary>
+    /// Nfo saver for seasons.
+    /// </summary>
     public class SeasonNfoSaver : BaseNfoSaver
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeasonNfoSaver"/> class.
+        /// </summary>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="configurationManager">the server configuration manager.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="userDataManager">The user data manager.</param>
+        /// <param name="logger">The logger.</param>
         public SeasonNfoSaver(
             IFileSystem fileSystem,
             IServerConfigurationManager configurationManager,
             ILibraryManager libraryManager,
             IUserManager userManager,
             IUserDataManager userDataManager,
-            ILogger logger)
+            ILogger<SeasonNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
index 8d7faece7..d011b32df 100644
--- a/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
@@ -12,8 +12,20 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.XbmcMetadata.Savers
 {
+    /// <summary>
+    /// Nfo saver for series.
+    /// </summary>
     public class SeriesNfoSaver : BaseNfoSaver
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeriesNfoSaver"/> class.
+        /// </summary>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="configurationManager">the server configuration manager.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="userDataManager">The user data manager.</param>
+        /// <param name="logger">The logger.</param>
         public SeriesNfoSaver(
             IFileSystem fileSystem,
             IServerConfigurationManager configurationManager,
@@ -56,7 +68,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                     : language;
 
                 writer.WriteStartElement("url");
-                writer.WriteAttributeString("cache", string.Format("{0}.xml", tvdb));
+                writer.WriteAttributeString("cache", tvdb + ".xml");
                 writer.WriteString(
                     string.Format(
                         CultureInfo.InvariantCulture,
diff --git a/jellyfin.ruleset b/jellyfin.ruleset
index 92b7a03fd..a4f196a5e 100644
--- a/jellyfin.ruleset
+++ b/jellyfin.ruleset
@@ -5,6 +5,8 @@
     <Rule Id="SA1202" Action="Info" />
     <!-- disable warning SA1204: Static members must appear before non-static members -->
     <Rule Id="SA1204" Action="Info" />
+        <!-- disable warning SA1404: Code analysis suppression should have justification -->
+    <Rule Id="SA1404" Action="Info" />
 
     <!-- disable warning SA1009: Closing parenthesis should be followed by a space. -->
     <Rule Id="SA1009" Action="None" />
@@ -26,6 +28,8 @@
     <Rule Id="SA1512" Action="None" />
     <!-- disable warning SA1515: Single-line comment should be preceded by blank line -->
     <Rule Id="SA1515" Action="None" />
+    <!-- disable warning SA1600: Elements should be documented -->
+    <Rule Id="SA1600" Action="None" />
     <!-- disable warning SA1633: The file header is missing or not located at the top of the file -->
     <Rule Id="SA1633" Action="None" />
   </Rules>
-- 
cgit v1.2.3


From 41a26f8ecd63b6e475e058e9ecd8186668095184 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 1 Mar 2020 18:28:02 +0100
Subject: Correctly resolve playlists that are stored using a directory path

---
 .../Library/Resolvers/PlaylistResolver.cs          | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
index 5e672f221..32f5114da 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Playlists;
+using MediaBrowser.LocalMetadata.Savers;
 using MediaBrowser.Model.Entities;
 
 namespace Emby.Server.Implementations.Library.Resolvers
@@ -30,19 +31,28 @@ namespace Emby.Server.Implementations.Library.Resolvers
             // Contains [playlist] in the path
             if (args.IsDirectory)
             {
-                var filename = Path.GetFileName(args.Path);
-
-                if (string.IsNullOrEmpty(filename))
+                // It's a boxset if the path is a directory with [playlist] in it's the name
+                // TODO: Should this use Path.GetDirectoryName() instead?
+                bool isBoxSet = Path.GetFileName(args.Path)
+                    ?.Contains("[playlist]", StringComparison.OrdinalIgnoreCase)
+                    ?? false;
+                if (isBoxSet)
                 {
-                    return null;
+                    return new Playlist
+                    {
+                        Path = args.Path,
+                        Name = Path.GetFileName(args.Path).Replace("[playlist]", string.Empty, StringComparison.OrdinalIgnoreCase).Trim()
+                    };
                 }
 
-                if (filename.IndexOf("[playlist]", StringComparison.OrdinalIgnoreCase) != -1)
+                // It's a directory-based playlist if the directory contains a playlist file
+                var filePaths = Directory.EnumerateFiles(args.Path);
+                if (filePaths.Any(f => f.EndsWith(PlaylistXmlSaver.DefaultPlaylistFilename, StringComparison.OrdinalIgnoreCase)))
                 {
                     return new Playlist
                     {
                         Path = args.Path,
-                        Name = Path.GetFileName(args.Path).Replace("[playlist]", string.Empty, StringComparison.OrdinalIgnoreCase).Trim()
+                        Name = Path.GetFileName(args.Path)
                     };
                 }
             }
-- 
cgit v1.2.3


From 12048186984ec621c75781a5d81bf454b0f3ac0d Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 1 Mar 2020 18:28:19 +0100
Subject: Clean up and document PlaylistResolver

---
 .../Library/Resolvers/PlaylistResolver.cs          | 41 +++++++++-------------
 1 file changed, 17 insertions(+), 24 deletions(-)

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

diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
index 32f5114da..fa6d57466 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
@@ -1,34 +1,27 @@
-#pragma warning disable CS1591
-#pragma warning disable SA1600
-
 using System;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.LocalMetadata.Savers;
 using MediaBrowser.Model.Entities;
 
 namespace Emby.Server.Implementations.Library.Resolvers
 {
+    /// <summary>
+    /// <see cref="IItemResolver"/> for <see cref="Playlist"/> library items.
+    /// </summary>
     public class PlaylistResolver : FolderResolver<Playlist>
     {
-        private string[] SupportedCollectionTypes = new string[] {
-
+        private string[] _musicPlaylistCollectionTypes = new string[] {
             string.Empty,
             CollectionType.Music
         };
 
-        /// <summary>
-        /// Resolves the specified args.
-        /// </summary>
-        /// <param name="args">The args.</param>
-        /// <returns>BoxSet.</returns>
+        /// <inheritdoc/>
         protected override Playlist Resolve(ItemResolveArgs args)
         {
-            // It's a boxset if all of the following conditions are met:
-            // Is a Directory
-            // Contains [playlist] in the path
             if (args.IsDirectory)
             {
                 // It's a boxset if the path is a directory with [playlist] in it's the name
@@ -56,20 +49,20 @@ namespace Emby.Server.Implementations.Library.Resolvers
                     };
                 }
             }
-            else
+
+            // Check if this is a music playlist file
+            // It should have the correct collection type and a supported file extension
+            else if (_musicPlaylistCollectionTypes.Contains(args.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase))
             {
-                if (SupportedCollectionTypes.Contains(args.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                var extension = Path.GetExtension(args.Path);
+                if (Playlist.SupportedExtensions.Contains(extension ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 {
-                    var extension = Path.GetExtension(args.Path);
-                    if (Playlist.SupportedExtensions.Contains(extension ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                    return new Playlist
                     {
-                        return new Playlist
-                        {
-                            Path = args.Path,
-                            Name = Path.GetFileNameWithoutExtension(args.Path),
-                            IsInMixedFolder = true
-                        };
-                    }
+                        Path = args.Path,
+                        Name = Path.GetFileNameWithoutExtension(args.Path),
+                        IsInMixedFolder = true
+                    };
                 }
             }
 
-- 
cgit v1.2.3


From b67e9cde8c2fa17d2bef5c7c81a6507195a7c1ff Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Tue, 3 Mar 2020 23:07:10 +0100
Subject: Replace ILogger with ILogger<T> wherever possible

Log entries will contain additional class context when using this interface
---
 Emby.Dlna/ConnectionManager/ConnectionManager.cs      |  6 +++++-
 Emby.Dlna/ContentDirectory/ContentDirectory.cs        |  2 +-
 Emby.Dlna/Main/DlnaEntryPoint.cs                      | 19 ++++++++++++++-----
 .../MediaReceiverRegistrar/MediaReceiverRegistrar.cs  |  5 ++++-
 Emby.Dlna/Service/BaseService.cs                      |  2 +-
 .../Channels/RefreshChannelsScheduledTask.cs          |  6 +++++-
 .../Collections/CollectionManager.cs                  |  5 ++++-
 .../Data/CleanDatabaseScheduledTask.cs                |  2 +-
 Emby.Server.Implementations/Devices/DeviceManager.cs  |  5 ++++-
 .../EntryPoints/LibraryChangedNotifier.cs             |  7 ++++++-
 .../EntryPoints/RecordingNotifier.cs                  |  6 +++++-
 .../Library/Resolvers/Audio/MusicArtistResolver.cs    |  6 +++++-
 .../Library/Resolvers/TV/SeasonResolver.cs            |  6 +++++-
 .../Library/Resolvers/TV/SeriesResolver.cs            |  2 +-
 .../Library/Validators/ArtistsPostScanTask.cs         |  5 ++++-
 .../Library/Validators/GenresPostScanTask.cs          |  5 ++++-
 .../Library/Validators/MusicGenresPostScanTask.cs     |  5 ++++-
 .../Library/Validators/StudiosPostScanTask.cs         |  5 ++++-
 Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs   |  2 +-
 .../LiveTv/Listings/SchedulesDirect.cs                |  6 +++++-
 .../LiveTv/Listings/XmlTvListingsProvider.cs          |  2 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs      |  2 +-
 .../Playlists/PlaylistManager.cs                      |  4 ++--
 .../ScheduledTasks/Tasks/DeleteCacheFileTask.cs       |  5 ++++-
 .../ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs   |  5 ++++-
 .../ScheduledTasks/Tasks/PluginUpdateTask.cs          |  2 +-
 MediaBrowser.Api/ApiEntryPoint.cs                     |  2 +-
 .../ScheduledTasks/ScheduledTasksWebSocketListener.cs |  2 +-
 .../Sessions/SessionInfoWebSocketListener.cs          |  2 +-
 .../System/ActivityLogWebSocketListener.cs            |  2 +-
 MediaBrowser.Controller/Library/Profiler.cs           |  2 +-
 .../Providers/BoxSetXmlProvider.cs                    |  2 +-
 .../Providers/PlaylistXmlProvider.cs                  |  5 ++++-
 MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs   |  2 +-
 MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs |  2 +-
 MediaBrowser.Model/Dlna/StreamBuilder.cs              |  2 +-
 .../Books/AudioBookMetadataService.cs                 |  2 +-
 MediaBrowser.Providers/Books/BookMetadataService.cs   |  2 +-
 .../BoxSets/BoxSetMetadataService.cs                  |  2 +-
 .../Channels/ChannelMetadataService.cs                |  2 +-
 .../Folders/CollectionFolderMetadataService.cs        |  2 +-
 .../Folders/FolderMetadataService.cs                  |  2 +-
 .../Folders/UserViewMetadataService.cs                |  2 +-
 MediaBrowser.Providers/Genres/GenreMetadataService.cs |  2 +-
 .../LiveTv/ProgramMetadataService.cs                  |  2 +-
 MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs   | 19 ++++++++++++++++++-
 .../MediaInfo/SubtitleScheduledTask.cs                |  8 +++++++-
 .../MediaInfo/VideoImageProvider.cs                   |  2 +-
 MediaBrowser.Providers/Movies/MovieMetadataService.cs |  2 +-
 .../Movies/TrailerMetadataService.cs                  |  2 +-
 MediaBrowser.Providers/Music/AlbumMetadataService.cs  |  2 +-
 MediaBrowser.Providers/Music/ArtistMetadataService.cs |  2 +-
 MediaBrowser.Providers/Music/AudioMetadataService.cs  |  2 +-
 .../Music/MusicVideoMetadataService.cs                |  2 +-
 .../MusicGenres/MusicGenreMetadataService.cs          |  2 +-
 .../People/PersonMetadataService.cs                   |  2 +-
 .../Photos/PhotoAlbumMetadataService.cs               |  2 +-
 MediaBrowser.Providers/Photos/PhotoMetadataService.cs |  2 +-
 .../Playlists/PlaylistItemsProvider.cs                |  2 +-
 .../Playlists/PlaylistMetadataService.cs              |  2 +-
 .../Plugins/MusicBrainz/AlbumProvider.cs              |  2 +-
 .../Studios/StudioMetadataService.cs                  |  2 +-
 MediaBrowser.Providers/TV/EpisodeMetadataService.cs   |  2 +-
 MediaBrowser.Providers/TV/SeasonMetadataService.cs    |  2 +-
 MediaBrowser.Providers/TV/SeriesMetadataService.cs    |  2 +-
 .../Tmdb/BoxSets/TmdbBoxSetProvider.cs                |  9 ++++++++-
 .../Tmdb/Movies/TmdbMovieProvider.cs                  | 10 +++++++++-
 .../Tmdb/People/TmdbPersonProvider.cs                 |  7 ++++++-
 MediaBrowser.Providers/Tmdb/TV/TmdbSeriesProvider.cs  |  9 ++++++++-
 MediaBrowser.Providers/Users/UserMetadataService.cs   |  2 +-
 MediaBrowser.Providers/Videos/VideoMetadataService.cs |  2 +-
 MediaBrowser.Providers/Years/YearMetadataService.cs   |  2 +-
 MediaBrowser.WebDashboard/Api/DashboardService.cs     |  2 +-
 MediaBrowser.XbmcMetadata/EntryPoint.cs               |  2 +-
 .../Providers/AlbumNfoProvider.cs                     |  6 +++++-
 .../Providers/ArtistNfoProvider.cs                    |  6 +++++-
 .../Providers/EpisodeNfoProvider.cs                   |  6 +++++-
 .../Providers/MovieNfoProvider.cs                     | 18 +++++++++++++++---
 .../Providers/SeasonNfoProvider.cs                    |  6 +++++-
 .../Providers/SeriesNfoProvider.cs                    |  6 +++++-
 MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs     |  2 +-
 MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs    |  8 +++++++-
 MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs   |  8 +++++++-
 MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs     |  8 +++++++-
 MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs    |  2 +-
 MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs    |  2 +-
 86 files changed, 261 insertions(+), 93 deletions(-)

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

diff --git a/Emby.Dlna/ConnectionManager/ConnectionManager.cs b/Emby.Dlna/ConnectionManager/ConnectionManager.cs
index 365249c54..245c03adc 100644
--- a/Emby.Dlna/ConnectionManager/ConnectionManager.cs
+++ b/Emby.Dlna/ConnectionManager/ConnectionManager.cs
@@ -16,7 +16,11 @@ namespace Emby.Dlna.ConnectionManager
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
 
-        public ConnectionManager(IDlnaManager dlna, IServerConfigurationManager config, ILogger logger, IHttpClient httpClient)
+        public ConnectionManager(
+            IDlnaManager dlna,
+            IServerConfigurationManager config,
+            ILogger<ConnectionManager> logger,
+            IHttpClient httpClient)
             : base(logger, httpClient)
         {
             _dlna = dlna;
diff --git a/Emby.Dlna/ContentDirectory/ContentDirectory.cs b/Emby.Dlna/ContentDirectory/ContentDirectory.cs
index 523430e43..c89cd1f93 100644
--- a/Emby.Dlna/ContentDirectory/ContentDirectory.cs
+++ b/Emby.Dlna/ContentDirectory/ContentDirectory.cs
@@ -38,7 +38,7 @@ namespace Emby.Dlna.ContentDirectory
             ILibraryManager libraryManager,
             IServerConfigurationManager config,
             IUserManager userManager,
-            ILogger logger,
+            ILogger<ContentDirectory> logger,
             IHttpClient httpClient,
             ILocalizationManager localization,
             IMediaSourceManager mediaSourceManager,
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index 1ee4151e4..75b07efc4 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -2,8 +2,8 @@
 #pragma warning disable SA1600
 
 using System;
-using System.Net.Sockets;
 using System.Globalization;
+using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Dlna.PlayTo;
@@ -27,7 +27,7 @@ using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
 using Rssdp;
 using Rssdp.Infrastructure;
-using OperatingSystem =  MediaBrowser.Common.System.OperatingSystem;
+using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;
 
 namespace Emby.Dlna.Main
 {
@@ -59,7 +59,9 @@ namespace Emby.Dlna.Main
         private ISsdpCommunicationsServer _communicationsServer;
 
         internal IContentDirectory ContentDirectory { get; private set; }
+
         internal IConnectionManager ConnectionManager { get; private set; }
+
         internal IMediaReceiverRegistrar MediaReceiverRegistrar { get; private set; }
 
         public static DlnaEntryPoint Current;
@@ -107,7 +109,7 @@ namespace Emby.Dlna.Main
                 libraryManager,
                 config,
                 userManager,
-                _logger,
+                loggerFactory.CreateLogger<ContentDirectory.ContentDirectory>(),
                 httpClient,
                 localizationManager,
                 mediaSourceManager,
@@ -115,9 +117,16 @@ namespace Emby.Dlna.Main
                 mediaEncoder,
                 tvSeriesManager);
 
-            ConnectionManager = new ConnectionManager.ConnectionManager(dlnaManager, config, _logger, httpClient);
+            ConnectionManager = new ConnectionManager.ConnectionManager(
+                dlnaManager,
+                config,
+                loggerFactory.CreateLogger<ConnectionManager.ConnectionManager>(),
+                httpClient);
 
-            MediaReceiverRegistrar = new MediaReceiverRegistrar.MediaReceiverRegistrar(_logger, httpClient, config);
+            MediaReceiverRegistrar = new MediaReceiverRegistrar.MediaReceiverRegistrar(
+                loggerFactory.CreateLogger<MediaReceiverRegistrar.MediaReceiverRegistrar>(),
+                httpClient,
+                config);
             Current = this;
         }
 
diff --git a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
index e2d48bc01..8c52d32f1 100644
--- a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
+++ b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
@@ -13,7 +13,10 @@ namespace Emby.Dlna.MediaReceiverRegistrar
     {
         private readonly IServerConfigurationManager _config;
 
-        public MediaReceiverRegistrar(ILogger logger, IHttpClient httpClient, IServerConfigurationManager config)
+        public MediaReceiverRegistrar(
+            ILogger<MediaReceiverRegistrar> logger,
+            IHttpClient httpClient,
+            IServerConfigurationManager config)
             : base(logger, httpClient)
         {
             _config = config;
diff --git a/Emby.Dlna/Service/BaseService.cs b/Emby.Dlna/Service/BaseService.cs
index d7e5c541d..c8f68b647 100644
--- a/Emby.Dlna/Service/BaseService.cs
+++ b/Emby.Dlna/Service/BaseService.cs
@@ -13,7 +13,7 @@ namespace Emby.Dlna.Service
         protected IHttpClient HttpClient;
         protected ILogger Logger;
 
-        protected BaseService(ILogger logger, IHttpClient httpClient)
+        protected BaseService(ILogger<BaseService> logger, IHttpClient httpClient)
         {
             Logger = logger;
             HttpClient = httpClient;
diff --git a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index 03e6abcfb..91d72d930 100644
--- a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -20,7 +20,11 @@ namespace Emby.Server.Implementations.Channels
         private readonly ILogger _logger;
         private readonly ILibraryManager _libraryManager;
 
-        public RefreshChannelsScheduledTask(IChannelManager channelManager, IUserManager userManager, ILogger logger, ILibraryManager libraryManager)
+        public RefreshChannelsScheduledTask(
+            IChannelManager channelManager,
+            IUserManager userManager,
+            ILogger<RefreshChannelsScheduledTask> logger,
+            ILibraryManager libraryManager)
         {
             _channelManager = channelManager;
             _userManager = userManager;
diff --git a/Emby.Server.Implementations/Collections/CollectionManager.cs b/Emby.Server.Implementations/Collections/CollectionManager.cs
index efdef8481..1d477094c 100644
--- a/Emby.Server.Implementations/Collections/CollectionManager.cs
+++ b/Emby.Server.Implementations/Collections/CollectionManager.cs
@@ -348,7 +348,10 @@ namespace Emby.Server.Implementations.Collections
         private readonly IServerConfigurationManager _config;
         private readonly ILogger _logger;
 
-        public CollectionManagerEntryPoint(ICollectionManager collectionManager, IServerConfigurationManager config, ILogger logger)
+        public CollectionManagerEntryPoint(
+            ICollectionManager collectionManager,
+            IServerConfigurationManager config,
+            ILogger<CollectionManagerEntryPoint> logger)
         {
             _collectionManager = (CollectionManager)collectionManager;
             _config = config;
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index 8a5387e9b..f51dfb725 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -15,7 +15,7 @@ namespace Emby.Server.Implementations.Data
         private readonly ILibraryManager _libraryManager;
         private readonly ILogger _logger;
 
-        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, ILogger logger)
+        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, ILogger<CleanDatabaseScheduledTask> logger)
         {
             _libraryManager = libraryManager;
             _logger = logger;
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index 4f8f9f23b..9ac6a1d5e 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -407,7 +407,10 @@ namespace Emby.Server.Implementations.Devices
         private readonly IServerConfigurationManager _config;
         private ILogger _logger;
 
-        public DeviceManagerEntryPoint(IDeviceManager deviceManager, IServerConfigurationManager config, ILogger logger)
+        public DeviceManagerEntryPoint(
+            IDeviceManager deviceManager,
+            IServerConfigurationManager config,
+            ILogger<DeviceManagerEntryPoint> logger)
         {
             _deviceManager = (DeviceManager)deviceManager;
             _config = config;
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index 06458baed..b31023cdb 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -56,7 +56,12 @@ namespace Emby.Server.Implementations.EntryPoints
 
         private readonly IProviderManager _providerManager;
 
-        public LibraryChangedNotifier(ILibraryManager libraryManager, ISessionManager sessionManager, IUserManager userManager, ILogger logger, IProviderManager providerManager)
+        public LibraryChangedNotifier(
+            ILibraryManager libraryManager,
+            ISessionManager sessionManager,
+            IUserManager userManager,
+            ILogger<LibraryChangedNotifier> logger,
+            IProviderManager providerManager)
         {
             _libraryManager = libraryManager;
             _sessionManager = sessionManager;
diff --git a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
index 9603d7976..eb86ea464 100644
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -20,7 +20,11 @@ namespace Emby.Server.Implementations.EntryPoints
         private readonly IUserManager _userManager;
         private readonly ILogger _logger;
 
-        public RecordingNotifier(ISessionManager sessionManager, IUserManager userManager, ILogger logger, ILiveTvManager liveTvManager)
+        public RecordingNotifier(
+            ISessionManager sessionManager,
+            IUserManager userManager,
+            ILogger<RecordingNotifier> logger,
+            ILiveTvManager liveTvManager)
         {
             _sessionManager = sessionManager;
             _userManager = userManager;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index 013fdbf13..681db4896 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -27,7 +27,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         /// <param name="fileSystem">The file system.</param>
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="config">The configuration manager.</param>
-        public MusicArtistResolver(ILogger logger, IFileSystem fileSystem, ILibraryManager libraryManager, IServerConfigurationManager config)
+        public MusicArtistResolver(
+            ILogger<MusicArtistResolver> logger,
+            IFileSystem fileSystem,
+            ILibraryManager libraryManager,
+            IServerConfigurationManager config)
         {
             _logger = logger;
             _fileSystem = fileSystem;
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index 3e88c0287..18145b7f1 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -25,7 +25,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="localization">The localization</param>
         /// <param name="logger">The logger</param>
-        public SeasonResolver(IServerConfigurationManager config, ILibraryManager libraryManager, ILocalizationManager localization, ILogger logger)
+        public SeasonResolver(
+            IServerConfigurationManager config,
+            ILibraryManager libraryManager,
+            ILocalizationManager localization,
+            ILogger<SeasonResolver> logger)
         {
             _config = config;
             _libraryManager = libraryManager;
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index b547fc8c9..f8c26c2e1 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -31,7 +31,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// <param name="fileSystem">The file system.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="libraryManager">The library manager.</param>
-        public SeriesResolver(IFileSystem fileSystem, ILogger logger, ILibraryManager libraryManager)
+        public SeriesResolver(IFileSystem fileSystem, ILogger<SeriesResolver> logger, ILibraryManager libraryManager)
         {
             _fileSystem = fileSystem;
             _logger = logger;
diff --git a/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
index 61a07d0d6..2af8ff5cb 100644
--- a/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
@@ -25,7 +25,10 @@ namespace Emby.Server.Implementations.Library.Validators
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="itemRepo">The item repository.</param>
-        public ArtistsPostScanTask(ILibraryManager libraryManager, ILogger logger, IItemRepository itemRepo)
+        public ArtistsPostScanTask(
+            ILibraryManager libraryManager,
+            ILogger<ArtistsPostScanTask> logger,
+            IItemRepository itemRepo)
         {
             _libraryManager = libraryManager;
             _logger = logger;
diff --git a/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs
index 06d1dd89d..251785dfd 100644
--- a/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs
@@ -25,7 +25,10 @@ namespace Emby.Server.Implementations.Library.Validators
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="itemRepo">The item repository.</param>
-        public GenresPostScanTask(ILibraryManager libraryManager, ILogger logger, IItemRepository itemRepo)
+        public GenresPostScanTask(
+            ILibraryManager libraryManager,
+            ILogger<GenresPostScanTask> logger,
+            IItemRepository itemRepo)
         {
             _libraryManager = libraryManager;
             _logger = logger;
diff --git a/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
index 58549e9d7..9d8690116 100644
--- a/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
@@ -25,7 +25,10 @@ namespace Emby.Server.Implementations.Library.Validators
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="itemRepo">The item repository.</param>
-        public MusicGenresPostScanTask(ILibraryManager libraryManager, ILogger logger, IItemRepository itemRepo)
+        public MusicGenresPostScanTask(
+            ILibraryManager libraryManager,
+            ILogger<MusicGenresPostScanTask> logger,
+            IItemRepository itemRepo)
         {
             _libraryManager = libraryManager;
             _logger = logger;
diff --git a/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
index 00899c336..2f8f906b9 100644
--- a/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
@@ -26,7 +26,10 @@ namespace Emby.Server.Implementations.Library.Validators
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="itemRepo">The item repository.</param>
-        public StudiosPostScanTask(ILibraryManager libraryManager, ILogger logger, IItemRepository itemRepo)
+        public StudiosPostScanTask(
+            ILibraryManager libraryManager,
+            ILogger<StudiosPostScanTask> logger,
+            IItemRepository itemRepo)
         {
             _libraryManager = libraryManager;
             _logger = logger;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 49d4ddbaf..bbef93b8c 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -80,7 +80,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             IServerApplicationHost appHost,
             IStreamHelper streamHelper,
             IMediaSourceManager mediaSourceManager,
-            ILogger logger,
+            ILogger<EmbyTV> logger,
             IJsonSerializer jsonSerializer,
             IHttpClient httpClient,
             IServerConfigurationManager config,
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 906f42d2e..e9d3105bf 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -33,7 +33,11 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
         private const string ApiUrl = "https://json.schedulesdirect.org/20141201";
 
-        public SchedulesDirect(ILogger logger, IJsonSerializer jsonSerializer, IHttpClient httpClient, IApplicationHost appHost)
+        public SchedulesDirect(
+            ILogger<SchedulesDirect> logger,
+            IJsonSerializer jsonSerializer,
+            IHttpClient httpClient,
+            IApplicationHost appHost)
         {
             _logger = logger;
             _jsonSerializer = jsonSerializer;
diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
index 42daa98f5..c159b60a9 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
@@ -34,7 +34,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         public XmlTvListingsProvider(
             IServerConfigurationManager config,
             IHttpClient httpClient,
-            ILogger logger,
+            ILogger<XmlTvListingsProvider> logger,
             IFileSystem fileSystem,
             IZipClient zipClient)
         {
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index e5cb6c7b9..a2d972d19 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -39,7 +39,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
         public HdHomerunHost(
             IServerConfigurationManager config,
-            ILogger logger,
+            ILogger<HdHomerunHost> logger,
             IJsonSerializer jsonSerializer,
             IFileSystem fileSystem,
             IHttpClient httpClient,
diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index b26f4026c..ad7a5005e 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -33,14 +33,14 @@ namespace Emby.Server.Implementations.Playlists
             ILibraryManager libraryManager,
             IFileSystem fileSystem,
             ILibraryMonitor iLibraryMonitor,
-            ILoggerFactory loggerFactory,
+            ILogger<PlaylistManager> logger,
             IUserManager userManager,
             IProviderManager providerManager)
         {
             _libraryManager = libraryManager;
             _fileSystem = fileSystem;
             _iLibraryMonitor = iLibraryMonitor;
-            _logger = loggerFactory.CreateLogger(nameof(PlaylistManager));
+            _logger = logger;
             _userManager = userManager;
             _providerManager = providerManager;
         }
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index b55a59f05..b7668c872 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -29,7 +29,10 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// <summary>
         /// Initializes a new instance of the <see cref="DeleteCacheFileTask" /> class.
         /// </summary>
-        public DeleteCacheFileTask(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem)
+        public DeleteCacheFileTask(
+            IApplicationPaths appPaths,
+            ILogger<DeleteCacheFileTask> logger,
+            IFileSystem fileSystem)
         {
             ApplicationPaths = appPaths;
             _logger = logger;
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
index 9ff490f18..37136f438 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
@@ -23,7 +23,10 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// <summary>
         /// Initializes a new instance of the <see cref="DeleteTranscodeFileTask" /> class.
         /// </summary>
-        public DeleteTranscodeFileTask(ILogger logger, IFileSystem fileSystem, IConfigurationManager configurationManager)
+        public DeleteTranscodeFileTask(
+            ILogger<DeleteTranscodeFileTask> logger,
+            IFileSystem fileSystem,
+            IConfigurationManager configurationManager)
         {
             _logger = logger;
             _fileSystem = fileSystem;
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
index 992b77c25..9d87316e4 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
@@ -23,7 +23,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
 
         private readonly IInstallationManager _installationManager;
 
-        public PluginUpdateTask(ILogger logger, IInstallationManager installationManager)
+        public PluginUpdateTask(ILogger<PluginUpdateTask> logger, IInstallationManager installationManager)
         {
             _logger = logger;
             _installationManager = installationManager;
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 7d3546eb7..4bd13df00 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.Api
         /// <param name="fileSystem">The file system.</param>
         /// <param name="mediaSourceManager">The media source manager.</param>
         public ApiEntryPoint(
-            ILogger logger,
+            ILogger<ApiEntryPoint> logger,
             ISessionManager sessionManager,
             IServerConfigurationManager config,
             IFileSystem fileSystem,
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index d9530ffb7..14b9b3618 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -28,7 +28,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// <summary>
         /// Initializes a new instance of the <see cref="ScheduledTasksWebSocketListener" /> class.
         /// </summary>
-        public ScheduledTasksWebSocketListener(ILogger logger, ITaskManager taskManager)
+        public ScheduledTasksWebSocketListener(ILogger<ScheduledTasksWebSocketListener> logger, ITaskManager taskManager)
             : base(logger)
         {
             TaskManager = taskManager;
diff --git a/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
index 051d09850..d882aac88 100644
--- a/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
@@ -26,7 +26,7 @@ namespace MediaBrowser.Api.Sessions
         /// <summary>
         /// Initializes a new instance of the <see cref="SessionInfoWebSocketListener"/> class.
         /// </summary>
-        public SessionInfoWebSocketListener(ILogger logger, ISessionManager sessionManager)
+        public SessionInfoWebSocketListener(ILogger<SessionInfoWebSocketListener> logger, ISessionManager sessionManager)
             : base(logger)
         {
             _sessionManager = sessionManager;
diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
index 4b6a22b7d..f8b6ee65d 100644
--- a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
+++ b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Api.System
         /// </summary>
         private readonly IActivityManager _activityManager;
 
-        public ActivityLogWebSocketListener(ILogger logger, IActivityManager activityManager) : base(logger)
+        public ActivityLogWebSocketListener(ILogger<ActivityLogWebSocketListener> logger, IActivityManager activityManager) : base(logger)
         {
             _activityManager = activityManager;
             _activityManager.EntryCreated += _activityManager_EntryCreated;
diff --git a/MediaBrowser.Controller/Library/Profiler.cs b/MediaBrowser.Controller/Library/Profiler.cs
index 9fe175a7c..46a97d181 100644
--- a/MediaBrowser.Controller/Library/Profiler.cs
+++ b/MediaBrowser.Controller/Library/Profiler.cs
@@ -28,7 +28,7 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="logger">The logger.</param>
-        public Profiler(string name, ILogger logger)
+        public Profiler(string name, ILogger<Profiler> logger)
         {
             this._name = name;
 
diff --git a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
index 2e303efab..b2e3bc9e2 100644
--- a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.LocalMetadata.Providers
         private readonly ILogger _logger;
         private readonly IProviderManager _providerManager;
 
-        public BoxSetXmlProvider(IFileSystem fileSystem, ILogger logger, IProviderManager providerManager)
+        public BoxSetXmlProvider(IFileSystem fileSystem, ILogger<BoxSetXmlProvider> logger, IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
index d111ae9ba..df8107bad 100644
--- a/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
@@ -13,7 +13,10 @@ namespace MediaBrowser.LocalMetadata.Providers
         private readonly ILogger _logger;
         private readonly IProviderManager _providerManager;
 
-        public PlaylistXmlProvider(IFileSystem fileSystem, ILogger logger, IProviderManager providerManager)
+        public PlaylistXmlProvider(
+            IFileSystem fileSystem,
+            ILogger<PlaylistXmlProvider> logger,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs
index ea939e33b..1dc09bf18 100644
--- a/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs
@@ -30,7 +30,7 @@ namespace MediaBrowser.LocalMetadata.Savers
             return Path.Combine(item.Path, "collection.xml");
         }
 
-        public BoxSetXmlSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        public BoxSetXmlSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger<BoxSetXmlSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
index 1a661edef..bbb0a3501 100644
--- a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.LocalMetadata.Savers
             return Path.Combine(path, DefaultPlaylistFilename);
         }
 
-        public PlaylistXmlSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        public PlaylistXmlSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger<PlaylistXmlSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index a1838acf3..1a1977e6e 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Model.Dlna
             _logger = logger;
         }
 
-        public StreamBuilder(ILogger logger)
+        public StreamBuilder(ILogger<StreamBuilder> logger)
             : this(new FullTranscoderSupport(), logger)
         {
         }
diff --git a/MediaBrowser.Providers/Books/AudioBookMetadataService.cs b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
index 309241bfa..8eaeeea08 100644
--- a/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
+++ b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Books
     {
         public AudioBookMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<AudioBookMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Books/BookMetadataService.cs b/MediaBrowser.Providers/Books/BookMetadataService.cs
index 9d6a1ef59..340641711 100644
--- a/MediaBrowser.Providers/Books/BookMetadataService.cs
+++ b/MediaBrowser.Providers/Books/BookMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Books
     {
         public BookMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<BookMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
index 5bf01232c..3c9760ea7 100644
--- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
+++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Providers.BoxSets
     {
         public BoxSetMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<BoxSetMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Channels/ChannelMetadataService.cs b/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
index da41f208c..9afa82319 100644
--- a/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
+++ b/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Channels
     {
         public ChannelMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<ChannelMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs b/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs
index dd1b4709d..921222543 100644
--- a/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Folders
     {
         public CollectionFolderMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<CollectionFolderMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Folders/FolderMetadataService.cs b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
index 8409e03fd..b6bd2515d 100644
--- a/MediaBrowser.Providers/Folders/FolderMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Folders
     {
         public FolderMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<FolderMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
index 2ceb71afc..60ee81114 100644
--- a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Folders
     {
         public UserViewMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<UserViewMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Genres/GenreMetadataService.cs b/MediaBrowser.Providers/Genres/GenreMetadataService.cs
index 932eb368c..f3406c1ab 100644
--- a/MediaBrowser.Providers/Genres/GenreMetadataService.cs
+++ b/MediaBrowser.Providers/Genres/GenreMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Genres
     {
         public GenreMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<GenreMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs b/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs
index 13dd97215..7dd49c71a 100644
--- a/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs
+++ b/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.LiveTv
     {
         public LiveTvMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<LiveTvMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index 4e11fcbb2..db6e49634 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -121,7 +121,24 @@ namespace MediaBrowser.Providers.MediaInfo
         }
 
         private SubtitleResolver _subtitleResolver;
-        public FFProbeProvider(ILogger logger, IMediaSourceManager mediaSourceManager, IChannelManager channelManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IItemRepository itemRepo, IBlurayExaminer blurayExaminer, ILocalizationManager localization, IApplicationPaths appPaths, IJsonSerializer json, IEncodingManager encodingManager, IFileSystem fileSystem, IServerConfigurationManager config, ISubtitleManager subtitleManager, IChapterManager chapterManager, ILibraryManager libraryManager)
+
+        public FFProbeProvider(
+            ILogger<FFProbeProvider> logger,
+            IMediaSourceManager mediaSourceManager,
+            IChannelManager channelManager,
+            IIsoManager isoManager,
+            IMediaEncoder mediaEncoder,
+            IItemRepository itemRepo,
+            IBlurayExaminer blurayExaminer,
+            ILocalizationManager localization,
+            IApplicationPaths appPaths,
+            IJsonSerializer json,
+            IEncodingManager encodingManager,
+            IFileSystem fileSystem,
+            IServerConfigurationManager config,
+            ISubtitleManager subtitleManager,
+            IChapterManager chapterManager,
+            ILibraryManager libraryManager)
         {
             _logger = logger;
             _isoManager = isoManager;
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
index 74f41f9df..3a936632a 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
@@ -26,7 +26,13 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly ILogger _logger;
         private readonly IJsonSerializer _json;
 
-        public SubtitleScheduledTask(ILibraryManager libraryManager, IJsonSerializer json, IServerConfigurationManager config, ISubtitleManager subtitleManager, ILogger logger, IMediaSourceManager mediaSourceManager)
+        public SubtitleScheduledTask(
+            ILibraryManager libraryManager,
+            IJsonSerializer json,
+            IServerConfigurationManager config,
+            ISubtitleManager subtitleManager,
+            ILogger<SubtitleScheduledTask> logger,
+            IMediaSourceManager mediaSourceManager)
         {
             _libraryManager = libraryManager;
             _config = config;
diff --git a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
index 95b915b3d..f40570040 100644
--- a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
 
-        public VideoImageProvider(IMediaEncoder mediaEncoder, ILogger logger, IFileSystem fileSystem)
+        public VideoImageProvider(IMediaEncoder mediaEncoder, ILogger<VideoImageProvider> logger, IFileSystem fileSystem)
         {
             _mediaEncoder = mediaEncoder;
             _logger = logger;
diff --git a/MediaBrowser.Providers/Movies/MovieMetadataService.cs b/MediaBrowser.Providers/Movies/MovieMetadataService.cs
index c6cc5c7dc..1e2c325d9 100644
--- a/MediaBrowser.Providers/Movies/MovieMetadataService.cs
+++ b/MediaBrowser.Providers/Movies/MovieMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Movies
     {
         public MovieMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<MovieMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Movies/TrailerMetadataService.cs b/MediaBrowser.Providers/Movies/TrailerMetadataService.cs
index 53b556940..2e6f762b8 100644
--- a/MediaBrowser.Providers/Movies/TrailerMetadataService.cs
+++ b/MediaBrowser.Providers/Movies/TrailerMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Movies
     {
         public TrailerMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<TrailerMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
index 69133c1c1..ed6c01968 100644
--- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Providers.Music
     {
         public AlbumMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<AlbumMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 1f099c60f..f90a631c6 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.Music
     {
         public ArtistMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<ArtistMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Music/AudioMetadataService.cs b/MediaBrowser.Providers/Music/AudioMetadataService.cs
index 4d4739cef..e726fa1e2 100644
--- a/MediaBrowser.Providers/Music/AudioMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AudioMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Music
     {
         public AudioMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<AudioMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs b/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
index bbf0cd8db..d653e1063 100644
--- a/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
+++ b/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Music
     {
         public MusicVideoMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<MusicVideoMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs b/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs
index d74e91ad6..bb47de40b 100644
--- a/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs
+++ b/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.MusicGenres
     {
         public MusicGenreMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<MusicGenreMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/People/PersonMetadataService.cs b/MediaBrowser.Providers/People/PersonMetadataService.cs
index cdc3c77b7..804f3f3e3 100644
--- a/MediaBrowser.Providers/People/PersonMetadataService.cs
+++ b/MediaBrowser.Providers/People/PersonMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.People
     {
         public PersonMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<PersonMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs b/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs
index 845404dfb..af8f7a262 100644
--- a/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Photos
     {
         public PhotoAlbumMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<PhotoAlbumMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Photos/PhotoMetadataService.cs b/MediaBrowser.Providers/Photos/PhotoMetadataService.cs
index 5d6ff8814..579b5a4d0 100644
--- a/MediaBrowser.Providers/Photos/PhotoMetadataService.cs
+++ b/MediaBrowser.Providers/Photos/PhotoMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Photos
     {
         public PhotoMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<PhotoMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
index dacb63f84..ae837c591 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Providers.Playlists
         private ILogger _logger;
         private IFileSystem _fileSystem;
 
-        public PlaylistItemsProvider(IFileSystem fileSystem, ILogger logger)
+        public PlaylistItemsProvider(IFileSystem fileSystem, ILogger<PlaylistItemsProvider> logger)
         {
             _fileSystem = fileSystem;
             _logger = logger;
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index 32bd6c282..a41362ea3 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.Playlists
     {
         public PlaylistMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<PlaylistMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
index 748c23216..bc973dee5 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Providers.Music
         public MusicBrainzAlbumProvider(
             IHttpClient httpClient,
             IApplicationHost appHost,
-            ILogger logger)
+            ILogger<MusicBrainzAlbumProvider> logger)
         {
             _httpClient = httpClient;
             _appHost = appHost;
diff --git a/MediaBrowser.Providers/Studios/StudioMetadataService.cs b/MediaBrowser.Providers/Studios/StudioMetadataService.cs
index 6fa30c753..847e47f1b 100644
--- a/MediaBrowser.Providers/Studios/StudioMetadataService.cs
+++ b/MediaBrowser.Providers/Studios/StudioMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Studios
     {
         public StudioMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<StudioMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem, ILibraryManager libraryManager)
             : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager)
diff --git a/MediaBrowser.Providers/TV/EpisodeMetadataService.cs b/MediaBrowser.Providers/TV/EpisodeMetadataService.cs
index 89615f406..758c47ba0 100644
--- a/MediaBrowser.Providers/TV/EpisodeMetadataService.cs
+++ b/MediaBrowser.Providers/TV/EpisodeMetadataService.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.TV
     {
         public EpisodeMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<EpisodeMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/TV/SeasonMetadataService.cs b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
index 0672f886a..eb8032e0e 100644
--- a/MediaBrowser.Providers/TV/SeasonMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Providers.TV
     {
         public SeasonMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<SeasonMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/TV/SeriesMetadataService.cs b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
index e9e633ce7..7bc5a87d8 100644
--- a/MediaBrowser.Providers/TV/SeriesMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Providers.TV
 
         public SeriesMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<SeriesMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager,
diff --git a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetProvider.cs b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetProvider.cs
index a215177a9..dd3783ffb 100644
--- a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetProvider.cs
+++ b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetProvider.cs
@@ -37,7 +37,14 @@ namespace MediaBrowser.Providers.Tmdb.BoxSets
         private readonly IHttpClient _httpClient;
         private readonly ILibraryManager _libraryManager;
 
-        public TmdbBoxSetProvider(ILogger logger, IJsonSerializer json, IServerConfigurationManager config, IFileSystem fileSystem, ILocalizationManager localization, IHttpClient httpClient, ILibraryManager libraryManager)
+        public TmdbBoxSetProvider(
+            ILogger<TmdbBoxSetProvider> logger,
+            IJsonSerializer json,
+            IServerConfigurationManager config,
+            IFileSystem fileSystem,
+            ILocalizationManager localization,
+            IHttpClient httpClient,
+            ILibraryManager libraryManager)
         {
             _logger = logger;
             _json = json;
diff --git a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieProvider.cs
index 861847f71..fbb87d25d 100644
--- a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieProvider.cs
@@ -42,7 +42,15 @@ namespace MediaBrowser.Providers.Tmdb.Movies
 
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
-        public TmdbMovieProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILogger logger, ILocalizationManager localization, ILibraryManager libraryManager, IApplicationHost appHost)
+        public TmdbMovieProvider(
+            IJsonSerializer jsonSerializer,
+            IHttpClient httpClient,
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILogger<TmdbMovieProvider> logger,
+            ILocalizationManager localization,
+            ILibraryManager libraryManager,
+            IApplicationHost appHost)
         {
             _jsonSerializer = jsonSerializer;
             _httpClient = httpClient;
diff --git a/MediaBrowser.Providers/Tmdb/People/TmdbPersonProvider.cs b/MediaBrowser.Providers/Tmdb/People/TmdbPersonProvider.cs
index 50af9913a..588001169 100644
--- a/MediaBrowser.Providers/Tmdb/People/TmdbPersonProvider.cs
+++ b/MediaBrowser.Providers/Tmdb/People/TmdbPersonProvider.cs
@@ -37,7 +37,12 @@ namespace MediaBrowser.Providers.Tmdb.People
         private readonly IHttpClient _httpClient;
         private readonly ILogger _logger;
 
-        public TmdbPersonProvider(IFileSystem fileSystem, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogger logger)
+        public TmdbPersonProvider(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            IJsonSerializer jsonSerializer,
+            IHttpClient httpClient,
+            ILogger<TmdbPersonProvider> logger)
         {
             _fileSystem = fileSystem;
             _configurationManager = configurationManager;
diff --git a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesProvider.cs b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesProvider.cs
index 7dcb272d6..7195dc42a 100644
--- a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesProvider.cs
@@ -39,7 +39,14 @@ namespace MediaBrowser.Providers.Tmdb.TV
         private readonly IHttpClient _httpClient;
         private readonly ILibraryManager _libraryManager;
 
-        public TmdbSeriesProvider(IJsonSerializer jsonSerializer, IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILogger logger, ILocalizationManager localization, IHttpClient httpClient, ILibraryManager libraryManager)
+        public TmdbSeriesProvider(
+            IJsonSerializer jsonSerializer,
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILogger<TmdbSeriesProvider> logger,
+            ILocalizationManager localization,
+            IHttpClient httpClient,
+            ILibraryManager libraryManager)
         {
             _jsonSerializer = jsonSerializer;
             _fileSystem = fileSystem;
diff --git a/MediaBrowser.Providers/Users/UserMetadataService.cs b/MediaBrowser.Providers/Users/UserMetadataService.cs
index 9c2e27816..fb6c91b6c 100644
--- a/MediaBrowser.Providers/Users/UserMetadataService.cs
+++ b/MediaBrowser.Providers/Users/UserMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Users
     {
         public UserMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<UserMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Videos/VideoMetadataService.cs b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
index 996af0368..21378ada0 100644
--- a/MediaBrowser.Providers/Videos/VideoMetadataService.cs
+++ b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Videos
     {
         public VideoMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<VideoMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.Providers/Years/YearMetadataService.cs b/MediaBrowser.Providers/Years/YearMetadataService.cs
index 414795e35..2a0fa19ea 100644
--- a/MediaBrowser.Providers/Years/YearMetadataService.cs
+++ b/MediaBrowser.Providers/Years/YearMetadataService.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Years
     {
         public YearMetadataService(
             IServerConfigurationManager serverConfigurationManager,
-            ILogger logger,
+            ILogger<YearMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index a8768459a..9e0aae782 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -122,7 +122,7 @@ namespace MediaBrowser.WebDashboard.Api
             IResourceFileManager resourceFileManager,
             IServerConfigurationManager serverConfigurationManager,
             IFileSystem fileSystem,
-            ILogger logger,
+            ILogger<DashboardService> logger,
             IHttpResultFactory resultFactory)
         {
             _appHost = appHost;
diff --git a/MediaBrowser.XbmcMetadata/EntryPoint.cs b/MediaBrowser.XbmcMetadata/EntryPoint.cs
index fe4d50efa..f0a9e0ad2 100644
--- a/MediaBrowser.XbmcMetadata/EntryPoint.cs
+++ b/MediaBrowser.XbmcMetadata/EntryPoint.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.XbmcMetadata
 
         public EntryPoint(
             IUserDataManager userDataManager,
-            ILogger logger,
+            ILogger<EntryPoint> logger,
             IProviderManager providerManager,
             IConfigurationManager config)
         {
diff --git a/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
index 3517bc32c..c31df91e3 100644
--- a/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
@@ -15,7 +15,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public AlbumNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public AlbumNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<AlbumNfoProvider> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
index 03d8dbc7e..bc87a06d6 100644
--- a/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
@@ -15,7 +15,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public ArtistNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public ArtistNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<ArtistNfoProvider> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
index b2278ba4a..691298e75 100644
--- a/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
@@ -15,7 +15,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public EpisodeNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public EpisodeNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<EpisodeNfoParser> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs
index d21164c02..452bed1f1 100644
--- a/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs
@@ -9,7 +9,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
 {
     public class MovieNfoProvider : BaseVideoNfoProvider<Movie>
     {
-        public MovieNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public MovieNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<MovieNfoProvider> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem, logger, config, providerManager)
         {
         }
@@ -17,7 +21,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
 
     public class MusicVideoNfoProvider : BaseVideoNfoProvider<MusicVideo>
     {
-        public MusicVideoNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public MusicVideoNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<MusicVideoNfoProvider> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem, logger, config, providerManager)
         {
         }
@@ -25,7 +33,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
 
     public class VideoNfoProvider : BaseVideoNfoProvider<Video>
     {
-        public VideoNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public VideoNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<VideoNfoProvider> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem, logger, config, providerManager)
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
index 2cf542054..49f46e08f 100644
--- a/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
@@ -15,7 +15,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public SeasonNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public SeasonNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<SeasonNfoProvider> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
index 25c8e0faf..e0a3f425f 100644
--- a/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
@@ -15,7 +15,11 @@ namespace MediaBrowser.XbmcMetadata.Providers
         private readonly IConfigurationManager _config;
         private readonly IProviderManager _providerManager;
 
-        public SeriesNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config, IProviderManager providerManager)
+        public SeriesNfoProvider(
+            IFileSystem fileSystem,
+            ILogger<SeriesNfoProvider> logger,
+            IConfigurationManager config,
+            IProviderManager providerManager)
             : base(fileSystem)
         {
             _logger = logger;
diff --git a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
index 233b3cb89..398b1b8f0 100644
--- a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             ILibraryManager libraryManager,
             IUserManager userManager,
             IUserDataManager userDataManager,
-            ILogger logger)
+            ILogger<AlbumNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
index 04565ff7e..fe6233785 100644
--- a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
@@ -14,7 +14,13 @@ namespace MediaBrowser.XbmcMetadata.Savers
 {
     public class ArtistNfoSaver : BaseNfoSaver
     {
-        public ArtistNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        public ArtistNfoSaver(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IUserDataManager userDataManager,
+            ILogger<ArtistNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
index 091c1957e..fc7a5c8fa 100644
--- a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
@@ -14,7 +14,13 @@ namespace MediaBrowser.XbmcMetadata.Savers
 {
     public class EpisodeNfoSaver : BaseNfoSaver
     {
-        public EpisodeNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        public EpisodeNfoSaver(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IUserDataManager userDataManager,
+            ILogger<EpisodeNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
index 08a752e33..89d94f30d 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
@@ -16,7 +16,13 @@ namespace MediaBrowser.XbmcMetadata.Savers
 {
     public class MovieNfoSaver : BaseNfoSaver
     {
-        public MovieNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
+        public MovieNfoSaver(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IUserDataManager userDataManager,
+            ILogger<MovieNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
index 25695121d..b46bd6dd9 100644
--- a/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
@@ -19,7 +19,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             ILibraryManager libraryManager,
             IUserManager userManager,
             IUserDataManager userDataManager,
-            ILogger logger)
+            ILogger<SeasonNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
diff --git a/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
index 8d7faece7..e06fc2f8c 100644
--- a/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             ILibraryManager libraryManager,
             IUserManager userManager,
             IUserDataManager userDataManager,
-            ILogger logger)
+            ILogger<SeriesNfoSaver> logger)
             : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
         {
         }
-- 
cgit v1.2.3