Remove useless abstraction around XmlReaderSettings

This removes the amount of stuff that needs to be passed around
Also removes some unneeded `ManagedFileSystem` usage

2 files changed, 90 insertions, 100 deletions

diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index e4bb52217c..335f2c5395 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -15,7 +15,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Xml;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Music
@@ -28,17 +27,15 @@ namespace MediaBrowser.Providers.Music
         private readonly IApplicationHost _appHost;
         private readonly ILogger _logger;
         private readonly IJsonSerializer _json;
-        private readonly IXmlReaderSettingsFactory _xmlSettings;
 
         public static string MusicBrainzBaseUrl = "https://www.musicbrainz.org";
 
-        public MusicBrainzAlbumProvider(IHttpClient httpClient, IApplicationHost appHost, ILogger logger, IJsonSerializer json, IXmlReaderSettingsFactory xmlSettings)
+        public MusicBrainzAlbumProvider(IHttpClient httpClient, IApplicationHost appHost, ILogger logger, IJsonSerializer json)
         {
             _httpClient = httpClient;
             _appHost = appHost;
             _logger = logger;
             _json = json;
-            _xmlSettings = xmlSettings;
             Current = this;
         }
 
@@ -101,11 +98,13 @@ namespace MediaBrowser.Providers.Music
         {
             using (var oReader = new StreamReader(stream, Encoding.UTF8))
             {
-                var settings = _xmlSettings.Create(false);
-
-                settings.CheckCharacters = false;
-                settings.IgnoreProcessingInstructions = true;
-                settings.IgnoreComments = true;
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
 
                 using (var reader = XmlReader.Create(oReader, settings))
                 {
@@ -240,22 +239,20 @@ namespace MediaBrowser.Providers.Music
                 artistId);
 
             using (var response = await GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
             {
-                using (var stream = response.Content)
+                var settings = new XmlReaderSettings()
                 {
-                    using (var oReader = new StreamReader(stream, Encoding.UTF8))
-                    {
-                        var settings = _xmlSettings.Create(false);
-
-                        settings.CheckCharacters = false;
-                        settings.IgnoreProcessingInstructions = true;
-                        settings.IgnoreComments = true;
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
 
-                        using (var reader = XmlReader.Create(oReader, settings))
-                        {
-                            return ReleaseResult.Parse(reader).FirstOrDefault();
-                        }
-                    }
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    return ReleaseResult.Parse(reader).FirstOrDefault();
                 }
             }
         }
@@ -267,22 +264,20 @@ namespace MediaBrowser.Providers.Music
                 WebUtility.UrlEncode(artistName));
 
             using (var response = await GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
             {
-                using (var stream = response.Content)
+                var settings = new XmlReaderSettings()
                 {
-                    using (var oReader = new StreamReader(stream, Encoding.UTF8))
-                    {
-                        var settings = _xmlSettings.Create(false);
-
-                        settings.CheckCharacters = false;
-                        settings.IgnoreProcessingInstructions = true;
-                        settings.IgnoreComments = true;
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
 
-                        using (var reader = XmlReader.Create(oReader, settings))
-                        {
-                            return ReleaseResult.Parse(reader).FirstOrDefault();
-                        }
-                    }
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    return ReleaseResult.Parse(reader).FirstOrDefault();
                 }
             }
         }
@@ -590,26 +585,24 @@ namespace MediaBrowser.Providers.Music
             var url = string.Format("/ws/2/release?release-group={0}", releaseGroupId);
 
             using (var response = await GetMusicBrainzResponse(url, true, true, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
             {
-                using (var stream = response.Content)
+                var settings = new XmlReaderSettings()
                 {
-                    using (var oReader = new StreamReader(stream, Encoding.UTF8))
-                    {
-                        var settings = _xmlSettings.Create(false);
-
-                        settings.CheckCharacters = false;
-                        settings.IgnoreProcessingInstructions = true;
-                        settings.IgnoreComments = true;
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
 
-                        using (var reader = XmlReader.Create(oReader, settings))
-                        {
-                            var result = ReleaseResult.Parse(reader).FirstOrDefault();
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    var result = ReleaseResult.Parse(reader).FirstOrDefault();
 
-                            if (result != null)
-                            {
-                                return result.ReleaseId;
-                            }
-                        }
+                    if (result != null)
+                    {
+                        return result.ReleaseId;
                     }
                 }
             }
@@ -628,56 +621,54 @@ namespace MediaBrowser.Providers.Music
             var url = string.Format("/ws/2/release-group/?query=reid:{0}", releaseEntryId);
 
             using (var response = await GetMusicBrainzResponse(url, false, cancellationToken).ConfigureAwait(false))
+            using (var stream = response.Content)
+            using (var oReader = new StreamReader(stream, Encoding.UTF8))
             {
-                using (var stream = response.Content)
+                var settings = new XmlReaderSettings()
                 {
-                    using (var oReader = new StreamReader(stream, Encoding.UTF8))
-                    {
-                        var settings = _xmlSettings.Create(false);
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
 
-                        settings.CheckCharacters = false;
-                        settings.IgnoreProcessingInstructions = true;
-                        settings.IgnoreComments = true;
+                using (var reader = XmlReader.Create(oReader, settings))
+                {
+                    reader.MoveToContent();
+                    reader.Read();
 
-                        using (var reader = XmlReader.Create(oReader, settings))
+                    // Loop through each element
+                    while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+                    {
+                        if (reader.NodeType == XmlNodeType.Element)
                         {
-                            reader.MoveToContent();
-                            reader.Read();
-
-                            // Loop through each element
-                            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
+                            switch (reader.Name)
                             {
-                                if (reader.NodeType == XmlNodeType.Element)
-                                {
-                                    switch (reader.Name)
+                                case "release-group-list":
                                     {
-                                        case "release-group-list":
-                                            {
-                                                if (reader.IsEmptyElement)
-                                                {
-                                                    reader.Read();
-                                                    continue;
-                                                }
-                                                using (var subReader = reader.ReadSubtree())
-                                                {
-                                                    return GetFirstReleaseGroupId(subReader);
-                                                }
-                                            }
-                                        default:
-                                            {
-                                                reader.Skip();
-                                                break;
-                                            }
+                                        if (reader.IsEmptyElement)
+                                        {
+                                            reader.Read();
+                                            continue;
+                                        }
+                                        using (var subReader = reader.ReadSubtree())
+                                        {
+                                            return GetFirstReleaseGroupId(subReader);
+                                        }
+                                    }
+                                default:
+                                    {
+                                        reader.Skip();
+                                        break;
                                     }
-                                }
-                                else
-                                {
-                                    reader.Read();
-                                }
                             }
-                            return null;
+                        }
+                        else
+                        {
+                            reader.Read();
                         }
                     }
+                    return null;
                 }
             }
         }
diff --git a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
index 8d10834c32..924b712507 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
@@ -13,17 +13,14 @@ using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Xml;
 
 namespace MediaBrowser.Providers.Music
 {
     public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, ArtistInfo>
     {
-        private readonly IXmlReaderSettingsFactory _xmlSettings;
-
-        public MusicBrainzArtistProvider(IXmlReaderSettingsFactory xmlSettings)
+        public MusicBrainzArtistProvider()
         {
-            _xmlSettings = xmlSettings;
+
         }
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(ArtistInfo searchInfo, CancellationToken cancellationToken)
@@ -84,11 +81,13 @@ namespace MediaBrowser.Providers.Music
         {
             using (var oReader = new StreamReader(stream, Encoding.UTF8))
             {
-                var settings = _xmlSettings.Create(false);
-
-                settings.CheckCharacters = false;
-                settings.IgnoreProcessingInstructions = true;
-                settings.IgnoreComments = true;
+                var settings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
 
                 using (var reader = XmlReader.Create(oReader, settings))
                 {