Post GPL cleanup

MediaBrowser.Model/Configuration/LibraryOptions.cs

@@ -6,7 +6,6 @@ namespace MediaBrowser.Model.Configuration
 {
     public class LibraryOptions
     {
-        public bool EnableArchiveMediaFiles { get; set; }
         public bool EnablePhotos { get; set; }
         public bool EnableRealtimeMonitor { get; set; }
         public bool EnableChapterImageExtraction { get; set; }
@@ -65,10 +64,10 @@ namespace MediaBrowser.Model.Configuration
 
         public LibraryOptions()
         {
-            TypeOptions = new TypeOptions[] { };
-            DisabledSubtitleFetchers = new string[] { };
-            SubtitleFetcherOrder = new string[] { };
-            DisabledLocalMetadataReaders = new string[] { };
+            TypeOptions = Array.Empty<TypeOptions>();
+            DisabledSubtitleFetchers = Array.Empty<string>();
+            SubtitleFetcherOrder = Array.Empty<string>();
+            DisabledLocalMetadataReaders = Array.Empty<string>();
 
             SkipSubtitlesIfAudioTrackMatches = true;
             RequirePerfectSubtitleMatch = true;
@@ -76,7 +75,7 @@ namespace MediaBrowser.Model.Configuration
             EnablePhotos = true;
             SaveSubtitlesWithMedia = true;
             EnableRealtimeMonitor = true;
-            PathInfos = new MediaPathInfo[] { };
+            PathInfos = Array.Empty<MediaPathInfo>();
             EnableInternetProviders = true;
             EnableAutomaticSeriesGrouping = true;
             SeasonZeroDisplayName = "Specials";
@@ -141,11 +140,11 @@ namespace MediaBrowser.Model.Configuration
 
         public TypeOptions()
         {
-            MetadataFetchers = new string[] { };
-            MetadataFetcherOrder = new string[] { };
-            ImageFetchers = new string[] { };
-            ImageFetcherOrder = new string[] { };
-            ImageOptions = new ImageOption[] { };
+            MetadataFetchers = Array.Empty<string>();
+            MetadataFetcherOrder = Array.Empty<string>();
+            ImageFetchers = Array.Empty<string>();
+            ImageFetcherOrder = Array.Empty<string>();
+            ImageOptions = Array.Empty<ImageOption>();
         }
 
         public static Dictionary<string, ImageOption[]> DefaultImageOptions = new Dictionary<string, ImageOption[]>

MediaBrowser.Model/Configuration/MetadataOptions.cs

@@ -1,5 +1,4 @@
-using MediaBrowser.Model.Extensions;
-using System;
+using System;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -21,18 +20,12 @@ namespace MediaBrowser.Model.Configuration
 
         public MetadataOptions()
         {
-            DisabledMetadataSavers = new string[] { };
-            LocalMetadataReaderOrder = new string[] { };
-
-            DisabledMetadataFetchers = new string[] { };
-            MetadataFetcherOrder = new string[] { };
-            DisabledImageFetchers = new string[] { };
-            ImageFetcherOrder = new string[] { };
-        }
-
-        public bool IsMetadataSaverEnabled(string name)
-        {
-            return !ListHelper.ContainsIgnoreCase(DisabledMetadataSavers, name);
+            DisabledMetadataSavers = Array.Empty<string>();
+            LocalMetadataReaderOrder = Array.Empty<string>();
+            DisabledMetadataFetchers = Array.Empty<string>();
+            MetadataFetcherOrder = Array.Empty<string>();
+            DisabledImageFetchers = Array.Empty<string>();
+            ImageFetcherOrder = Array.Empty<string>();
         }
     }
 }

MediaBrowser.Model/Configuration/MetadataPluginSummary.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Configuration
@@ -25,8 +25,8 @@ namespace MediaBrowser.Model.Configuration
 
         public MetadataPluginSummary()
         {
-            SupportedImageTypes = new ImageType[] { };
-            Plugins = new MetadataPlugin[] { };
+            SupportedImageTypes = Array.Empty<ImageType>();
+            Plugins = Array.Empty<MetadataPlugin>();
         }
     }
-}
+}

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -173,8 +173,6 @@ namespace MediaBrowser.Model.Configuration
 
         public int RemoteClientBitrateLimit { get; set; }
 
-        public int SchemaVersion { get; set; }
-
         public bool EnableFolderView { get; set; }
         public bool EnableGroupingIntoCollections { get; set; }
         public bool DisplaySpecialsWithinSeasons { get; set; }
