michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix collection folders not seeing derived folder types

Browse Source
This commit is contained in:
Eric Reed 2013-06-20 12:19:26 -04:00
parent aa9fd63224
commit b02287c0dd
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@ -73,26 +73,11 @@ namespace MediaBrowser.Controller.Entities
{ {
get get
{ {
Dictionary<Guid,Guid> folderIds;
try
{
// Accessing ResolveArgs could involve file system access
folderIds = ResolveArgs.PhysicalLocations
.Select(f => f.GetMBId(typeof(Folder)))
.ToDictionary(i => i);
}
catch (IOException ex)
{
Logger.ErrorException("Error creating FolderIds for {0}", ex, Path);
folderIds = new Dictionary<Guid, Guid>();
}
var ourChildren = var ourChildren =
LibraryManager.RootFolder.RecursiveChildren.OfType<Folder>() LibraryManager.RootFolder.RecursiveChildren
.Where(i => folderIds.ContainsKey(i.Id)) .Where(i => i is Folder && i.Path != null && ResolveArgs.PhysicalLocations.Contains(i.Path, StringComparer.OrdinalIgnoreCase))
.SelectMany(c => c.Children); .Cast<Folder>().SelectMany(c => c.Children);
return new ConcurrentDictionary<Guid,BaseItem>(ourChildren.ToDictionary(i => i.Id)); return new ConcurrentDictionary<Guid,BaseItem>(ourChildren.ToDictionary(i => i.Id));
} }