From a4a3a54dadd8a0871c815cd2e116f13f985e5b97 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 16 Sep 2015 13:44:34 -0400 Subject: [PATCH] update collections --- .../Entities/UserViewBuilder.cs | 28 ++----------------- MediaBrowser.Model/Dto/BaseItemDto.cs | 2 -- .../Dto/DtoService.cs | 6 ---- .../Persistence/CleanDatabaseScheduledTask.cs | 2 +- 4 files changed, 3 insertions(+), 35 deletions(-) diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs index c3605fa6d0..ce9a8903a3 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; + var collections = _collectionManager.GetCollections(user); - if (hasCollectionType != null && string.Equals(hasCollectionType.CollectionType, CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase)) - { - return i.GetChildren(user, true).Where(filter); - } - - 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; diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index a1c0755634..9400582c4b 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -74,8 +74,6 @@ namespace MediaBrowser.Model.Dto public string ShareUrl { get; set; } public float? Metascore { get; set; } - - public bool? IsUnidentified { get; set; } public bool? HasDynamicCategories { get; set; } public int? AnimeSeriesIndex { get; set; } diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index edfef38fd0..2f2ebb349f 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -908,12 +908,6 @@ namespace MediaBrowser.Server.Implementations.Dto dto.DisplayMediaType = item.DisplayMediaType; } - // Leave null if false - if (item.IsUnidentified) - { - dto.IsUnidentified = item.IsUnidentified; - } - if (fields.Contains(ItemFields.Settings)) { dto.LockedFields = item.LockedFields; diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs index 22b2c7f335..c9f7165cb5 100644 --- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs +++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs @@ -214,7 +214,7 @@ namespace MediaBrowser.Server.Implementations.Persistence { return new ITaskTrigger[] { - new IntervalTrigger{ Interval = TimeSpan.FromDays(7)} + new IntervalTrigger{ Interval = TimeSpan.FromHours(6)} }; } }