From a4a3a54dadd8a0871c815cd2e116f13f985e5b97 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 16 Sep 2015 13:44:34 -0400 Subject: update collections --- .../Entities/UserViewBuilder.cs | 28 ++-------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'MediaBrowser.Controller/Entities/UserViewBuilder.cs') diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs index c3605fa6d..ce9a8903a 100644 --- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs +++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs @@ -577,19 +577,9 @@ namespace MediaBrowser.Controller.Entities private async Task> GetBoxsetView(Folder parent, User user, InternalItemsQuery query) { - return GetResult(GetMediaFolders(user).SelectMany(i => - { - var hasCollectionType = i as ICollectionFolder; - Func filter = b => b is BoxSet; - - if (hasCollectionType != null && string.Equals(hasCollectionType.CollectionType, CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase)) - { - return i.GetChildren(user, true).Where(filter); - } + var collections = _collectionManager.GetCollections(user); - return i.GetRecursiveChildren(user, filter); - - }), parent, query); + return GetResult(collections, parent, query); } private async Task> GetPhotosView(Folder queryParent, User user, InternalItemsQuery query) @@ -1041,11 +1031,6 @@ namespace MediaBrowser.Controller.Entities return false; } - if (request.IsUnidentified.HasValue) - { - return false; - } - if (request.IsYearMismatched.HasValue) { return false; @@ -1418,15 +1403,6 @@ namespace MediaBrowser.Controller.Entities } } - if (query.IsUnidentified.HasValue) - { - var val = query.IsUnidentified.Value; - if (item.IsUnidentified != val) - { - return false; - } - } - if (query.IsLocked.HasValue) { var val = query.IsLocked.Value; -- cgit v1.2.3