added a new MusicGenre entity

3 files changed, 179 insertions, 8 deletions

diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
index 6dada4732..d44394c4f 100644
--- a/MediaBrowser.Api/UserLibrary/GenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GenresService.cs
@@ -1,6 +1,5 @@
 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;
@@ -170,13 +169,7 @@ namespace MediaBrowser.Api.UserLibrary
 
                 SeriesCount = items.OfType<Series>().Count(),
 
-                GameCount = items.OfType<BaseGame>().Count(),
-
-                SongCount = items.OfType<Audio>().Count(),
-
-                AlbumCount = items.OfType<MusicAlbum>().Count(),
-
-                MusicVideoCount = items.OfType<MusicVideo>().Count()
+                GameCount = items.OfType<BaseGame>().Count()
             };
 
             return ToOptimizedResult(counts);
diff --git a/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs b/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs
index 835db6a17..42b76e29d 100644
--- a/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs
@@ -16,6 +16,7 @@ namespace MediaBrowser.Api.UserLibrary
     [Route("/Users/{UserId}/Favorites/Persons/{Name}", "POST")]
     [Route("/Users/{UserId}/Favorites/Studios/{Name}", "POST")]
     [Route("/Users/{UserId}/Favorites/Genres/{Name}", "POST")]
+    [Route("/Users/{UserId}/Favorites/MusicGenres/{Name}", "POST")]
     [Api(Description = "Marks something as a favorite")]
     public class MarkItemByNameFavorite : IReturnVoid
     {
@@ -41,6 +42,7 @@ namespace MediaBrowser.Api.UserLibrary
     [Route("/Users/{UserId}/Favorites/Persons/{Name}", "DELETE")]
     [Route("/Users/{UserId}/Favorites/Studios/{Name}", "DELETE")]
     [Route("/Users/{UserId}/Favorites/Genres/{Name}", "DELETE")]
+    [Route("/Users/{UserId}/Favorites/MusicGenres/{Name}", "DELETE")]
     [Api(Description = "Unmarks something as a favorite")]
     public class UnmarkItemByNameFavorite : IReturnVoid
     {
@@ -66,6 +68,7 @@ namespace MediaBrowser.Api.UserLibrary
     [Route("/Users/{UserId}/Ratings/Persons/{Name}", "POST")]
     [Route("/Users/{UserId}/Ratings/Studios/{Name}", "POST")]
     [Route("/Users/{UserId}/Ratings/Genres/{Name}", "POST")]
+    [Route("/Users/{UserId}/Ratings/MusicGenres/{Name}", "POST")]
     [Api(Description = "Updates a user's rating for an item")]
     public class UpdateItemByNameRating : IReturnVoid
     {
@@ -98,6 +101,7 @@ namespace MediaBrowser.Api.UserLibrary
     [Route("/Users/{UserId}/Ratings/Persons/{Name}", "DELETE")]
     [Route("/Users/{UserId}/Ratings/Studios/{Name}", "DELETE")]
     [Route("/Users/{UserId}/Ratings/Genres/{Name}", "DELETE")]
+    [Route("/Users/{UserId}/Ratings/MusicGenres/{Name}", "DELETE")]
     [Api(Description = "Deletes a user's saved personal rating for an item")]
     public class DeleteItemByNameRating : IReturnVoid
     {
@@ -222,6 +226,10 @@ namespace MediaBrowser.Api.UserLibrary
             {
                 item = await GetGenre(name, LibraryManager).ConfigureAwait(false);
             }
+            else if (string.Equals(type, "MusicGenres"))
+            {
+                item = await GetMusicGenre(name, LibraryManager).ConfigureAwait(false);
+            }
             else if (string.Equals(type, "Studios"))
             {
                 item = await GetStudio(name, LibraryManager).ConfigureAwait(false);
@@ -266,6 +274,10 @@ namespace MediaBrowser.Api.UserLibrary
             {
                 item = await GetGenre(name, LibraryManager).ConfigureAwait(false);
             }
+            else if (string.Equals(type, "MusicGenres"))
+            {
+                item = await GetMusicGenre(name, LibraryManager).ConfigureAwait(false);
+            }
             else if (string.Equals(type, "Studios"))
             {
                 item = await GetStudio(name, LibraryManager).ConfigureAwait(false);
diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
new file mode 100644
index 000000000..81d284915
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
@@ -0,0 +1,166 @@
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    [Route("/MusicGenres", "GET")]
+    [Api(Description = "Gets all music genres from a given item, folder, or the entire library")]
+    public class GetMusicGenres : GetItemsByName
+    {
+    }
+
+    [Route("/MusicGenres/{Name}/Counts", "GET")]
+    [Api(Description = "Gets item counts of library items that a genre appears in")]
+    public class GetMusicGenreItemCounts : IReturn<ItemByNameCounts>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        [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.
+        /// </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; }
+    }
+
+    [Route("/MusicGenres/{Name}", "GET")]
+    [Api(Description = "Gets a music genre, by name")]
+    public class GetMusicGenre : 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; }
+    }
+
+    public class MusicGenresService : BaseItemsByNameService<MusicGenre>
+    {
+        public MusicGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataRepository userDataRepository)
+            : base(userManager, libraryManager, userDataRepository)
+        {
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetMusicGenre 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(GetMusicGenre request)
+        {
+            var item = await GetMusicGenre(request.Name, LibraryManager).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, fields.ToList(), user).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(GetMusicGenres 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<MusicGenre>> 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<MusicGenre>(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<MusicGenre> GetEntity(string name)
+        {
+            return LibraryManager.GetMusicGenre(name);
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetMusicGenreItemCounts request)
+        {
+            var name = DeSlugGenreName(request.Name, LibraryManager);
+
+            var items = GetItems(request.UserId).Where(i => i.Genres != null && i.Genres.Contains(name, StringComparer.OrdinalIgnoreCase)).ToList();
+
+            var counts = new ItemByNameCounts
+            {
+                TotalCount = items.Count,
+
+                SongCount = items.OfType<Audio>().Count(),
+
+                AlbumCount = items.OfType<MusicAlbum>().Count(),
+
+                MusicVideoCount = items.OfType<MusicVideo>().Count()
+            };
+
+            return ToOptimizedResult(counts);
+        }
+    }
+}