aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/UserViewBuilder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-01 13:26:09 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-01 13:26:09 -0400
commit085470394e60fa919581b2f19dc234eeb985993a (patch)
tree45be02aed7e689730b128a97b1ae9c3324cd3a60 /MediaBrowser.Controller/Entities/UserViewBuilder.cs
parent11228356888409abc80d1a45dcacf737dcf17313 (diff)
update home screen sections
Diffstat (limited to 'MediaBrowser.Controller/Entities/UserViewBuilder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/UserViewBuilder.cs15
1 files changed, 6 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 3ab82a103..43adc4af6 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -238,12 +238,9 @@ namespace MediaBrowser.Controller.Entities
{
if (queryParent is UserView)
{
- return GetResult(GetMediaFolders(user).SelectMany(i => i.GetChildren(user, true)), queryParent, query);
- }
- else
- {
- return GetResult(queryParent.GetChildren(user, true), queryParent, query);
+ return GetResult(GetMediaFolders(user).OfType<Folder>().SelectMany(i => i.GetChildren(user, true)), queryParent, query);
}
+ return GetResult(queryParent.GetChildren(user, true), queryParent, query);
}
}
}
@@ -1681,7 +1678,7 @@ namespace MediaBrowser.Controller.Entities
return true;
}
- private IEnumerable<Folder> GetMediaFolders(User user)
+ private IEnumerable<BaseItem> GetMediaFolders(User user)
{
if (user == null)
{
@@ -1696,7 +1693,7 @@ namespace MediaBrowser.Controller.Entities
.Where(i => user.IsFolderGrouped(i.Id) && UserView.IsEligibleForGrouping(i));
}
- private List<Folder> GetMediaFolders(User user, IEnumerable<string> viewTypes)
+ private List<BaseItem> GetMediaFolders(User user, IEnumerable<string> viewTypes)
{
if (user == null)
{
@@ -1717,14 +1714,14 @@ namespace MediaBrowser.Controller.Entities
}).ToList();
}
- private List<Folder> GetMediaFolders(Folder parent, User user, IEnumerable<string> viewTypes)
+ private List<BaseItem> GetMediaFolders(Folder parent, User user, IEnumerable<string> viewTypes)
{
if (parent == null || parent is UserView)
{
return GetMediaFolders(user, viewTypes);
}
- return new List<Folder> { parent };
+ return new List<BaseItem> { parent };
}
private async Task<QueryResult<BaseItem>> GetLiveTvView(Folder queryParent, User user, InternalItemsQuery query)