From dfa17aec70652d8a21d43c889f08f8c0fd805d09 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 6 Jul 2015 22:25:23 -0400
Subject: update people queries

---
 MediaBrowser.Controller/Entities/Person.cs             |  7 ++++++-
 MediaBrowser.Controller/Entities/UserViewBuilder.cs    |  3 +--
 MediaBrowser.Controller/Library/ILibraryManager.cs     | 14 ++++++++++++++
 MediaBrowser.Controller/Persistence/IItemRepository.cs |  7 +++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs
index 390fcaf804..535574ad90 100644
--- a/MediaBrowser.Controller/Entities/Person.cs
+++ b/MediaBrowser.Controller/Entities/Person.cs
@@ -70,7 +70,12 @@ namespace MediaBrowser.Controller.Entities
 
         public IEnumerable<BaseItem> GetTaggedItems(IEnumerable<BaseItem> inputItems)
         {
-            return inputItems.Where(GetItemFilter());
+            var itemsWithPerson = LibraryManager.GetItemIds(new InternalItemsQuery
+            {
+                Person = Name
+            });
+
+            return inputItems.Where(i => itemsWithPerson.Contains(i.Id));
         }
 
 
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 41e5406e18..7bbe5c39c1 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -1699,8 +1699,7 @@ namespace MediaBrowser.Controller.Entities
                     .Select(i => i == null ? "-1" : i.Name)
                     .ToList();
                
-                if (!(names.Any(
-                        v => libraryManager.GetPeople(item).Select(i => i.Name).Contains(v, StringComparer.OrdinalIgnoreCase))))
+                if (!(names.Any(v => libraryManager.GetPeople(item).Select(i => i.Name).Contains(v, StringComparer.OrdinalIgnoreCase))))
                 {
                     return false;
                 }
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 92028cc1af..58c696d550 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -420,6 +420,13 @@ namespace MediaBrowser.Controller.Library
         /// <returns>List&lt;PersonInfo&gt;.</returns>
         List<PersonInfo> GetPeople(BaseItem item);
 
+        /// <summary>
+        /// Gets the people items.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns>List&lt;Person&gt;.</returns>
+        List<Person> GetPeopleItems(BaseItem item);
+        
         /// <summary>
         /// Gets all people names.
         /// </summary>
@@ -433,5 +440,12 @@ namespace MediaBrowser.Controller.Library
         /// <param name="people">The people.</param>
         /// <returns>Task.</returns>
         Task UpdatePeople(BaseItem item, List<PersonInfo> people);
+
+        /// <summary>
+        /// Gets the item ids.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>List&lt;Guid&gt;.</returns>
+        List<Guid> GetItemIds(InternalItemsQuery query);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index fba5f4c03e..a91a7d3acd 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -162,6 +162,13 @@ namespace MediaBrowser.Controller.Persistence
         /// <param name="people">The people.</param>
         /// <returns>Task.</returns>
         Task UpdatePeople(Guid itemId, List<PersonInfo> people);
+
+        /// <summary>
+        /// Gets the people names.
+        /// </summary>
+        /// <param name="itemId">The item identifier.</param>
+        /// <returns>List&lt;System.String&gt;.</returns>
+        List<string> GetPeopleNames(Guid itemId);
     }
 }
 
-- 
cgit v1.2.3