From 1c9adcb50bfe698fa31b865e5d49e6be68c6711b Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Sun, 28 Apr 2024 15:18:19 +0200
Subject: [PATCH] fix sort order for continue point

---
 modules/services/kavita-patches.diff | 31 ++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/modules/services/kavita-patches.diff b/modules/services/kavita-patches.diff
index f32692e..1adcbb3 100644
--- a/modules/services/kavita-patches.diff
+++ b/modules/services/kavita-patches.diff
@@ -1,5 +1,5 @@
 diff --git a/API/Services/SeriesService.cs b/API/Services/SeriesService.cs
-index 5294ebaf..5d0963e9 100644
+index 5294ebaf..d2b8f45c 100644
 --- a/API/Services/SeriesService.cs
 +++ b/API/Services/SeriesService.cs
 @@ -465,7 +465,7 @@ public class SeriesService : ISeriesService
@@ -7,7 +7,34 @@ index 5294ebaf..5d0963e9 100644
                      return c;
                  })
 -                .OrderBy(c => c.SortOrder))
-+                .OrderBy(c => c.Title))
++                .OrderBy(c => c.Title.StartsWith("[") ? c.Title : c.SortOrder.ToString()))
                  .ToList();
  
          foreach (var chapter in chapters)
+diff --git a/API/Services/ReaderService.cs b/API/Services/ReaderService.cs
+index 5daf97f6..ae4e328a 100644
+--- a/API/Services/ReaderService.cs
++++ b/API/Services/ReaderService.cs
+@@ -1,4 +1,4 @@
+-using System;
++using System;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Globalization;
+@@ -572,7 +572,7 @@ public class ReaderService : IReaderService
+             // We only have a loose leaf or Special left
+ 
+             var chapters = volumes.First(v => v.IsLooseLeaf() || v.IsSpecial()).Chapters
+-                .OrderBy(c => c.SortOrder)
++                .OrderBy(c => c.Title.StartsWith("[") ? c.Title : c.SortOrder.ToString())
+                 .ToList();
+ 
+             // If there are specials, then return the first Non-special
+@@ -606,7 +606,7 @@ public class ReaderService : IReaderService
+ 
+         // Order with volume 0 last so we prefer the natural order
+         return FindNextReadingChapter(volumes.OrderBy(v => v.MinNumber, _chapterSortComparerDefaultLast)
+-                                             .SelectMany(v => v.Chapters.OrderBy(c => c.SortOrder))
++                                             .SelectMany(v => v.Chapters.OrderBy(c => c.Title.StartsWith("[") ? c.Title : c.SortOrder.ToString()))
+                                              .ToList());
+     }