5 files changed, 203 insertions, 5 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
new file mode 100644
index 000000000..2b0d1c57d
--- /dev/null
+++ b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Api.HttpHandlers
+{
+    /// <summary>
+    /// Gets a single genre
+    /// </summary>
+    public class GenreHandler : BaseJsonHandler<IBNItem<Genre>>
+    {
+        protected override IBNItem<Genre> GetObjectToSerialize()
+        {
+            Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
+            Guid userId = Guid.Parse(QueryString["userid"]);
+            User user = Kernel.Instance.Users.First(u => u.Id == userId);
+
+            string name = QueryString["name"];
+
+            return GetGenre(parent, user, name);
+        }
+
+        /// <summary>
+        /// Gets a Genre
+        /// </summary>
+        private IBNItem<Genre> GetGenre(Folder parent, User user, string name)
+        {
+            int count = 0;
+
+            // Get all the allowed recursive children
+            IEnumerable<BaseItem> allItems = parent.GetParentalAllowedRecursiveChildren(user);
+
+            foreach (var item in allItems)
+            {
+                if (item.Genres != null && item.Genres.Any(s => s.Equals(name, StringComparison.OrdinalIgnoreCase)))
+                {
+                    count++;
+                }
+            }
+
+            // Get the original entity so that we can also supply the PrimaryImagePath
+            return new IBNItem<Genre>()
+            {
+                Item = Kernel.Instance.ItemController.GetGenre(name),
+                BaseItemCount = count
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
index c0f2e9eb3..1134eb568 100644
--- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Api.HttpHandlers
         /// Gets all genres from all recursive children of a folder
         /// The CategoryInfo class is used to keep track of the number of times each genres appears
         /// </summary>
-        public IEnumerable<IBNItem<Genre>> GetAllGenres(Folder parent, User user)
+        private IEnumerable<IBNItem<Genre>> GetAllGenres(Folder parent, User user)
         {
             Dictionary<string, int> data = new Dictionary<string, int>();
 
diff --git a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
index 513840b81..75cccfac6 100644
--- a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
@@ -1,14 +1,53 @@
-using MediaBrowser.Common.Net.Handlers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Model.DTO;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Api.HttpHandlers
 {
-    public class PersonHandler : BaseJsonHandler<Person>
+    /// <summary>
+    /// Gets a single Person
+    /// </summary>
+    public class PersonHandler : BaseJsonHandler<IBNItem<Person>>
     {
-        protected override Person GetObjectToSerialize()
+        protected override IBNItem<Person> GetObjectToSerialize()
         {
-            return Kernel.Instance.ItemController.GetPerson(QueryString["name"]);
+            Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
+            Guid userId = Guid.Parse(QueryString["userid"]);
+            User user = Kernel.Instance.Users.First(u => u.Id == userId);
+
+            string name = QueryString["name"];
+
+            return GetPerson(parent, user, name);
+        }
+
+        /// <summary>
+        /// Gets a Person
+        /// </summary>
+        private IBNItem<Person> GetPerson(Folder parent, User user, string name)
+        {
+            int count = 0;
+
+            // Get all the allowed recursive children
+            IEnumerable<BaseItem> allItems = parent.GetParentalAllowedRecursiveChildren(user);
+
+            foreach (var item in allItems)
+            {
+                if (item.People != null && item.People.Any(s => s.Name.Equals(name, StringComparison.OrdinalIgnoreCase)))
+                {
+                    count++;
+                }
+            }
+
+            // Get the original entity so that we can also supply the PrimaryImagePath
+            return new IBNItem<Person>()
+            {
+                Item = Kernel.Instance.ItemController.GetPerson(name),
+                BaseItemCount = count
+            };
         }
     }
 }
diff --git a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
new file mode 100644
index 000000000..40daadc70
--- /dev/null
+++ b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Api.HttpHandlers
+{
+    /// <summary>
+    /// Gets a single studio
+    /// </summary>
+    public class StudioHandler : BaseJsonHandler<IBNItem<Studio>>
+    {
+        protected override IBNItem<Studio> GetObjectToSerialize()
+        {
+            Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
+            Guid userId = Guid.Parse(QueryString["userid"]);
+            User user = Kernel.Instance.Users.First(u => u.Id == userId);
+
+            string name = QueryString["name"];
+
+            return GetStudio(parent, user, name);
+        }
+
+        /// <summary>
+        /// Gets a Studio
+        /// </summary>
+        private IBNItem<Studio> GetStudio(Folder parent, User user, string name)
+        {
+            int count = 0;
+
+            // Get all the allowed recursive children
+            IEnumerable<BaseItem> allItems = parent.GetParentalAllowedRecursiveChildren(user);
+
+            foreach (var item in allItems)
+            {
+                if (item.Studios != null && item.Studios.Any(s => s.Equals(name, StringComparison.OrdinalIgnoreCase)))
+                {
+                    count++;
+                }
+            }
+
+            // Get the original entity so that we can also supply the PrimaryImagePath
+            return new IBNItem<Studio>()
+            {
+                Item = Kernel.Instance.ItemController.GetStudio(name),
+                BaseItemCount = count
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Api/HttpHandlers/YearHandler.cs b/MediaBrowser.Api/HttpHandlers/YearHandler.cs
new file mode 100644
index 000000000..89cde9943
--- /dev/null
+++ b/MediaBrowser.Api/HttpHandlers/YearHandler.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Api.HttpHandlers
+{
+    /// <summary>
+    /// Gets a single year
+    /// </summary>
+    public class YearHandler : BaseJsonHandler<IBNItem<Year>>
+    {
+        protected override IBNItem<Year> GetObjectToSerialize()
+        {
+            Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
+            Guid userId = Guid.Parse(QueryString["userid"]);
+            User user = Kernel.Instance.Users.First(u => u.Id == userId);
+
+            string year = QueryString["year"];
+
+            return GetYear(parent, user, int.Parse(year));
+        }
+
+        /// <summary>
+        /// Gets a Year
+        /// </summary>
+        private IBNItem<Year> GetYear(Folder parent, User user, int year)
+        {
+            int count = 0;
+
+            // Get all the allowed recursive children
+            IEnumerable<BaseItem> allItems = parent.GetParentalAllowedRecursiveChildren(user);
+
+            foreach (var item in allItems)
+            {
+                if (item.ProductionYear.HasValue && item.ProductionYear.Value == year)
+                {
+                    count++;
+                }
+            }
+
+            // Get the original entity so that we can also supply the PrimaryImagePath
+            return new IBNItem<Year>()
+            {
+                Item = Kernel.Instance.ItemController.GetYear(year),
+                BaseItemCount = count
+            };
+        }
+    }
+}