From 401d82eea7e2313e231330402b5f870d8827b752 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 21 Jul 2017 15:05:52 -0400 Subject: [PATCH 1/2] fixes #2559 - movie.nfo being ignored --- MediaBrowser.Controller/Providers/DirectoryService.cs | 6 +++++- MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs index 3d1af2afa2..6d220f3a36 100644 --- a/MediaBrowser.Controller/Providers/DirectoryService.cs +++ b/MediaBrowser.Controller/Providers/DirectoryService.cs @@ -120,10 +120,14 @@ namespace MediaBrowser.Controller.Providers { file = _fileSystem.GetFileInfo(path); - if (file != null) + if (file != null && file.Exists) { _fileCache.TryAdd(path, file); } + else + { + return null; + } } return file; diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs index f32f89bc2a..aea3f2c706 100644 --- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs @@ -51,6 +51,11 @@ namespace MediaBrowser.XbmcMetadata.Savers //} list.Add(Path.ChangeExtension(item.Path, ".nfo")); + + if (!item.IsInMixedFolder) + { + list.Add(Path.Combine(item.ContainingFolderPath, "movie.nfo")); + } } return list; From e36aae1d75de1a970509d9c5091e39aa446c74fc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 21 Jul 2017 15:07:10 -0400 Subject: [PATCH 2/2] 3.2.25.11 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 7fed66523b..704db59cfe 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.25.10")] +[assembly: AssemblyVersion("3.2.25.11")]