|
|
|
@ -577,19 +577,9 @@ namespace MediaBrowser.Controller.Entities
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
@ -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;
|
|
|
|
|