1 files changed, 24 insertions, 14 deletions
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index cf9571824..432ea1f69 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -4,11 +4,11 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.FileOrganization;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
-using MediaBrowser.Controller.Resolvers;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.FileOrganization;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Naming.Common;
+using MediaBrowser.Naming.IO;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -55,18 +55,23 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                 FileSize = new FileInfo(path).Length
             };
 
-            var seriesName = TVUtils.GetSeriesNameFromEpisodeFile(path);
+            var resolver = new Naming.TV.EpisodeResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger());
+
+            var episodeInfo = resolver.Resolve(path, FileInfoType.File) ??
+                new Naming.TV.EpisodeInfo();
+
+            var seriesName = episodeInfo.SeriesName;
 
             if (!string.IsNullOrEmpty(seriesName))
             {
-                var season = TVUtils.GetSeasonNumberFromEpisodeFile(path);
+                var season = episodeInfo.SeasonNumber;
 
                 result.ExtractedSeasonNumber = season;
 
                 if (season.HasValue)
                 {
                     // Passing in true will include a few extra regex's
-                    var episode = TVUtils.GetEpisodeNumberFromFile(path, true);
+                    var episode = episodeInfo.EpisodeNumber;
 
                     result.ExtractedEpisodeNumber = episode;
 
@@ -74,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                     {
                         _logger.Debug("Extracted information from {0}. Series name {1}, Season {2}, Episode {3}", path, seriesName, season, episode);
 
-                        var endingEpisodeNumber = TVUtils.GetEndingEpisodeNumberFromFile(path);
+                        var endingEpisodeNumber = episodeInfo.EndingEpsiodeNumber;
 
                         result.ExtractedEndingEpisodeNumber = endingEpisodeNumber;
 
@@ -249,11 +254,11 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
             var folder = Path.GetDirectoryName(targetPath);
             var targetFileNameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(targetPath);
-            
+
             try
             {
                 var filesOfOtherExtensions = Directory.EnumerateFiles(folder, "*", SearchOption.TopDirectoryOnly)
-                    .Where(i => EntityResolutionHelper.IsVideoFile(i) && string.Equals(_fileSystem.GetFileNameWithoutExtension(i), targetFileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
+                    .Where(i => _libraryManager.IsVideoFile(i) && string.Equals(_fileSystem.GetFileNameWithoutExtension(i), targetFileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
 
                 episodePaths.AddRange(filesOfOtherExtensions);
             }
@@ -319,9 +324,10 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
         private Series GetMatchingSeries(string seriesName, FileOrganizationResult result)
         {
-            int? yearInName;
-            var nameWithoutYear = seriesName;
-            NameParser.ParseName(nameWithoutYear, out nameWithoutYear, out yearInName);
+            var parsedName = _libraryManager.ParseName(seriesName);
+
+            var yearInName = parsedName.Year;
+            var nameWithoutYear = parsedName.Name;
 
             result.ExtractedName = nameWithoutYear;
             result.ExtractedYear = yearInName;
@@ -453,11 +459,11 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
         private bool IsSameEpisode(string sourcePath, string newPath)
         {
-            var sourceFileInfo = new FileInfo(sourcePath);
-            var destinationFileInfo = new FileInfo(newPath);
-
             try
             {
+                var sourceFileInfo = new FileInfo(sourcePath);
+                var destinationFileInfo = new FileInfo(newPath);
+
                 if (sourceFileInfo.Length == destinationFileInfo.Length)
                 {
                     return true;
@@ -467,6 +473,10 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             {
                 return false;
             }
+            catch (DirectoryNotFoundException)
+            {
+                return false;
+            }
 
             return false;
         }