support video_ts.nfo

2 files changed, 6 insertions, 16 deletions

diff --git a/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
index 1ee1b42418..1e82dfce77 100644
--- a/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
@@ -59,7 +59,7 @@ namespace MediaBrowser.XbmcMetadata.Providers
 
         public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
         {
-            var file = GetXmlFile(new ItemInfo { IsInMixedFolder = item.IsInMixedFolder, Path = item.Path }, directoryService);
+            var file = GetXmlFile(new ItemInfo(item), directoryService);
 
             if (file == null)
             {
diff --git a/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
index 8119c162c0..4dff051c7d 100644
--- a/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
@@ -5,8 +5,10 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.XbmcMetadata.Parsers;
+using MediaBrowser.XbmcMetadata.Savers;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading;
 
 namespace MediaBrowser.XbmcMetadata.Providers
@@ -35,21 +37,9 @@ namespace MediaBrowser.XbmcMetadata.Providers
 
         protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService)
         {
-            var path = GetMovieSavePath(info, FileSystem);
-
-            return directoryService.GetFile(path);
-        }
-
-        public static string GetMovieSavePath(ItemInfo item, IFileSystem fileSystem)
-        {
-            if (Directory.Exists(item.Path))
-            {
-                var path = item.Path;
-
-                return Path.Combine(path, Path.GetFileName(path) + ".nfo");
-            }
-
-            return Path.ChangeExtension(item.Path, ".nfo");
+            return MovieNfoSaver.GetMovieSavePaths(info, FileSystem)
+                .Select(directoryService.GetFile)
+                .FirstOrDefault(i => i != null);
         }
     }
 }
\ No newline at end of file