Merge pull request #7324 from Maxr1998/sort-by-index

This commit is contained in:
Bond-009 2022-03-03 13:55:45 +01:00 committed by GitHub
commit b356c2b212
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 104 additions and 0 deletions

View File

@ -0,0 +1,50 @@
using System;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Querying;
namespace Emby.Server.Implementations.Sorting
{
/// <summary>
/// Class IndexNumberComparer.
/// </summary>
public class IndexNumberComparer : IBaseItemComparer
{
/// <summary>
/// Gets the name.
/// </summary>
/// <value>The name.</value>
public string Name => ItemSortBy.IndexNumber;
/// <summary>
/// Compares the specified x.
/// </summary>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem? x, BaseItem? y)
{
if (x == null)
{
throw new ArgumentNullException(nameof(x));
}
if (y == null)
{
throw new ArgumentNullException(nameof(y));
}
if (!x.IndexNumber.HasValue)
{
return -1;
}
if (!y.IndexNumber.HasValue)
{
return 1;
}
return x.IndexNumber.Value.CompareTo(y.IndexNumber.Value);
}
}
}

View File

@ -0,0 +1,50 @@
using System;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Querying;
namespace Emby.Server.Implementations.Sorting
{
/// <summary>
/// Class ParentIndexNumberComparer.
/// </summary>
public class ParentIndexNumberComparer : IBaseItemComparer
{
/// <summary>
/// Gets the name.
/// </summary>
/// <value>The name.</value>
public string Name => ItemSortBy.ParentIndexNumber;
/// <summary>
/// Compares the specified x.
/// </summary>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem? x, BaseItem? y)
{
if (x == null)
{
throw new ArgumentNullException(nameof(x));
}
if (y == null)
{
throw new ArgumentNullException(nameof(y));
}
if (!x.ParentIndexNumber.HasValue)
{
return -1;
}
if (!y.ParentIndexNumber.HasValue)
{
return 1;
}
return x.ParentIndexNumber.Value.CompareTo(y.ParentIndexNumber.Value);
}
}
}

View File

@ -102,5 +102,9 @@ namespace MediaBrowser.Model.Querying
public const string DateLastContentAdded = "DateLastContentAdded";
public const string SeriesDatePlayed = "SeriesDatePlayed";
public const string ParentIndexNumber = "ParentIndexNumber";
public const string IndexNumber = "IndexNumber";
}
}