new Artist entity

MediaBrowser.Api/UserLibrary/GenresService.cs

@@ -1,11 +1,12 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 using ServiceStack.ServiceHost;
 using System;
 using System.Collections.Generic;
@@ -17,17 +18,13 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class GetGenres
     /// </summary>
-    [Route("/Users/{UserId}/Items/{ParentId}/Genres", "GET")]
-    [Route("/Users/{UserId}/Items/Root/Genres", "GET")]
+    [Route("/Genres", "GET")]
     [Api(Description = "Gets all genres from a given item, folder, or the entire library")]
     public class GetGenres : GetItemsByName
     {
     }
 
-    /// <summary>
-    /// Class GetGenreItemCounts
-    /// </summary>
-    [Route("/Users/{UserId}/Genres/{Name}/Counts", "GET")]
+    [Route("/Genres/{Name}/Counts", "GET")]
     [Api(Description = "Gets item counts of library items that a genre appears in")]
     public class GetGenreItemCounts : IReturn<ItemByNameCounts>
     {
@@ -35,8 +32,8 @@ namespace MediaBrowser.Api.UserLibrary
         /// Gets or sets the user id.
         /// </summary>
         /// <value>The user id.</value>
-        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public Guid UserId { get; set; }
+        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public Guid? UserId { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
@@ -45,6 +42,28 @@ namespace MediaBrowser.Api.UserLibrary
         [ApiMember(Name = "Name", Description = "The genre name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         public string Name { get; set; }
     }
+
+    /// <summary>
+    /// Class GetGenre
+    /// </summary>
+    [Route("/Genres/{Name}", "GET")]
+    [Api(Description = "Gets a genre, by name")]
+    public class GetGenre : IReturn<BaseItemDto>
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        [ApiMember(Name = "Name", Description = "The genre name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        [ApiMember(Name = "UserId", Description = "Optional. Filter by user id, and attach user data", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public Guid? UserId { get; set; }
+    }
     
     /// <summary>
     /// Class GenresService
@@ -56,6 +75,80 @@ namespace MediaBrowser.Api.UserLibrary
         {
         }
 
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetGenre request)
+        {
+            var result = GetItem(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets the item.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>Task{BaseItemDto}.</returns>
+        private async Task<BaseItemDto> GetItem(GetGenre request)
+        {
+            var item = await LibraryManager.GetGenre(request.Name).ConfigureAwait(false);
+
+            // Get everything
+            var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true));
+
+            var builder = new DtoBuilder(Logger, LibraryManager, UserDataRepository);
+
+            if (request.UserId.HasValue)
+            {
+                var user = UserManager.GetUserById(request.UserId.Value);
+
+                return await builder.GetBaseItemDto(item, user, fields.ToList()).ConfigureAwait(false);
+            }
+
+            return await builder.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+        }
+       
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetGenres request)
+        {
+            var result = GetResult(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets all items.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
+        protected override IEnumerable<IbnStub<Genre>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items)
+        {
+            var itemsList = items.Where(i => i.Genres != null).ToList();
+
+            return itemsList
+                .SelectMany(i => i.Genres)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .Select(name => new IbnStub<Genre>(name, () => itemsList.Where(i => i.Genres.Contains(name, StringComparer.OrdinalIgnoreCase)), GetEntity));
+        }
+
+        /// <summary>
+        /// Gets the entity.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>Task{Genre}.</returns>
+        protected Task<Genre> GetEntity(string name)
+        {
+            return LibraryManager.GetGenre(name);
+        }
+
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -63,9 +156,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// <returns>System.Object.</returns>
         public object Get(GetGenreItemCounts request)
         {
-            var user = UserManager.GetUserById(request.UserId);
-
-            var items = user.RootFolder.GetRecursiveChildren(user).Where(i => i.Genres != null && i.Genres.Contains(request.Name, StringComparer.OrdinalIgnoreCase)).ToList();
+            var items = GetItems(request.UserId).Where(i => i.Genres != null && i.Genres.Contains(request.Name, StringComparer.OrdinalIgnoreCase)).ToList();
 
             var counts = new ItemByNameCounts
             {
@@ -86,44 +177,5 @@ namespace MediaBrowser.Api.UserLibrary
 
             return ToOptimizedResult(counts);
         }
-        
-        /// <summary>
-        /// Gets the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>System.Object.</returns>
-        public object Get(GetGenres request)
-        {
-            var result = GetResult(request).Result;
-
-            return ToOptimizedResult(result);
-        }
-
-        /// <summary>
-        /// Gets all items.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <param name="items">The items.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
-        protected override IEnumerable<IbnStub<Genre>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items, User user)
-        {
-            var itemsList = items.Where(i => i.Genres != null).ToList();
-
-            return itemsList
-                .SelectMany(i => i.Genres)
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .Select(name => new IbnStub<Genre>(name, () => itemsList.Where(i => i.Genres.Contains(name, StringComparer.OrdinalIgnoreCase)), GetEntity));
-        }
-
-        /// <summary>
-        /// Gets the entity.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>Task{Genre}.</returns>
-        protected Task<Genre> GetEntity(string name)
-        {
-            return LibraryManager.GetGenre(name);
-        }
     }
 }