From 0f7f4674784ae76ddafc5b83ffd87add824a8191 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 18 Jan 2014 00:55:21 -0500 Subject: center guide grid --- MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs | 2 +- MediaBrowser.Api/UserLibrary/GenresService.cs | 4 +--- MediaBrowser.Api/UserLibrary/ItemsService.cs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'MediaBrowser.Api/UserLibrary') diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs index 922260c07f..c483a4bb72 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs @@ -144,7 +144,7 @@ namespace MediaBrowser.Api.UserLibrary { var libraryItems = user.RootFolder.GetRecursiveChildren(user).ToList(); - items = items.Where(i => GetLibraryItems(i, libraryItems).All(l => !l.IsPlayed(user))); + items = items.Where(i => GetLibraryItems(i, libraryItems).All(l => l.IsUnplayed(user))); } return items; diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs index d1f7fab014..ded9544f8e 100644 --- a/MediaBrowser.Api/UserLibrary/GenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GenresService.cs @@ -107,9 +107,7 @@ namespace MediaBrowser.Api.UserLibrary /// IEnumerable{Tuple{System.StringFunc{System.Int32}}}. protected override IEnumerable GetAllItems(GetItemsByName request, IEnumerable items) { - var itemsList = items.Where(i => i.Genres != null).ToList(); - - return itemsList + return items .SelectMany(i => i.Genres) .Distinct(StringComparer.OrdinalIgnoreCase) .Select(name => LibraryManager.GetGenre(name)); diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 22149df861..7f80f75acf 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -446,7 +446,7 @@ namespace MediaBrowser.Api.UserLibrary return items.Where(item => item.IsPlayed(currentUser)); case ItemFilter.IsUnplayed: - return items.Where(item => !item.IsPlayed(currentUser)); + return items.Where(item => item.IsUnplayed(currentUser)); case ItemFilter.IsFolder: return items.Where(item => item.IsFolder); -- cgit v1.2.3