diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-02 15:25:16 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-02 15:25:16 -0400 |
| commit | e2562879d86aafc1063e37bfd353c22309e8e237 (patch) | |
| tree | d5d7479281f85fc47d24d8c95a2ce29a3a146d8b /MediaBrowser.Api/UserLibrary/ItemsService.cs | |
| parent | b4dd8a210629bc74445f106e2379b986af9520c5 (diff) | |
Moved userdata to user manager to resolve concurrency issues. must delete userdata and displaypreferences db files.
Diffstat (limited to 'MediaBrowser.Api/UserLibrary/ItemsService.cs')
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index e977c2c55..a74516fa2 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -241,12 +241,15 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>IEnumerable{BaseItem}.</returns> private IEnumerable<BaseItem> ApplyFilter(IEnumerable<BaseItem> items, ItemFilter filter, User user) { + // Avoids implicitly captured closure + var currentUser = user; + switch (filter) { case ItemFilter.Likes: return items.Where(item => { - var userdata = item.GetUserData(user, false); + var userdata = _userManager.GetUserData(user.Id, item.UserDataId).Result; return userdata != null && userdata.Likes.HasValue && userdata.Likes.Value; }); @@ -254,7 +257,7 @@ namespace MediaBrowser.Api.UserLibrary case ItemFilter.Dislikes: return items.Where(item => { - var userdata = item.GetUserData(user, false); + var userdata = _userManager.GetUserData(user.Id, item.UserDataId).Result; return userdata != null && userdata.Likes.HasValue && !userdata.Likes.Value; }); @@ -262,18 +265,18 @@ namespace MediaBrowser.Api.UserLibrary case ItemFilter.IsFavorite: return items.Where(item => { - var userdata = item.GetUserData(user, false); + var userdata = _userManager.GetUserData(user.Id, item.UserDataId).Result; return userdata != null && userdata.IsFavorite; }); case ItemFilter.IsRecentlyAdded: - return items.Where(item => item.IsRecentlyAdded(user)); + return items.Where(item => item.IsRecentlyAdded(currentUser)); case ItemFilter.IsResumable: return items.Where(item => { - var userdata = item.GetUserData(user, false); + var userdata = _userManager.GetUserData(user.Id, item.UserDataId).Result; return userdata != null && userdata.PlaybackPositionTicks > 0; }); @@ -281,7 +284,7 @@ namespace MediaBrowser.Api.UserLibrary case ItemFilter.IsPlayed: return items.Where(item => { - var userdata = item.GetUserData(user, false); + var userdata = _userManager.GetUserData(user.Id, item.UserDataId).Result; return userdata != null && userdata.PlayCount > 0; }); @@ -289,7 +292,7 @@ namespace MediaBrowser.Api.UserLibrary case ItemFilter.IsUnplayed: return items.Where(item => { - var userdata = item.GetUserData(user, false); + var userdata = _userManager.GetUserData(user.Id, item.UserDataId).Result; return userdata == null || userdata.PlayCount == 0; }); |