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

3 files changed, 104 insertions, 0 deletions

diff --git a/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs b/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
new file mode 100644
index 000000000..e39280a10
--- /dev/null
+++ b/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
@@ -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);
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Sorting/ParentIndexNumberComparer.cs b/Emby.Server.Implementations/Sorting/ParentIndexNumberComparer.cs
new file mode 100644
index 000000000..ffc4e0cad
--- /dev/null
+++ b/Emby.Server.Implementations/Sorting/ParentIndexNumberComparer.cs
@@ -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);
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index 0b846bb96..0a28acf37 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -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";
     }
 }