aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/UserRootFolder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-20 02:46:51 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-20 02:46:51 -0400
commit4b7093e923b457f34f717f286ebb08514cfb9067 (patch)
tree9d198870978c289b9b2581638a470562b7e8c8a3 /MediaBrowser.Controller/Entities/UserRootFolder.cs
parent9b1cad3ce05fe68b01750962b29bf5529050dd67 (diff)
get recursive items from db
Diffstat (limited to 'MediaBrowser.Controller/Entities/UserRootFolder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/UserRootFolder.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index daf590871..104408860 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -19,13 +19,9 @@ namespace MediaBrowser.Controller.Entities
{
public override async Task<QueryResult<BaseItem>> GetItems(InternalItemsQuery query)
{
- var user = query.User;
- Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager);
-
if (query.Recursive)
{
- var items = query.User.RootFolder.GetRecursiveChildren(query.User, filter);
- return PostFilterAndSort(items, query);
+ return QueryRecursive(query);
}
var result = await UserViewManager.GetUserViews(new UserViewQuery
@@ -35,6 +31,9 @@ namespace MediaBrowser.Controller.Entities
}, CancellationToken.None).ConfigureAwait(false);
+ var user = query.User;
+ Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager);
+
return PostFilterAndSort(result.Where(filter), query);
}