Comic Rework, New Scanner, Foundation Overahul (is this a full release?) (#2780)

API/Entities/Chapter.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using API.Entities.Enums;
 using API.Entities.Interfaces;
+using API.Extensions;
 using API.Services.Tasks.Scanner.Parser;
 
 namespace API.Entities;
@@ -10,14 +12,27 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate
 {
     public int Id { get; set; }
     /// <summary>
-    /// Range of numbers. Chapter 2-4 -> "2-4". Chapter 2 -> "2".
+    /// Range of numbers. Chapter 2-4 -> "2-4". Chapter 2 -> "2". If the chapter is a special, will return the Special Name
     /// </summary>
     public required string Range { get; set; }
     /// <summary>
     /// Smallest number of the Range. Can be a partial like Chapter 4.5
     /// </summary>
+    [Obsolete("Use MinNumber and MaxNumber instead")]
     public required string Number { get; set; }
     /// <summary>
+    /// Minimum Chapter Number.
+    /// </summary>
+    public float MinNumber { get; set; }
+    /// <summary>
+    /// Maximum Chapter Number
+    /// </summary>
+    public float MaxNumber { get; set; }
+    /// <summary>
+    /// The sorting order of the Chapter. Inherits from MinNumber, but can be overridden.
+    /// </summary>
+    public float SortOrder { get; set; }
+    /// <summary>
     /// The files that represent this Chapter
     /// </summary>
     public ICollection<MangaFile> Files { get; set; } = null!;
@@ -44,6 +59,7 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate
     /// Used for books/specials to display custom title. For non-specials/books, will be set to <see cref="Range"/>
     /// </summary>
     public string? Title { get; set; }
+
     /// <summary>
     /// Age Rating for the issue/chapter
     /// </summary>
@@ -130,10 +146,48 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate
         if (IsSpecial)
         {
             Number = Parser.DefaultChapter;
+            MinNumber = Parser.DefaultChapterNumber;
+            MaxNumber = Parser.DefaultChapterNumber;
         }
+        // NOTE: This doesn't work well for all because Pdf usually should use into.Title or even filename
         Title = (IsSpecial && info.Format == MangaFormat.Epub)
             ? info.Title
-            : Range;
+            : Parser.RemoveExtensionIfSupported(Range);
 
+        var specialTreatment = info.IsSpecialInfo();
+        Range = specialTreatment ? info.Filename : info.Chapters;
+    }
+
+    /// <summary>
+    /// Returns the Chapter Number. If the chapter is a range, returns that, formatted.
+    /// </summary>
+    /// <returns></returns>
+    public string GetNumberTitle()
+    {
+        if (MinNumber.Is(MaxNumber))
+        {
+            if (MinNumber.Is(Parser.DefaultChapterNumber) && IsSpecial)
+            {
+                return Parser.RemoveExtensionIfSupported(Title);
+            }
+
+            if (MinNumber.Is(0) && !float.TryParse(Range, out _))
+            {
+                return $"{Range}";
+            }
+
+            return $"{MinNumber}";
+
+        }
+        return $"{MinNumber}-{MaxNumber}";
+    }
+
+    /// <summary>
+    /// Is the Chapter representing a single Volume (volume 1.cbz). If so, Min/Max will be Default and will not be special
+    /// </summary>
+    /// <returns></returns>
+    public bool IsSingleVolumeChapter()
+    {
+        return MinNumber.Is(Parser.DefaultChapterNumber) && !IsSpecial;
     }
 }

API/Entities/Enums/LibraryType.cs

@@ -29,4 +29,10 @@ public enum LibraryType
     /// </summary>
     [Description("Light Novel")]
     LightNovel = 4,
+    /// <summary>
+    /// Uses Comic regex for filename parsing, uses ComicVine type of Parsing. Will replace Comic type in future
+    /// </summary>
+    [Description("Comic (ComicVine)")]
+    ComicVine = 5,
+
 }

API/Entities/Enums/PersonRole.cs

