#680 - Support new episode file sorting

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -224,7 +224,7 @@ namespace MediaBrowser.Model.Configuration
 
         public bool EnableAutomaticRestart { get; set; }
 
-        public TvFileSortingOptions TvFileSortingOptions { get; set; }
+        public TvFileOrganizationOptions TvFileOrganizationOptions { get; set; }
         public LiveTvOptions LiveTvOptions { get; set; }
 
         /// <summary>
@@ -293,7 +293,7 @@ namespace MediaBrowser.Model.Configuration
 
             LiveTvOptions = new LiveTvOptions();
 
-            TvFileSortingOptions = new TvFileSortingOptions();
+            TvFileOrganizationOptions = new TvFileOrganizationOptions();
         }
     }
 
@@ -316,7 +316,7 @@ namespace MediaBrowser.Model.Configuration
         public int? GuideDays { get; set; }
     }
 
-    public class TvFileSortingOptions
+    public class TvFileOrganizationOptions
     {
         public bool IsEnabled { get; set; }
         public int MinFileSizeMb { get; set; }
@@ -326,6 +326,8 @@ namespace MediaBrowser.Model.Configuration
         public string SeasonFolderPattern { get; set; }
 
         public string SeasonZeroFolderName { get; set; }
+
+        public string EpisodeNamePattern { get; set; }
         
         public bool OverwriteExistingEpisodes { get; set; }
 
@@ -336,17 +338,15 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         public bool EnableTrialMode { get; set; }
 
-        public TvFileSortingOptions()
+        public TvFileOrganizationOptions()
         {
             MinFileSizeMb = 50;
 
-            LeftOverFileExtensionsToDelete = new[] {
-                ".nfo", 
-                ".txt"
-            };
+            LeftOverFileExtensionsToDelete = new string[] {};
 
             WatchLocations = new string[] { };
 
+            EpisodeNamePattern = "%sn - %sx%0e - %en.%ext";
             SeasonFolderPattern = "Season %s";
             SeasonZeroFolderName = "Season 0";
 

MediaBrowser.Model/FileOrganization/FileOrganizationQuery.cs

@@ -1,7 +1,7 @@
 
-namespace MediaBrowser.Model.FileSorting
+namespace MediaBrowser.Model.FileOrganization
 {
-    public class FileSortingResultQuery
+    public class FileOrganizationResultQuery
     {
         /// <summary>
         /// Skips over a given number of items within the results. Use for paging.

MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs

@@ -1,8 +1,8 @@
 using System;
 
-namespace MediaBrowser.Model.FileSorting
+namespace MediaBrowser.Model.FileOrganization
 {
-    public class FileSortingResult
+    public class FileOrganizationResult
     {
         /// <summary>
         /// Gets or sets the original path.

MediaBrowser.Model/Logging/NullLogger.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Text;
+
+namespace MediaBrowser.Model.Logging
+{
+    public class NullLogger : ILogger
+    {
+        public void Info(string message, params object[] paramList)
+        {
+        }
+
+        public void Error(string message, params object[] paramList)
+        {
+        }
+
+        public void Warn(string message, params object[] paramList)
+        {
+        }
+
+        public void Debug(string message, params object[] paramList)
+        {
+        }
+
+        public void Fatal(string message, params object[] paramList)
+        {
+        }
+
+        public void FatalException(string message, Exception exception, params object[] paramList)
+        {
+        }
+
+        public void Log(LogSeverity severity, string message, params object[] paramList)
+        {
+        }
+
+        public void ErrorException(string message, Exception exception, params object[] paramList)
+        {
+        }
+
+        public void LogMultiline(string message, LogSeverity severity, StringBuilder additionalContent)
+        {
+        }
+    }
+}

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -71,8 +71,8 @@
     <Compile Include="Dto\ItemCounts.cs" />
     <Compile Include="Dto\ItemIndex.cs" />
     <Compile Include="Entities\PackageReviewInfo.cs" />
-    <Compile Include="FileSorting\FileSortingResult.cs" />
-    <Compile Include="FileSorting\FileSortingResultQuery.cs" />
+    <Compile Include="FileOrganization\FileOrganizationResult.cs" />
+    <Compile Include="FileOrganization\FileOrganizationQuery.cs" />
     <Compile Include="LiveTv\ChannelInfoDto.cs" />
     <Compile Include="LiveTv\ChannelQuery.cs" />
     <Compile Include="LiveTv\ProgramInfoDto.cs" />
@@ -82,6 +82,7 @@
     <Compile Include="LiveTv\RecordingStatus.cs" />
     <Compile Include="LiveTv\SeriesTimerInfoDto.cs" />
     <Compile Include="LiveTv\TimerInfoDto.cs" />
+    <Compile Include="Logging\NullLogger.cs" />
     <Compile Include="News\NewsItem.cs" />
     <Compile Include="Providers\ImageProviderInfo.cs" />
     <Compile Include="Providers\RemoteImageInfo.cs" />