alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-19 15:16:35 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #16721 from dkanada/music-artists
Some checks failed
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
Tests / run-tests (macos-latest) (push) Has been cancelled
Details
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Details
Tests / run-tests (windows-latest) (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Artifact (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Has been cancelled
Details
Project Automation / Project board (push) Has been cancelled
Details
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details
Stale PR Check / Check PRs with merge conflicts (push) Has been cancelled
Details
Stale Issue Labeler / Check for stale issues (push) Has been cancelled
Details

Browse Source 
return music artists from person endpoints
This commit is contained in:
Bond-009
2026-05-13 19:05:19 +02:00
committed by GitHub
parent 6014ad6ef2 843e0f0c84
commit 3b452c3682
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Jellyfin.Api/Controllers/ArtistsController.cs
View File

@@ -87,6 +87,7 @@ public class ArtistsController : BaseJellyfinApiController
/// <returns>An <see cref="OkResult"/> containing the artists.</returns>
[HttpGet]
[ProducesResponseType(StatusCodes.Status200OK)]
[Obsolete("Use GetPersons")]
public ActionResult<QueryResult<BaseItemDto>> GetArtists(
[FromQuery] double? minCommunityRating,
[FromQuery] int? startIndex,
@@ -258,6 +259,7 @@ public class ArtistsController : BaseJellyfinApiController
/// <returns>An <see cref="OkResult"/> containing the album artists.</returns>
[HttpGet("AlbumArtists")]
[ProducesResponseType(StatusCodes.Status200OK)]
[Obsolete("Use GetPersons")]
public ActionResult<QueryResult<BaseItemDto>> GetAlbumArtists(
[FromQuery] double? minCommunityRating,
[FromQuery] int? startIndex,
@@ -399,6 +401,7 @@ public class ArtistsController : BaseJellyfinApiController
/// <returns>An <see cref="OkResult"/> containing the artist.</returns>
[HttpGet("{name}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[Obsolete("Use GetPerson")]
public ActionResult<BaseItemDto> GetArtistByName([FromRoute, Required] string name, [FromQuery] Guid? userId)
{
userId = RequestHelpers.GetUserId(User, userId);

6
Jellyfin.Server.Implementations/Item/PeopleRepository.cs
View File

@@ -119,7 +119,6 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
.ToArray();
var toAdd = people
.Where(e => e.Type is not PersonKind.Artist && e.Type is not PersonKind.AlbumArtist)
.Where(e => !existingPersons.Any(f => string.Equals(f.Name, e.Name, StringComparison.OrdinalIgnoreCase) && f.PersonType == e.Type.ToString()))
.Select(Map);
context.Peoples.AddRange(toAdd);
@@ -133,11 +132,6 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
foreach (var person in people)
{
if (person.Type == PersonKind.Artist || person.Type == PersonKind.AlbumArtist)
{
continue;
}
var entityPerson = personsEntities.First(e => string.Equals(e.Name, person.Name, StringComparison.OrdinalIgnoreCase) && e.PersonType == person.Type.ToString());
var existingMap = existingMaps.FirstOrDefault(e => string.Equals(e.People.Name, person.Name, StringComparison.OrdinalIgnoreCase) && e.People.PersonType == person.Type.ToString() && e.Role == person.Role);
if (existingMap is null)