From a29e1eb036d22d108ee4234d31650a061b591073 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 21 Jan 2014 11:24:12 -0500
Subject: #680 - begin resolution feature

---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Model/Configuration')

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index dd0c0ce3ca..f017fdf16f 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -328,16 +328,12 @@ namespace MediaBrowser.Model.Configuration
         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; }
 
-        /// <summary>
-        /// Will log results but will not actually make any changes
-        /// </summary>
-        public bool EnableTrialMode { get; set; }
-
         public TvFileOrganizationOptions()
         {
             MinFileSizeMb = 50;
@@ -347,10 +343,9 @@ namespace MediaBrowser.Model.Configuration
             WatchLocations = new string[] { };
 
             EpisodeNamePattern = "%sn - %sx%0e - %en.%ext";
+            MultiEpisodeNamePattern = "%sn - %sx%0e-x%0ed - %en.%ext";
             SeasonFolderPattern = "Season %s";
             SeasonZeroFolderName = "Season 0";
-
-            EnableTrialMode = true;
         }
     }
 }
-- 
cgit v1.2.3