From 22377f2516b78d9eb6a2e5bf4e99958590bd5788 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 4 Mar 2016 12:07:14 -0500
Subject: auto-organize fixes

---
 .../FileOrganization/TvFolderOrganizer.cs                         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/FileOrganization')

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
index 845fcdff2..43bd2f29c 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
@@ -84,7 +84,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error organizing episode {0}", ex, file);
+                        _logger.ErrorException("Error organizing episode {0}", ex, file.FullName);
                     }
 
                     numComplete++;
@@ -132,7 +132,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
         {
             try
             {
-				return _fileSystem.GetFiles(path, true)
+                return _fileSystem.GetFiles(path, true)
                     .ToList();
             }
             catch (IOException ex)
@@ -150,7 +150,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
         /// <param name="extensions">The extensions.</param>
         private void DeleteLeftOverFiles(string path, IEnumerable<string> extensions)
         {
-			var eligibleFiles = _fileSystem.GetFiles(path, true)
+            var eligibleFiles = _fileSystem.GetFiles(path, true)
                 .Where(i => extensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase))
                 .ToList();
 
@@ -206,4 +206,4 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             return watchLocations.Contains(path, StringComparer.OrdinalIgnoreCase);
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 3d97d50541bc070e4c035a8324d2fcd40badedd9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 10 Mar 2016 15:06:47 -0500
Subject: auto-organize updates

---
 .../FileOrganization/EpisodeFileOrganizer.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/FileOrganization')

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index f9e167a8f..349e31907 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -547,7 +547,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
             if (series == null)
             {
-                SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(e => e.MatchStrings.Contains(seriesName, StringComparer.OrdinalIgnoreCase));
+                SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(e => e.MatchStrings.Contains(nameWithoutYear, StringComparer.OrdinalIgnoreCase));
 
                 if (info != null)
                 {
-- 
cgit v1.2.3