Merge pull request #1164 from MediaBrowser/dev

3.0.5724.1

1 files changed, 32 insertions, 3 deletions

diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
index 070246886..d383bd0ad 100644
--- a/MediaBrowser.Api/UserLibrary/GenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GenresService.cs
@@ -1,11 +1,10 @@
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Entities;
 using ServiceStack;
 using System;
 using System.Collections.Generic;
@@ -104,8 +103,38 @@ namespace MediaBrowser.Api.UserLibrary
         /// <param name="request">The request.</param>
         /// <param name="items">The items.</param>
         /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
-        protected override IEnumerable<Genre> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items)
+        protected override IEnumerable<BaseItem> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items)
         {
+            var viewType = GetParentItemViewType(request);
+
+            if (string.Equals(viewType, CollectionType.Music) || string.Equals(viewType, CollectionType.MusicVideos))
+            {
+                return items
+                    .SelectMany(i => i.Genres)
+                    .DistinctNames()
+                    .Select(name => LibraryManager.GetMusicGenre(name));
+            }
+
+            if (string.Equals(viewType, CollectionType.Games))
+            {
+                return items
+                    .SelectMany(i => i.Genres)
+                    .DistinctNames()
+                    .Select(name =>
+                    {
+                        try
+                        {
+                            return LibraryManager.GetGameGenre(name);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.ErrorException("Error getting genre {0}", ex, name);
+                            return null;
+                        }
+                    })
+                    .Where(i => i != null);
+            }
+
             return items
                 .SelectMany(i => i.Genres)
                 .DistinctNames()