alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-18 20:24:20 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fixes #305 - Multiple collections

Browse Source
This commit is contained in:
Luke Pulverenti
2013-05-24 13:48:48 -04:00
parent 398b658dbe
commit 7a5ba39603
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -74,23 +73,25 @@ namespace MediaBrowser.Controller.Entities
{
get
{
IEnumerable<Guid> folderIds;
Dictionary<Guid,Guid> folderIds;
try
{
// Accessing ResolveArgs could involve file system access
folderIds = ResolveArgs.PhysicalLocations.Select(f => (f.GetMBId(typeof(Folder))));
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 Guid[] {};
folderIds = new Dictionary<Guid, Guid>();
}
var ourChildren =
LibraryManager.RootFolder.Children.OfType<Folder>()
.Where(i => folderIds.Contains(i.Id))
LibraryManager.RootFolder.RecursiveChildren.OfType<Folder>()
.Where(i => folderIds.ContainsKey(i.Id))
.SelectMany(c => c.Children);
return new ConcurrentDictionary<Guid,BaseItem>(ourChildren.ToDictionary(i => i.Id));