diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/BaseApiService.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Api/Images/ImageService.cs | 22 | ||||
| -rw-r--r-- | MediaBrowser.Api/ItemRefreshService.cs | 32 | ||||
| -rw-r--r-- | MediaBrowser.Api/ItemUpdateService.cs | 24 | ||||
| -rw-r--r-- | MediaBrowser.Api/MediaBrowser.Api.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/GameGenresService.cs | 166 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs | 11 |
7 files changed, 260 insertions, 1 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index b2ab395db..5147e93db 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -115,6 +115,11 @@ namespace MediaBrowser.Api return libraryManager.GetMusicGenre(DeSlugGenreName(name, libraryManager)); } + protected Task<GameGenre> GetGameGenre(string name, ILibraryManager libraryManager) + { + return libraryManager.GetGameGenre(DeSlugGenreName(name, libraryManager)); + } + protected Task<Person> GetPerson(string name, ILibraryManager libraryManager) { return libraryManager.GetPerson(DeSlugPersonName(name, libraryManager)); diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 70f87e470..e7b4a42c9 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -180,7 +180,20 @@ namespace MediaBrowser.Api.Images [ApiMember(Name = "Name", Description = "Genre name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] public string Name { get; set; } } - + + [Route("/GameGenres/{Name}/Images/{Type}", "GET")] + [Route("/GameGenres/{Name}/Images/{Type}/{Index}", "GET")] + [Api(Description = "Gets a genre image")] + public class GetGameGenreImage : ImageRequest + { + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + [ApiMember(Name = "Name", Description = "Genre name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] + public string Name { get; set; } + } + /// <summary> /// Class GetYearImage /// </summary> @@ -530,6 +543,13 @@ namespace MediaBrowser.Api.Images return GetImage(request, item); } + public object Get(GetGameGenreImage request) + { + var item = GetGameGenre(request.Name, _libraryManager).Result; + + return GetImage(request, item); + } + /// <summary> /// Posts the specified request. /// </summary> diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs index 71f07fb35..f6e5a2cba 100644 --- a/MediaBrowser.Api/ItemRefreshService.cs +++ b/MediaBrowser.Api/ItemRefreshService.cs @@ -56,6 +56,17 @@ namespace MediaBrowser.Api public string Name { get; set; } } + [Route("/GameGenres/{Name}/Refresh", "POST")] + [Api(Description = "Refreshes metadata for a game genre")] + public class RefreshGameGenre : IReturnVoid + { + [ApiMember(Name = "Forced", Description = "Indicates if a normal or forced refresh should occur.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")] + public bool Forced { get; set; } + + [ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] + public string Name { get; set; } + } + [Route("/Persons/{Name}/Refresh", "POST")] [Api(Description = "Refreshes metadata for a person")] public class RefreshPerson : IReturnVoid @@ -152,6 +163,27 @@ namespace MediaBrowser.Api } } + public void Post(RefreshGameGenre request) + { + var task = RefreshGameGenre(request); + + Task.WaitAll(task); + } + + private async Task RefreshGameGenre(RefreshGameGenre request) + { + var item = await GetGameGenre(request.Name, _libraryManager).ConfigureAwait(false); + + try + { + await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false); + } + catch (Exception ex) + { + Logger.ErrorException("Error refreshing library", ex); + } + } + public void Post(RefreshPerson request) { var task = RefreshPerson(request); diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs index 42a2a3b5c..71f1e0ddc 100644 --- a/MediaBrowser.Api/ItemUpdateService.cs +++ b/MediaBrowser.Api/ItemUpdateService.cs @@ -53,6 +53,14 @@ namespace MediaBrowser.Api public string GenreName { get; set; } } + [Route("/GameGenres/{GenreName}", "POST")] + [Api(("Updates a game genre"))] + public class UpdateGameGenre : BaseItemDto, IReturnVoid + { + [ApiMember(Name = "GenreName", Description = "The name of the item", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] + public string GenreName { get; set; } + } + [Route("/Genres/{GenreName}", "POST")] [Api(("Updates a genre"))] public class UpdateGenre : BaseItemDto, IReturnVoid @@ -152,6 +160,22 @@ namespace MediaBrowser.Api await _libraryManager.UpdateItem(item, ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false); } + public void Post(UpdateGameGenre request) + { + var task = UpdateItem(request); + + Task.WaitAll(task); + } + + private async Task UpdateItem(UpdateGameGenre request) + { + var item = await _libraryManager.GetGameGenre(request.GenreName).ConfigureAwait(false); + + UpdateItem(request, item); + + await _libraryManager.UpdateItem(item, ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false); + } + public void Post(UpdateGenre request) { var task = UpdateItem(request); diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 60583f446..d22fa5c8a 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -106,6 +106,7 @@ <Compile Include="UserLibrary\ArtistsService.cs" /> <Compile Include="UserLibrary\BaseItemsByNameService.cs" /> <Compile Include="UserLibrary\BaseItemsRequest.cs" /> + <Compile Include="UserLibrary\GameGenresService.cs" /> <Compile Include="UserLibrary\GenresService.cs" /> <Compile Include="UserLibrary\ItemByNameUserDataService.cs" /> <Compile Include="UserLibrary\ItemsService.cs" /> diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs new file mode 100644 index 000000000..fc99ce6b8 --- /dev/null +++ b/MediaBrowser.Api/UserLibrary/GameGenresService.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("/GameGenres", "GET")] + [Api(Description = "Gets all Game genres from a given item, folder, or the entire library")] + public class GetGameGenres : GetItemsByName + { + public GetGameGenres() + { + IncludeItemTypes = typeof(Audio).Name; + } + } + + [Route("/GameGenres/{Name}/Counts", "GET")] + [Api(Description = "Gets item counts of library items that a genre appears in")] + public class GetGameGenreItemCounts : 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("/GameGenres/{Name}", "GET")] + [Api(Description = "Gets a Game genre, by name")] + public class GetGameGenre : 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 GameGenresService : BaseItemsByNameService<GameGenre> + { + public GameGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataRepository userDataRepository, IItemRepository itemRepo) + : base(userManager, libraryManager, userDataRepository, itemRepo) + { + } + + /// <summary> + /// Gets the specified request. + /// </summary> + /// <param name="request">The request.</param> + /// <returns>System.Object.</returns> + public object Get(GetGameGenre 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(GetGameGenre request) + { + var item = await GetGameGenre(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, ItemRepository); + + 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(GetGameGenres 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<GameGenre>> 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<GameGenre>(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<GameGenre> GetEntity(string name) + { + return LibraryManager.GetGameGenre(name); + } + + /// <summary> + /// Gets the specified request. + /// </summary> + /// <param name="request">The request.</param> + /// <returns>System.Object.</returns> + public object Get(GetGameGenreItemCounts 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, + + GameCount = items.OfType<Game>().Count() + }; + + return ToOptimizedResult(counts); + } + } +} diff --git a/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs b/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs index eaa65dc2d..07885346b 100644 --- a/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs @@ -17,6 +17,7 @@ namespace MediaBrowser.Api.UserLibrary [Route("/Users/{UserId}/Favorites/Studios/{Name}", "POST")] [Route("/Users/{UserId}/Favorites/Genres/{Name}", "POST")] [Route("/Users/{UserId}/Favorites/MusicGenres/{Name}", "POST")] + [Route("/Users/{UserId}/Favorites/GameGenres/{Name}", "POST")] [Api(Description = "Marks something as a favorite")] public class MarkItemByNameFavorite : IReturnVoid { @@ -43,6 +44,7 @@ namespace MediaBrowser.Api.UserLibrary [Route("/Users/{UserId}/Favorites/Studios/{Name}", "DELETE")] [Route("/Users/{UserId}/Favorites/Genres/{Name}", "DELETE")] [Route("/Users/{UserId}/Favorites/MusicGenres/{Name}", "DELETE")] + [Route("/Users/{UserId}/Favorites/GameGenres/{Name}", "DELETE")] [Api(Description = "Unmarks something as a favorite")] public class UnmarkItemByNameFavorite : IReturnVoid { @@ -102,6 +104,7 @@ namespace MediaBrowser.Api.UserLibrary [Route("/Users/{UserId}/Ratings/Studios/{Name}", "DELETE")] [Route("/Users/{UserId}/Ratings/Genres/{Name}", "DELETE")] [Route("/Users/{UserId}/Ratings/MusicGenres/{Name}", "DELETE")] + [Route("/Users/{UserId}/Ratings/GameGenres/{Name}", "DELETE")] [Api(Description = "Deletes a user's saved personal rating for an item")] public class DeleteItemByNameRating : IReturnVoid { @@ -230,6 +233,10 @@ namespace MediaBrowser.Api.UserLibrary { item = await GetMusicGenre(name, LibraryManager).ConfigureAwait(false); } + else if (string.Equals(type, "GameGenres")) + { + item = await GetGameGenre(name, LibraryManager).ConfigureAwait(false); + } else if (string.Equals(type, "Studios")) { item = await GetStudio(name, LibraryManager).ConfigureAwait(false); @@ -278,6 +285,10 @@ namespace MediaBrowser.Api.UserLibrary { item = await GetMusicGenre(name, LibraryManager).ConfigureAwait(false); } + else if (string.Equals(type, "GameGenres")) + { + item = await GetGameGenre(name, LibraryManager).ConfigureAwait(false); + } else if (string.Equals(type, "Studios")) { item = await GetStudio(name, LibraryManager).ConfigureAwait(false); |
