alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 06:48:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix query by multiple ids

Browse Source
This commit is contained in:
Luke Pulverenti
2016-03-20 17:32:26 -04:00
parent f4d61ddcc6
commit a2a0e1ae75
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,7 +167,7 @@ namespace MediaBrowser.Controller.Entities
{
lock (_childrenSyncLock)
{
var newChildren = _children.ToList();
var newChildren = ChildIds.ToList();
newChildren.AddRange(children);
_children = newChildren.ToList();
}
@@ -176,11 +176,11 @@ namespace MediaBrowser.Controller.Entities
{
lock (_childrenSyncLock)
{
if (!_children.Contains(child))
var childIds = ChildIds.ToList();
if (!childIds.Contains(child))
{
var newChildren = _children.ToList();
newChildren.Add(child);
_children = newChildren.ToList();
childIds.Add(child);
_children = childIds.ToList();
}
}
}
@@ -189,7 +189,7 @@ namespace MediaBrowser.Controller.Entities
{
lock (_childrenSyncLock)
{
_children = _children.Except(children).ToList();
_children = ChildIds.Except(children).ToList();
}
}
@@ -257,7 +257,7 @@ namespace MediaBrowser.Controller.Entities
/// Gets or sets the actual children.
/// </summary>
/// <value>The actual children.</value>
protected virtual IEnumerable<BaseItem> ActualChildren
protected virtual IEnumerable<Guid> ChildIds
{
get
{
@@ -267,11 +267,23 @@ namespace MediaBrowser.Controller.Entities
{
_children = LoadChildren().ToList();
}
return _children.Select(LibraryManager.GetItemById).Where(i => i != null);
return _children.ToList();
}
}
}
/// <summary>
/// Gets the actual children.
/// </summary>
/// <value>The actual children.</value>
protected virtual IEnumerable<BaseItem> ActualChildren
{
get
{
return ChildIds.Select(LibraryManager.GetItemById).Where(i => i != null);
}
}
/// <summary>
/// thread-safe access to the actual children of this folder - without regard to user
/// </summary>
@@ -912,6 +924,12 @@ namespace MediaBrowser.Controller.Entities
}
}
if (query.ItemIds.Length > 0)
{
Logger.Debug("Query requires post-filtering due to ItemIds");
return true;
}
if (query.PersonIds.Length > 0)
{
Logger.Debug("Query requires post-filtering due to PersonIds");