Replace LINQ with more direct access method
Also rework documentation
This commit is contained in:
parent
c4c245a552
commit
71fc475bb3
|
@ -1,5 +1,4 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
|
||||||
using Jellyfin.Data.Enums;
|
using Jellyfin.Data.Enums;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
using MediaBrowser.Controller.Entities.Audio;
|
||||||
|
@ -9,37 +8,35 @@ using MediaBrowser.Model.Querying;
|
||||||
namespace Emby.Server.Implementations.Sorting
|
namespace Emby.Server.Implementations.Sorting
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class AlbumArtistComparer.
|
/// Allows comparing artists of albums. Only the first artist of each album is considered.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class AlbumArtistComparer : IBaseItemComparer
|
public class AlbumArtistComparer : IBaseItemComparer
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the name.
|
/// Gets the item type this comparer compares.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The name.</value>
|
|
||||||
public ItemSortBy Type => ItemSortBy.AlbumArtist;
|
public ItemSortBy Type => ItemSortBy.AlbumArtist;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Compares the specified x.
|
/// Compares the specified arguments on their primary artist.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="x">The x.</param>
|
/// <param name="x">First item to compare.</param>
|
||||||
/// <param name="y">The y.</param>
|
/// <param name="y">Second item to compare.</param>
|
||||||
/// <returns>System.Int32.</returns>
|
/// <returns>Zero if equal, else negative or positive number to indicate order.</returns>
|
||||||
public int Compare(BaseItem? x, BaseItem? y)
|
public int Compare(BaseItem? x, BaseItem? y)
|
||||||
{
|
{
|
||||||
return string.Compare(GetValue(x), GetValue(y), StringComparison.OrdinalIgnoreCase);
|
return string.Compare(GetFirstAlbumArtist(x), GetFirstAlbumArtist(y), StringComparison.OrdinalIgnoreCase);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
private static string? GetFirstAlbumArtist(BaseItem? x)
|
||||||
/// Gets the value.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="x">The x.</param>
|
|
||||||
/// <returns>System.String.</returns>
|
|
||||||
private static string? GetValue(BaseItem? x)
|
|
||||||
{
|
{
|
||||||
var audio = x as IHasAlbumArtist;
|
if (x is IHasAlbumArtist audio
|
||||||
|
&& audio.AlbumArtists.Count != 0)
|
||||||
|
{
|
||||||
|
return audio.AlbumArtists[0];
|
||||||
|
}
|
||||||
|
|
||||||
return audio?.AlbumArtists.FirstOrDefault();
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user