diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-29 02:27:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 02:27:52 -0400 |
| commit | cae9dfc1c990b6fc769f3a79c4bfe9122c3b256a (patch) | |
| tree | 34d6c2fcf7da3d9b5e098328b0c79073947a9fe9 /MediaBrowser.Controller/Entities | |
| parent | 9f9e81089f5606e958bc8c3f0e4d73475d02372a (diff) | |
| parent | f6b94af438da8f8d3b3760c3e67eb24b09bafbfd (diff) | |
Merge pull request #2555 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/AggregateFolder.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs index a6b9d860a0..a1de23c930 100644 --- a/MediaBrowser.Controller/Entities/AggregateFolder.cs +++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs @@ -27,6 +27,7 @@ namespace MediaBrowser.Controller.Entities /// <summary> /// We don't support manual shortcuts /// </summary> + [IgnoreDataMember] protected override bool SupportsShortcutChildren { get diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 52e150aa4c..c8ea4c506f 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1926,8 +1926,7 @@ namespace MediaBrowser.Controller.Entities .Where(i => i.IsLocalFile) .Select(i => System.IO.Path.GetDirectoryName(i.Path)) .Distinct(StringComparer.OrdinalIgnoreCase) - .SelectMany(directoryService.GetFiles) - .Select(i => i.FullName) + .SelectMany(directoryService.GetFilePaths) .ToList(); var deletedImages = ImageInfos @@ -2100,8 +2099,8 @@ namespace MediaBrowser.Controller.Entities var extensions = new[] { ".nfo", ".xml", ".srt" }.ToList(); extensions.AddRange(SupportedImageExtensionsList); - return FileSystem.GetFiles(System.IO.Path.GetDirectoryName(Path)) - .Where(i => extensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase) && System.IO.Path.GetFileNameWithoutExtension(i.FullName).StartsWith(filename, StringComparison.OrdinalIgnoreCase)) + return FileSystem.GetFiles(System.IO.Path.GetDirectoryName(Path), extensions.ToArray(), false, false) + .Where(i => System.IO.Path.GetFileNameWithoutExtension(i.FullName).StartsWith(filename, StringComparison.OrdinalIgnoreCase)) .ToList(); } |