Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5457 from cvium/fix_double_artist

Browse Source 
(cherry picked from commit a037e30b4118152be980ac7de218923a54f5895c)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2021-03-12 13:18:12 +01:00 committed by Joshua M. Boniface
parent a65c97c8f7
commit be5f511fc7
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
View File

@ -1,6 +1,8 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using MediaBrowser.Controller.Library;
namespace MediaBrowser.Controller.Entities.Audio namespace MediaBrowser.Controller.Entities.Audio
{ {
@ -23,15 +25,7 @@ namespace MediaBrowser.Controller.Entities.Audio
public static IEnumerable<string> GetAllArtists<T>(this T item) public static IEnumerable<string> GetAllArtists<T>(this T item)
where T : IHasArtist, IHasAlbumArtist where T : IHasArtist, IHasAlbumArtist
{ {
foreach (var i in item.AlbumArtists) return item.AlbumArtists.Concat(item.Artists).DistinctNames();
{
yield return i;
}
foreach (var i in item.Artists)
{
yield return i;
}
} }
} }
} }

8
MediaBrowser.Controller/Library/NameExtensions.cs
View File

@ -10,6 +10,10 @@ namespace MediaBrowser.Controller.Library
{ {
public static class NameExtensions public static class NameExtensions
{ {
public static IEnumerable<string> DistinctNames(this IEnumerable<string> names)
=> names.GroupBy(RemoveDiacritics, StringComparer.OrdinalIgnoreCase)
.Select(x => x.First());
private static string RemoveDiacritics(string? name) private static string RemoveDiacritics(string? name)
{ {
if (name == null) if (name == null)
@ -19,9 +23,5 @@ namespace MediaBrowser.Controller.Library
return name.RemoveDiacritics(); return name.RemoveDiacritics();
} }
public static IEnumerable<string> DistinctNames(this IEnumerable<string> names)
=> names.GroupBy(RemoveDiacritics, StringComparer.OrdinalIgnoreCase)
.Select(x => x.First());
} }
} }