@@ -24,7 +24,11 @@ public enum PersonRole
     /// <summary>
     /// The Translator
     /// </summary>
-    Translator = 12
-
-
+    Translator = 12,
+    /// <summary>
+    /// The publisher before another Publisher bought
+    /// </summary>
+    Imprint = 13,
+    Team = 14,
+    Location = 15
 }

API/Entities/Enums/RelationKind.cs

@@ -71,6 +71,11 @@ public enum RelationKind
     /// Same story, could be translation, colorization... Different edition of the series
     /// </summary>
     [Description("Edition")]
-    Edition = 13
+    Edition = 13,
+    /// <summary>
+    /// The target series is an annual of the Series
+    /// </summary>
+    [Description("Annual")]
+    Annual = 14
 
 }

API/Entities/MangaFile.cs

@@ -13,6 +13,10 @@ public class MangaFile : IEntityDate
 {
     public int Id { get; set; }
     /// <summary>
+    /// The filename without extension
+    /// </summary>
+    public string FileName { get; set; }
+    /// <summary>
     /// Absolute path to the archive file
     /// </summary>
     public required string FilePath { get; set; }

API/Entities/Metadata/SeriesMetadata.cs

@@ -68,14 +68,16 @@ public class SeriesMetadata : IHasConcurrencyToken
     public bool ColoristLocked { get; set; }
     public bool EditorLocked { get; set; }
     public bool InkerLocked { get; set; }
+    public bool ImprintLocked { get; set; }
     public bool LettererLocked { get; set; }
     public bool PencillerLocked { get; set; }
     public bool PublisherLocked { get; set; }
     public bool TranslatorLocked { get; set; }
+    public bool TeamLocked { get; set; }
+    public bool LocationLocked { get; set; }
     public bool CoverArtistLocked { get; set; }
     public bool ReleaseYearLocked { get; set; }
 
-
     // Relationship
     public Series Series { get; set; } = null!;
     public int SeriesId { get; set; }

API/Entities/Series.cs

@@ -64,6 +64,11 @@ public class Series : IEntityDate, IHasReadTimeEstimate
     /// <remarks><see cref="Services.Tasks.Scanner.Parser.Parser.NormalizePath"/> must be used before setting</remarks>
     public string? FolderPath { get; set; }
     /// <summary>
+    /// Lowest path (that is under library root) that contains all files for the series.
+    /// </summary>
+    /// <remarks><see cref="Services.Tasks.Scanner.Parser.Parser.NormalizePath"/> must be used before setting</remarks>
+    public string? LowestFolderPath { get; set; }
+    /// <summary>
     /// Last time the folder was scanned
     /// </summary>
     public DateTime LastFolderScanned { get; set; }

API/Entities/Volume.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using API.Entities.Interfaces;
+using API.Extensions;
+using API.Services.Tasks.Scanner.Parser;
 
 namespace API.Entities;
 
@@ -13,6 +15,10 @@ public class Volume : IEntityDate, IHasReadTimeEstimate
     /// <remarks>For Books with Series_index, this will map to the Series Index.</remarks>
     public required string Name { get; set; }
     /// <summary>
+    /// This is just the original Parsed volume number for lookups
+    /// </summary>
+    public string LookupName { get; set; }
+    /// <summary>
     /// The minimum number in the Name field in Int form
     /// </summary>
     /// <remarks>Removed in v0.7.13.8, this was an int and we need the ability to have 0.5 volumes render on the UI</remarks>
@@ -55,4 +61,17 @@ public class Volume : IEntityDate, IHasReadTimeEstimate
     public Series Series { get; set; } = null!;
     public int SeriesId { get; set; }
 
+    /// <summary>
+    /// Returns the Chapter Number. If the chapter is a range, returns that, formatted.
+    /// </summary>
+    /// <returns></returns>
+    public string GetNumberTitle()
+    {
+        if (MinNumber.Is(MaxNumber))
+        {
+            return $"{MinNumber}";
+        }
+        return $"{MinNumber}-{MaxNumber}";
+    }
+
 }