starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-26 18:54:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

changed ActualChildren to IEnumerable

Browse Source
This commit is contained in:
Luke Pulverenti
2013-09-18 20:37:01 -04:00
parent 5b93895c14
commit 8136647a0a
4 changed files with 76 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,10 @@ namespace MediaBrowser.Controller.Entities
{
//we don't directly validate our children
//but we do need to clear out the index cache...
IndexCache = new ConcurrentDictionary<string, List<BaseItem>>(StringComparer.OrdinalIgnoreCase);
if (IndexCache != null)
{
IndexCache.Clear();
}
return NullTaskResult;
}
@@ -102,7 +105,7 @@ namespace MediaBrowser.Controller.Entities
/// Our children are actually just references to the ones in the physical root...
/// </summary>
/// <value>The actual children.</value>
protected override ConcurrentDictionary<Guid, BaseItem> ActualChildren
protected override IEnumerable<BaseItem> ActualChildren
{
get
{
@@ -115,16 +118,14 @@ namespace MediaBrowser.Controller.Entities
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new ConcurrentDictionary<Guid, BaseItem>();
return new BaseItem[] { };
}
var ourChildren =
return
LibraryManager.RootFolder.Children
.OfType<Folder>()
.Where(i => i.Path != null && locationsDicionary.ContainsKey(i.Path))
.SelectMany(c => c.Children);
return new ConcurrentDictionary<Guid, BaseItem>(ourChildren.ToDictionary(i => i.Id));
}
}
}