1 files changed, 15 insertions, 84 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 716be54d2..f874bdbb2 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using MediaBrowser.Model.Weather;
 using System;
 
@@ -88,31 +89,6 @@ namespace MediaBrowser.Model.Configuration
         public string MetadataCountryCode { get; set; }
 
         /// <summary>
-        /// Options for specific art to download for movies.
-        /// </summary>
-        public ImageDownloadOptions DownloadMovieImages { get; set; }
-
-        /// <summary>
-        /// Options for specific art to download for Series.
-        /// </summary>
-        public ImageDownloadOptions DownloadSeriesImages { get; set; }
-
-        /// <summary>
-        /// Options for specific art to download for Seasons.
-        /// </summary>
-        public ImageDownloadOptions DownloadSeasonImages { get; set; }
-
-        /// <summary>
-        /// Options for specific art to download for MusicArtists.
-        /// </summary>
-        public ImageDownloadOptions DownloadMusicArtistImages { get; set; }
-
-        /// <summary>
-        /// Options for specific art to download for MusicAlbums.
-        /// </summary>
-        public ImageDownloadOptions DownloadMusicAlbumImages { get; set; }
-
-        /// <summary>
         /// Characters to be replaced with a ' ' in strings to create a sort name
         /// </summary>
         /// <value>The sort replace characters.</value>
@@ -215,11 +191,7 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableEpisodeChapterImageExtraction { get; set; }
         public bool EnableOtherVideoChapterImageExtraction { get; set; }
 
-        public MetadataOptions MovieOptions { get; set; }
-        public MetadataOptions TvOptions { get; set; }
-        public MetadataOptions MusicOptions { get; set; }
-        public MetadataOptions GameOptions { get; set; }
-        public MetadataOptions BookOptions { get; set; }
+        public MetadataOptions[] MetadataOptions { get; set; }
 
         public bool EnableDebugEncodingLogging { get; set; }
         public string TranscodingTempPath { get; set; }
@@ -267,14 +239,6 @@ namespace MediaBrowser.Model.Configuration
             MetadataRefreshDays = 30;
             PreferredMetadataLanguage = "en";
             MetadataCountryCode = "US";
-            DownloadMovieImages = new ImageDownloadOptions();
-            DownloadSeriesImages = new ImageDownloadOptions();
-            DownloadSeasonImages = new ImageDownloadOptions
-            {
-                Backdrops = false
-            };
-            DownloadMusicArtistImages = new ImageDownloadOptions();
-            DownloadMusicAlbumImages = new ImageDownloadOptions();
 
             SortReplaceCharacters = new[] { ".", "+", "%" };
             SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" };
@@ -282,26 +246,26 @@ namespace MediaBrowser.Model.Configuration
 
             SeasonZeroDisplayName = "Specials";
 
-            MovieOptions = new MetadataOptions();
-            TvOptions = new MetadataOptions();
+            LiveTvOptions = new LiveTvOptions();
 
-            MusicOptions = new MetadataOptions()
-            {
-                MaxBackdrops = 1
-            };
+            TvFileOrganizationOptions = new TvFileOrganizationOptions();
 
-            GameOptions = new MetadataOptions();
+            EnableRealtimeMonitor = true;
 
-            BookOptions = new MetadataOptions
+            var options = new List<MetadataOptions>
             {
-                MaxBackdrops = 1
+                new MetadataOptions(1, 1280) {ItemType = "Book"},
+                new MetadataOptions(1, 1280) {ItemType = "MusicAlbum"},
+                new MetadataOptions(1, 1280) {ItemType = "MusicArtist"},
+                new MetadataOptions(0, 1280) {ItemType = "Season"}
             };
 
-            LiveTvOptions = new LiveTvOptions();
-
-            TvFileOrganizationOptions = new TvFileOrganizationOptions();
+            MetadataOptions = options.ToArray();
+        }
 
-            EnableRealtimeMonitor = true;
+        public MetadataOptions GetMetadataOptions(string type)
+        {
+            return MetadataOptions.FirstOrDefault(i => string.Equals(i.ItemType, type, StringComparison.OrdinalIgnoreCase));
         }
     }
 
@@ -324,39 +288,6 @@ namespace MediaBrowser.Model.Configuration
         public int? GuideDays { get; set; }
     }
 
-    public class TvFileOrganizationOptions
-    {
-        public bool IsEnabled { get; set; }
-        public int MinFileSizeMb { get; set; }
-        public string[] LeftOverFileExtensionsToDelete { get; set; }
-        public string[] WatchLocations { get; set; }
-
-        public string SeasonFolderPattern { get; set; }
-
-        public string SeasonZeroFolderName { get; set; }
-
-        public string EpisodeNamePattern { get; set; }
-        public string MultiEpisodeNamePattern { get; set; }
-
-        public bool OverwriteExistingEpisodes { get; set; }
-
-        public bool DeleteEmptyFolders { get; set; }
-
-        public TvFileOrganizationOptions()
-        {
-            MinFileSizeMb = 50;
-
-            LeftOverFileExtensionsToDelete = new string[] {};
-
-            WatchLocations = new string[] { };
-
-            EpisodeNamePattern = "%sn - %sx%0e - %en.%ext";
-            MultiEpisodeNamePattern = "%sn - %sx%0e-x%0ed - %en.%ext";
-            SeasonFolderPattern = "Season %s";
-            SeasonZeroFolderName = "Season 0";
-        }
-    }
-
     public class PathSubstitution
     {
         public string From { get; set; }