diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-03-14 16:25:17 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-03-14 16:25:17 -0400 |
| commit | 65303c881664e911f9dbad5ff26b9f3dd01f67f7 (patch) | |
| tree | 76e8ace586370c0a9754f3a0c058257983e2aa7f /MediaBrowser.Controller | |
| parent | 89e6124a5df31ceb3075a06007dfa3ca2ae57198 (diff) | |
| parent | 08f0ba83357e95f4d2aa289bd893bae9b7c1d2bb (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs index 56f479205..4cd9b20a1 100644 --- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs +++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs @@ -100,7 +100,7 @@ namespace MediaBrowser.Controller.Providers { var path = item.Images[image]; - return IsInSameDirectory(item, path) && !item.ResolveArgs.GetMetaFileByPath(path).HasValue; + return IsInMetaLocation(item, path) && !item.ResolveArgs.GetMetaFileByPath(path).HasValue; }).ToList(); // Now remove them from the dictionary @@ -122,7 +122,7 @@ namespace MediaBrowser.Controller.Providers } // Only validate paths from the same directory - need to copy to a list because we are going to potentially modify the collection below - var deletedImages = item.BackdropImagePaths.Where(path => IsInSameDirectory(item, path) && !item.ResolveArgs.GetMetaFileByPath(path).HasValue).ToList(); + var deletedImages = item.BackdropImagePaths.Where(path => IsInMetaLocation(item, path) && !item.ResolveArgs.GetMetaFileByPath(path).HasValue).ToList(); // Now remove them from the dictionary foreach (var path in deletedImages) @@ -137,7 +137,7 @@ namespace MediaBrowser.Controller.Providers /// <param name="item">The item.</param> /// <param name="path">The path.</param> /// <returns><c>true</c> if [is in same directory] [the specified item]; otherwise, <c>false</c>.</returns> - private bool IsInSameDirectory(BaseItem item, string path) + private bool IsInMetaLocation(BaseItem item, string path) { return string.Equals(Path.GetDirectoryName(path), item.MetaLocation, StringComparison.OrdinalIgnoreCase); } |
