From 2173ab0f9fcabfaf889c2c25755f67cbdfafb021 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 9 Aug 2013 11:55:22 -0400 Subject: [PATCH] Added instant mixes --- MediaBrowser.Api/AlbumsService.cs | 2 +- MediaBrowser.Api/GamesService.cs | 2 +- MediaBrowser.Api/InstantMixService.cs | 141 ++++++++++++++++++++++ MediaBrowser.Api/MediaBrowser.Api.csproj | 1 + MediaBrowser.Api/MoviesService.cs | 2 +- MediaBrowser.Api/SimilarItemsHelper.cs | 26 ++-- MediaBrowser.Api/TrailersService.cs | 2 +- MediaBrowser.Api/TvShowsService.cs | 2 +- MediaBrowser.WebDashboard/ApiClient.js | 44 +++++++ MediaBrowser.WebDashboard/packages.config | 2 +- 10 files changed, 207 insertions(+), 17 deletions(-) create mode 100644 MediaBrowser.Api/InstantMixService.cs diff --git a/MediaBrowser.Api/AlbumsService.cs b/MediaBrowser.Api/AlbumsService.cs index c1a476e09b..cbdf1923ba 100644 --- a/MediaBrowser.Api/AlbumsService.cs +++ b/MediaBrowser.Api/AlbumsService.cs @@ -10,7 +10,7 @@ namespace MediaBrowser.Api { [Route("/Albums/{Id}/Similar", "GET")] [Api(Description = "Finds albums similar to a given album.")] - public class GetSimilarAlbums : BaseGetSimilarItems + public class GetSimilarAlbums : BaseGetSimilarItemsFromItem { } diff --git a/MediaBrowser.Api/GamesService.cs b/MediaBrowser.Api/GamesService.cs index 0073397dd2..d88840e80c 100644 --- a/MediaBrowser.Api/GamesService.cs +++ b/MediaBrowser.Api/GamesService.cs @@ -10,7 +10,7 @@ namespace MediaBrowser.Api /// [Route("/Games/{Id}/Similar", "GET")] [Api(Description = "Finds games similar to a given game.")] - public class GetSimilarGames : BaseGetSimilarItems + public class GetSimilarGames : BaseGetSimilarItemsFromItem { } diff --git a/MediaBrowser.Api/InstantMixService.cs b/MediaBrowser.Api/InstantMixService.cs new file mode 100644 index 0000000000..d8a8d7db54 --- /dev/null +++ b/MediaBrowser.Api/InstantMixService.cs @@ -0,0 +1,141 @@ +using MediaBrowser.Controller.Dto; +using MediaBrowser.Controller.Entities.Audio; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.Querying; +using ServiceStack.ServiceHost; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MediaBrowser.Api +{ + [Route("/Songs/{Id}/InstantMix", "GET")] + [Api(Description = "Creates an instant playlist based on a given song")] + public class GetInstantMixFromSong : BaseGetSimilarItemsFromItem + { + } + + [Route("/Albums/{Id}/InstantMix", "GET")] + [Api(Description = "Creates an instant playlist based on a given album")] + public class GetInstantMixFromAlbum : BaseGetSimilarItemsFromItem + { + } + + [Route("/Artists/{Name}/InstantMix", "GET")] + [Api(Description = "Creates an instant playlist based on a given artist")] + public class GetInstantMixFromArtist : BaseGetSimilarItems + { + [ApiMember(Name = "Name", Description = "The artist name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] + public string Name { get; set; } + } + + [Route("/MusicGenres/{Name}/InstantMix", "GET")] + [Api(Description = "Creates an instant playlist based on a music genre")] + public class GetInstantMixFromMusicGenre : BaseGetSimilarItems + { + [ApiMember(Name = "Name", Description = "The genre name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] + public string Name { get; set; } + } + + public class InstantMixService : BaseApiService + { + private readonly IUserManager _userManager; + private readonly IUserDataRepository _userDataRepository; + private readonly ILibraryManager _libraryManager; + + private readonly IItemRepository _itemRepo; + + public InstantMixService(IUserManager userManager, IUserDataRepository userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo) + { + _userManager = userManager; + _userDataRepository = userDataRepository; + _libraryManager = libraryManager; + _itemRepo = itemRepo; + } + + public object Get(GetInstantMixFromSong request) + { + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager); + + var result = GetInstantMixResult(request, item.Genres).Result; + + return ToOptimizedResult(result); + } + + public object Get(GetInstantMixFromAlbum request) + { + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager); + + var result = GetInstantMixResult(request, item.Genres).Result; + + return ToOptimizedResult(result); + } + + public object Get(GetInstantMixFromMusicGenre request) + { + var genre = GetMusicGenre(request.Name, _libraryManager).Result; + + var result = GetInstantMixResult(request, new[] { genre.Name }).Result; + + return ToOptimizedResult(result); + } + + public object Get(GetInstantMixFromArtist request) + { + var artist = GetArtist(request.Name, _libraryManager).Result; + + var genres = _libraryManager.RootFolder + .RecursiveChildren + .OfType