@@ -201,13 +199,13 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         public ServerConfiguration()
         {
-            UninstalledPlugins = new string[] { };
-            RemoteIPFilter = new string[] { };
-            LocalNetworkSubnets = new string[] { };
-            LocalNetworkAddresses = new string[] { };
-            CodecsUsed = new string[] { };
+            UninstalledPlugins = Array.Empty<string>();
+            RemoteIPFilter = Array.Empty<string>();
+            LocalNetworkSubnets = Array.Empty<string>();
+            LocalNetworkAddresses = Array.Empty<string>();
+            CodecsUsed = Array.Empty<string>();
             ImageExtractionTimeoutMs = 0;
-            PathSubstitutions = new PathSubstitution[] { };
+            PathSubstitutions = Array.Empty<PathSubstitution>();
             EnableSimpleArtistDetection = true;
 
             DisplaySpecialsWithinSeasons = true;
@@ -235,7 +233,7 @@ namespace MediaBrowser.Model.Configuration
 
             LibraryMonitorDelay = 60;
 
-            ContentTypes = new NameValuePair[] { };
+            ContentTypes = Array.Empty<NameValuePair>();
 
             PreferredMetadataLanguage = "en";
             MetadataCountryCode = "US";
@@ -248,56 +246,51 @@ namespace MediaBrowser.Model.Configuration
 
             MetadataOptions = new[]
             {
-                new MetadataOptions {ItemType = "Book"},
-
-                new MetadataOptions
+                new MetadataOptions()
+                {
+                    ItemType = "Book"
+                },
+                new MetadataOptions()
                 {
                     ItemType = "Movie"
                 },
-
                 new MetadataOptions
                 {
                     ItemType = "MusicVideo",
-                    DisabledMetadataFetchers = new []{ "The Open Movie Database" },
-                    DisabledImageFetchers = new []{ "The Open Movie Database", "FanArt" }
+                    DisabledMetadataFetchers = new [] { "The Open Movie Database" },
+                    DisabledImageFetchers = new [] { "The Open Movie Database", "FanArt" }
                 },
-
                 new MetadataOptions
                 {
                     ItemType = "Series",
-                    DisabledMetadataFetchers = new []{ "TheMovieDb" },
-                    DisabledImageFetchers = new []{ "TheMovieDb" }
+                    DisabledMetadataFetchers = new [] { "TheMovieDb" },
+                    DisabledImageFetchers = new [] { "TheMovieDb" }
                 },
-
                 new MetadataOptions
                 {
                     ItemType = "MusicAlbum",
-                    DisabledMetadataFetchers = new []{ "TheAudioDB" }
+                    DisabledMetadataFetchers = new [] { "TheAudioDB" }
                 },
-
                 new MetadataOptions
                 {
                     ItemType = "MusicArtist",
-                    DisabledMetadataFetchers = new []{ "TheAudioDB" }
+                    DisabledMetadataFetchers = new [] { "TheAudioDB" }
                 },
-
                 new MetadataOptions
                 {
                     ItemType = "BoxSet"
                 },
-
                 new MetadataOptions
                 {
                     ItemType = "Season",
-                    DisabledMetadataFetchers = new []{ "TheMovieDb" },
+                    DisabledMetadataFetchers = new [] { "TheMovieDb" },
                     DisabledImageFetchers = new [] { "FanArt" }
                 },
-
                 new MetadataOptions
                 {
                     ItemType = "Episode",
-                    DisabledMetadataFetchers = new []{ "The Open Movie Database", "TheMovieDb" },
-                    DisabledImageFetchers = new []{ "The Open Movie Database", "TheMovieDb" }
+                    DisabledMetadataFetchers = new [] { "The Open Movie Database", "TheMovieDb" },
+                    DisabledImageFetchers = new [] { "The Open Movie Database", "TheMovieDb" }
                 }
             };
         }

MediaBrowser.Model/Configuration/UserConfiguration.cs

@@ -57,10 +57,10 @@ namespace MediaBrowser.Model.Configuration
             HidePlayedInLatest = true;
             PlayDefaultAudioTrack = true;
 
-            LatestItemsExcludes = new string[] {};
-            OrderedViews = new string[] {};
-            MyMediaExcludes = new string[] {};
-            GroupedFolders = new string[] {};
+            LatestItemsExcludes = Array.Empty<string>();
+            OrderedViews = Array.Empty<string>();
+            MyMediaExcludes = Array.Empty<string>();
+            GroupedFolders = Array.Empty<string>();
         }
     }
 }