From cdd1a032993a4ca7bb34d692f9dfdea0140d55e9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 13 Apr 2013 17:49:16 -0400 Subject: implemented filtering of ibn items based on like/dislike/favorite --- .../UserLibrary/BaseItemsByNameService.cs | 128 ++++++++++++++++++--- 1 file changed, 110 insertions(+), 18 deletions(-) (limited to 'MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs') diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs index 432594842..0a2d6453a 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs @@ -70,9 +70,13 @@ namespace MediaBrowser.Api.UserLibrary items = FilterItems(request, items, user); var extractedItems = GetAllItems(request, items, user); - var ibnItemsArray = SortItems(request, extractedItems).ToArray(); - - IEnumerable>>> ibnItems = ibnItemsArray; + + extractedItems = FilterItems(request, extractedItems, user); + extractedItems = SortItems(request, extractedItems); + + var ibnItemsArray = extractedItems.ToArray(); + + IEnumerable> ibnItems = ibnItemsArray; var result = new ItemsResult { @@ -104,23 +108,74 @@ namespace MediaBrowser.Api.UserLibrary return result; } + /// + /// Filters the items. + /// + /// The request. + /// The items. + /// The user. + /// IEnumerable{IbnStub}. + private IEnumerable> FilterItems(GetItemsByName request, IEnumerable> items, User user) + { + var filters = request.GetFilters().ToList(); + + if (filters.Count == 0) + { + return items; + } + + items = items.AsParallel(); + + if (filters.Contains(ItemFilter.Dislikes)) + { + items = items.Where(i => + { + var userdata = i.GetUserItemData(UserDataRepository, user.Id).Result; + + return userdata != null && userdata.Likes.HasValue && !userdata.Likes.Value; + }); + } + + if (filters.Contains(ItemFilter.Likes)) + { + items = items.Where(i => + { + var userdata = i.GetUserItemData(UserDataRepository, user.Id).Result; + + return userdata != null && userdata.Likes.HasValue && userdata.Likes.Value; + }); + } + + if (filters.Contains(ItemFilter.IsFavorite)) + { + items = items.Where(i => + { + var userdata = i.GetUserItemData(UserDataRepository, user.Id).Result; + + return userdata != null && userdata.Likes.HasValue && userdata.IsFavorite; + }); + } + + return items.AsEnumerable(); + } + /// /// Sorts the items. /// /// The request. /// The items. /// IEnumerable{BaseItem}. - private IEnumerable>>> SortItems(GetItemsByName request, IEnumerable>>> items) + private IEnumerable> SortItems(GetItemsByName request, IEnumerable> items) { if (string.Equals(request.SortBy, "SortName", StringComparison.OrdinalIgnoreCase)) { if (request.SortOrder.HasValue && request.SortOrder.Value == Model.Entities.SortOrder.Descending) { - items = items.OrderByDescending(i => i.Item1); + items = items.OrderByDescending(i => i.Name); } else { - items = items.OrderBy(i => i.Item1); + items = items.OrderBy(i => i.Name); } } @@ -160,14 +215,7 @@ namespace MediaBrowser.Api.UserLibrary /// The items. /// The user. /// IEnumerable{Tuple{System.StringFunc{System.Int32}}}. - protected abstract IEnumerable>>> GetAllItems(GetItemsByName request, IEnumerable items, User user); - - /// - /// Gets the entity. - /// - /// The name. - /// Task{BaseItem}. - protected abstract Task GetEntity(string name); + protected abstract IEnumerable> GetAllItems(GetItemsByName request, IEnumerable items, User user); /// /// Gets the dto. @@ -176,17 +224,17 @@ namespace MediaBrowser.Api.UserLibrary /// The user. /// The fields. /// Task{DtoBaseItem}. - private async Task GetDto(Tuple>> stub, User user, List fields) + private async Task GetDto(IbnStub stub, User user, List fields) { BaseItem item; try { - item = await GetEntity(stub.Item1).ConfigureAwait(false); + item = await stub.GetItem().ConfigureAwait(false); } catch (IOException ex) { - Logger.ErrorException("Error getting IBN item {0}", ex, stub.Item1); + Logger.ErrorException("Error getting IBN item {0}", ex, stub.Name); return null; } @@ -194,7 +242,7 @@ namespace MediaBrowser.Api.UserLibrary if (fields.Contains(ItemFields.ItemCounts)) { - var items = stub.Item2().ToList(); + var items = stub.Items; dto.ChildCount = items.Count; dto.RecentlyAddedItemCount = items.Count(i => i.IsRecentlyAdded(user)); @@ -216,4 +264,48 @@ namespace MediaBrowser.Api.UserLibrary [ApiMember(Name = "SortBy", Description = "Optional. Options: SortName", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string SortBy { get; set; } } + + public class IbnStub + where T : BaseItem + { + private readonly Func> _childItemsFunction; + private List _childItems; + + private readonly Func> _itemFunction; + private Task _itemTask; + + public string Name; + + public BaseItem Item; + private Task _userData; + + public List Items + { + get { return _childItems ?? (_childItems = _childItemsFunction().ToList()); } + } + + public Task GetItem() + { + return _itemTask ?? (_itemTask = _itemFunction(Name)); + } + + public async Task GetUserItemData(IUserDataRepository repo, Guid userId) + { + var item = await GetItem().ConfigureAwait(false); + + if (_userData == null) + { + _userData = repo.GetUserData(userId, item.GetUserDataKey()); + } + + return await _userData.ConfigureAwait(false); + } + + public IbnStub(string name, Func> childItems, Func> item) + { + Name = name; + _childItemsFunction = childItems; + _itemFunction = item; + } + } } -- cgit v1.2.3