Foundational Rework (#2745)

API/Services/Tasks/Scanner/Parser/DefaultParser.cs

@@ -96,6 +96,7 @@ public class DefaultParser : IDefaultParser
         if (Parser.HasSpecialMarker(fileName))
         {
             ret.IsSpecial = true;
+            ret.SpecialIndex = Parser.ParseSpecialIndex(fileName);
             ret.Chapters = Parser.DefaultChapter;
             ret.Volumes = Parser.LooseLeafVolume;
 
@@ -113,6 +114,12 @@ public class DefaultParser : IDefaultParser
             ret.Series = ret.Series.Substring(0, ret.Series.Length - ".pdf".Length);
         }
 
+        // v0.8.x: Introducing a change where Specials will go in a separate Volume with a reserved number
+        if (ret.IsSpecial)
+        {
+            ret.Volumes = $"{Parser.SpecialVolumeNumber}";
+        }
+
         return ret.Series == string.Empty ? null : ret;
     }
 

API/Services/Tasks/Scanner/Parser/Parser.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
@@ -12,10 +13,16 @@ namespace API.Services.Tasks.Scanner.Parser;
 public static class Parser
 {
     // NOTE: If you change this, don't forget to change in the UI (see Series Detail)
-    public const string DefaultChapter = "0"; // -2147483648
-    public const string LooseLeafVolume = "0";
-    public const int DefaultChapterNumber = 0;
-    public const int LooseLeafVolumeNumber = 0;
+    public const string DefaultChapter = "-100000"; // -2147483648
+    public const string LooseLeafVolume = "-100000";
+    public const int DefaultChapterNumber = -100_000;
+    public const int LooseLeafVolumeNumber = -100_000;
+    /// <summary>
+    /// The Volume Number of Specials to reside in
+    /// </summary>
+    public const int SpecialVolumeNumber = 100_000;
+    public const string SpecialVolume = "100000";
+
     public static readonly TimeSpan RegexTimeout = TimeSpan.FromMilliseconds(500);
 
     public const string ImageFileExtensions = @"^(\.png|\.jpeg|\.jpg|\.webp|\.gif|\.avif)"; // Don't forget to update CoverChooser
@@ -678,6 +685,13 @@ public static class Parser
         return SpecialMarkerRegex.IsMatch(filePath);
     }
 
+    public static int ParseSpecialIndex(string filePath)
+    {
+        var match = SpecialMarkerRegex.Match(filePath).Value.Replace("SP", string.Empty);
+        if (string.IsNullOrEmpty(match)) return 0;
+        return int.Parse(match);
+    }
+
     public static bool IsMangaSpecial(string filePath)
     {
         filePath = ReplaceUnderscores(filePath);
@@ -944,35 +958,52 @@ public static class Parser
     {
         try
         {
-            if (!Regex.IsMatch(range, @"^[\d\-.]+$", MatchOptions, RegexTimeout))
+            // Check if the range string is not null or empty
+            if (string.IsNullOrEmpty(range) || !Regex.IsMatch(range, @"^[\d\-.]+$", MatchOptions, RegexTimeout))
             {
-                return (float) 0.0;
+                return 0.0f;
             }
 
-            var tokens = range.Replace("_", string.Empty).Split("-");
-            return tokens.Min(t => t.AsFloat());
+            // Check if there is a range or not
+            if (Regex.IsMatch(range, @"\d-{1}\d"))
+            {
+
+                var tokens = range.Replace("_", string.Empty).Split("-", StringSplitOptions.RemoveEmptyEntries);
+                return tokens.Min(t => t.AsFloat());
+            }
+
+            return float.Parse(range);
         }
-        catch
+        catch (Exception)
         {
-            return (float) 0.0;
+            return 0.0f;
         }
     }
 
+
     public static float MaxNumberFromRange(string range)
     {
         try
         {
-            if (!Regex.IsMatch(range, @"^[\d\-.]+$", MatchOptions, RegexTimeout))
+            // Check if the range string is not null or empty
+            if (string.IsNullOrEmpty(range) || !Regex.IsMatch(range, @"^[\d\-.]+$", MatchOptions, RegexTimeout))
             {
-                return (float) 0.0;
+                return 0.0f;
             }
 
-            var tokens = range.Replace("_", string.Empty).Split("-");
-            return tokens.Max(t => t.AsFloat());
+            // Check if there is a range or not
+            if (Regex.IsMatch(range, @"\d-{1}\d"))
+            {
+
+                var tokens = range.Replace("_", string.Empty).Split("-", StringSplitOptions.RemoveEmptyEntries);
+                return tokens.Max(t => t.AsFloat());
+            }
+
+            return float.Parse(range);
         }
-        catch
+        catch (Exception)
         {
-            return (float) 0.0;
+            return 0.0f;
         }
     }
 

API/Services/Tasks/Scanner/Parser/ParserInfo.cs

@@ -60,6 +60,10 @@ public class ParserInfo
     /// If the file contains no volume/chapter information or contains Special Keywords <see cref="Parser.MangaSpecialRegex"/>
     /// </summary>
     public bool IsSpecial { get; set; }
+    /// <summary>
+    /// If the file has a Special Marker explicitly, this will contain the index
+    /// </summary>
+    public int SpecialIndex { get; set; } = 0;
 
     /// <summary>
     /// Used for specials or books, stores what the UI should show.
@@ -67,6 +71,12 @@ public class ParserInfo
     /// </summary>
     public string Title { get; set; } = string.Empty;
 
+    /// <summary>
+    /// This can be filled in from ComicInfo.xml during scanning. Will update the SortOrder field on <see cref="Entities.Chapter"/>.
+    /// Falls back to Parsed Chapter number
+    /// </summary>
+    public float IssueOrder { get; set; }
+
     /// <summary>
     /// If the ParserInfo has the IsSpecial tag or both volumes and chapters are default aka 0
     /// </summary>