Parcourir la source

update collections

Luke Pulverenti il y a 9 ans
Parent
commit
a4a3a54dad

+ 2 - 26
MediaBrowser.Controller/Entities/UserViewBuilder.cs

@@ -577,19 +577,9 @@ namespace MediaBrowser.Controller.Entities
 
 
         private async Task<QueryResult<BaseItem>> GetBoxsetView(Folder parent, User user, InternalItemsQuery query)
         private async Task<QueryResult<BaseItem>> GetBoxsetView(Folder parent, User user, InternalItemsQuery query)
         {
         {
-            return GetResult(GetMediaFolders(user).SelectMany(i =>
-            {
-                var hasCollectionType = i as ICollectionFolder;
-                Func<BaseItem, bool> 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<QueryResult<BaseItem>> GetPhotosView(Folder queryParent, User user, InternalItemsQuery query)
         private async Task<QueryResult<BaseItem>> GetPhotosView(Folder queryParent, User user, InternalItemsQuery query)
@@ -1041,11 +1031,6 @@ namespace MediaBrowser.Controller.Entities
                 return false;
                 return false;
             }
             }
 
 
-            if (request.IsUnidentified.HasValue)
-            {
-                return false;
-            }
-
             if (request.IsYearMismatched.HasValue)
             if (request.IsYearMismatched.HasValue)
             {
             {
                 return false;
                 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)
             if (query.IsLocked.HasValue)
             {
             {
                 var val = query.IsLocked.Value;
                 var val = query.IsLocked.Value;

+ 0 - 2
MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -74,8 +74,6 @@ namespace MediaBrowser.Model.Dto
         public string ShareUrl { get; set; }
         public string ShareUrl { get; set; }
 
 
         public float? Metascore { get; set; }
         public float? Metascore { get; set; }
-
-        public bool? IsUnidentified { get; set; }
         public bool? HasDynamicCategories { get; set; }
         public bool? HasDynamicCategories { get; set; }
 
 
         public int? AnimeSeriesIndex { get; set; }
         public int? AnimeSeriesIndex { get; set; }

+ 0 - 6
MediaBrowser.Server.Implementations/Dto/DtoService.cs

@@ -908,12 +908,6 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.DisplayMediaType = item.DisplayMediaType;
                 dto.DisplayMediaType = item.DisplayMediaType;
             }
             }
 
 
-            // Leave null if false
-            if (item.IsUnidentified)
-            {
-                dto.IsUnidentified = item.IsUnidentified;
-            }
-
             if (fields.Contains(ItemFields.Settings))
             if (fields.Contains(ItemFields.Settings))
             {
             {
                 dto.LockedFields = item.LockedFields;
                 dto.LockedFields = item.LockedFields;

+ 1 - 1
MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs

@@ -214,7 +214,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
         {
         {
             return new ITaskTrigger[] 
             return new ITaskTrigger[] 
             { 
             { 
-                new IntervalTrigger{ Interval = TimeSpan.FromDays(7)}
+                new IntervalTrigger{ Interval = TimeSpan.FromHours(6)}
             };
             };
         }
         }
     }
     }