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

hide concurrent dictionary from folder subclasses

Browse Source
This commit is contained in:
Luke Pulverenti 2013-09-18 19:33:21 -04:00
parent 2ccd7d3e77
commit 18a909797f
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -1042,7 +1042,9 @@ namespace MediaBrowser.Controller.Entities
throw new ArgumentNullException("user");
}
if (user.Configuration.MaxParentalRating == null)
var maxAllowedRating = user.Configuration.MaxParentalRating;
if (maxAllowedRating == null)
{
return true;
}
@ -1067,7 +1069,7 @@ namespace MediaBrowser.Controller.Entities
return true;
}
return value.Value <= user.Configuration.MaxParentalRating.Value;
return value.Value <= maxAllowedRating.Value;
}
/// <summary>

10
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -476,7 +476,7 @@ namespace MediaBrowser.Controller.Entities
{
get
{
LazyInitializer.EnsureInitialized(ref _children, ref _childrenInitialized, ref _childrenSyncLock, LoadChildren);
LazyInitializer.EnsureInitialized(ref _children, ref _childrenInitialized, ref _childrenSyncLock, LoadChildrenInternal);
return _children;
}
private set
@ -529,16 +529,20 @@ namespace MediaBrowser.Controller.Entities
}
}
private ConcurrentDictionary<Guid, BaseItem> LoadChildrenInternal()
{
return new ConcurrentDictionary<Guid, BaseItem>(LoadChildren().ToDictionary(i => i.Id));
}
/// <summary>
/// Loads our children. Validation will occur externally.
/// We want this sychronous.
/// </summary>
/// <returns>ConcurrentBag{BaseItem}.</returns>
protected virtual ConcurrentDictionary<Guid, BaseItem> LoadChildren()
protected virtual IEnumerable<BaseItem> LoadChildren()
{
//just load our children from the repo - the library will be validated and maintained in other processes
return new ConcurrentDictionary<Guid, BaseItem>(GetCachedChildren().ToDictionary(i => i.Id));
return GetCachedChildren();
}
/// <summary>

5
MediaBrowser.Controller/Entities/IndexFolder.cs
View File

@ -1,7 +1,6 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Model.Entities;
using MoreLinq;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
@ -111,7 +110,7 @@ namespace MediaBrowser.Controller.Entities
/// Override to return the children defined to us when we were created
/// </summary>
/// <value>The actual children.</value>
protected override ConcurrentDictionary<Guid,BaseItem> LoadChildren()
protected override IEnumerable<BaseItem> LoadChildren()
{
var originalChildSource = ChildSource.ToList();
@ -136,7 +135,7 @@ namespace MediaBrowser.Controller.Entities
// Now - since we built the index grouping from the bottom up - we now need to properly set Parents from the top down
SetParents(this, kids.OfType<IndexFolder>());
return new ConcurrentDictionary<Guid, BaseItem>(kids.DistinctBy(i => i.Id).ToDictionary(i => i.Id));
return kids.DistinctBy(i => i.Id);
}
/// <summary>