aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/BaseApiService.cs5
-rw-r--r--MediaBrowser.Api/Images/ImageService.cs20
-rw-r--r--MediaBrowser.Api/MediaBrowser.Api.csproj1
-rw-r--r--MediaBrowser.Api/UserLibrary/GenresService.cs9
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemByNameUserDataService.cs12
-rw-r--r--MediaBrowser.Api/UserLibrary/MusicGenresService.cs166
6 files changed, 205 insertions, 8 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 36f8257b33..b2ab395dba 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -110,6 +110,11 @@ namespace MediaBrowser.Api
return libraryManager.GetGenre(DeSlugGenreName(name, libraryManager));
}
+ protected Task<MusicGenre> GetMusicGenre(string name, ILibraryManager libraryManager)
+ {
+ return libraryManager.GetMusicGenre(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 8656d75c0a..56a1e1e170 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -167,6 +167,19 @@ namespace MediaBrowser.Api.Images
public string Name { get; set; }
}
+ [Route("/MusicGenres/{Name}/Images/{Type}", "GET")]
+ [Route("/MusicGenres/{Name}/Images/{Type}/{Index}", "GET")]
+ [Api(Description = "Gets a genre image")]
+ public class GetMusicGenreImage : 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>
@@ -506,6 +519,13 @@ namespace MediaBrowser.Api.Images
return GetImage(request, item);
}
+ public object Get(GetMusicGenreImage request)
+ {
+ var item = GetMusicGenre(request.Name, _libraryManager).Result;
+
+ return GetImage(request, item);
+ }
+
/// <summary>
/// Posts the specified request.
/// </summary>
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index e6352eb6f5..13098b716b 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -107,6 +107,7 @@
<Compile Include="UserLibrary\GenresService.cs" />
<Compile Include="UserLibrary\ItemByNameUserDataService.cs" />
<Compile Include="UserLibrary\ItemsService.cs" />
+ <Compile Include="UserLibrary\MusicGenresService.cs" />
<Compile Include="UserLibrary\PersonsService.cs" />
<Compile Include="UserLibrary\StudiosService.cs" />
<Compile Include="UserLibrary\UserLibraryService.cs" />
diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
index 6dada47322..d44394c4fd 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 835db6a179..42b76e29d9 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 0000000000..81d2849156
--- /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);
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-04 18:05:32 +0000