Release Polish (#1586)

* Fixed a scaling issue in the epub reader, where images could scale when they shouldn't.

* Removed some caching on library/ api and added more output for a foreign key constraint

* Hooked in Restricted Profile stat collection

* Added a new boolean on age restrictions to explicitly allow unknowns or not. Since unknown is the default state of metadata, if users are allowed access to Unknown, age restricted content could leak.

* Fixed a bug where sometimes series cover generation could fail under conditions where only specials existed.

* Fixed foreign constraint issue when cleaning up series not seen at end of scan loop

* Removed an additional epub parse when scanning and handled merging differently

* Code smell

API/Extensions/EnumerableExtensions.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using API.Data.Misc;
+using API.Entities.Enums;
 
 namespace API.Extensions;
 
@@ -27,4 +29,16 @@ public static class EnumerableExtensions
 
         return list.OrderBy(i => Regex.Replace(selector(i), match => match.Value.PadLeft(maxDigits, '0')), stringComparer ?? StringComparer.CurrentCulture);
     }
+
+    public static IEnumerable<RecentlyAddedSeries> RestrictAgainstAgeRestriction(this IEnumerable<RecentlyAddedSeries> items, AgeRestriction restriction)
+    {
+        if (restriction.AgeRating == AgeRating.NotApplicable) return items;
+        var q = items.Where(s => s.AgeRating <= restriction.AgeRating);
+        if (!restriction.IncludeUnknowns)
+        {
+            return q.Where(s => s.AgeRating != AgeRating.Unknown);
+        }
+
+        return q;
+    }
 }

API/Extensions/QueryableExtensions.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using API.Data.Misc;
 using API.Entities;
 using API.Entities.Enums;
 
@@ -6,18 +7,42 @@ namespace API.Extensions;
 
 public static class QueryableExtensions
 {
-    public static IQueryable<Series> RestrictAgainstAgeRestriction(this IQueryable<Series> queryable, AgeRating rating)
+    public static IQueryable<Series> RestrictAgainstAgeRestriction(this IQueryable<Series> queryable, AgeRestriction restriction)
     {
-        return queryable.Where(s => rating == AgeRating.NotApplicable || s.Metadata.AgeRating <= rating);
+        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
+        var q = queryable.Where(s => s.Metadata.AgeRating <= restriction.AgeRating);
+        if (!restriction.IncludeUnknowns)
+        {
+            return q.Where(s => s.Metadata.AgeRating != AgeRating.Unknown);
+        }
+
+        return q;
     }
 
-    public static IQueryable<CollectionTag> RestrictAgainstAgeRestriction(this IQueryable<CollectionTag> queryable, AgeRating rating)
+    public static IQueryable<CollectionTag> RestrictAgainstAgeRestriction(this IQueryable<CollectionTag> queryable, AgeRestriction restriction)
     {
-        return queryable.Where(c => c.SeriesMetadatas.All(sm => sm.AgeRating <= rating));
+        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
+
+        if (restriction.IncludeUnknowns)
+        {
+            return queryable.Where(c => c.SeriesMetadatas.All(sm =>
+                sm.AgeRating <= restriction.AgeRating));
+        }
+
+        return queryable.Where(c => c.SeriesMetadatas.All(sm =>
+            sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown));
     }
 
-    public static IQueryable<ReadingList> RestrictAgainstAgeRestriction(this IQueryable<ReadingList> queryable, AgeRating rating)
+    public static IQueryable<ReadingList> RestrictAgainstAgeRestriction(this IQueryable<ReadingList> queryable, AgeRestriction restriction)
     {
-        return queryable.Where(rl => rl.AgeRating <= rating);
+        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
+        var q = queryable.Where(rl => rl.AgeRating <= restriction.AgeRating);
+
+        if (!restriction.IncludeUnknowns)
+        {
+            return q.Where(rl => rl.AgeRating != AgeRating.Unknown);
+        }
+
+        return q;
     }
 }

API/Extensions/SeriesExtensions.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using API.Comparators;
 using API.Entities;
 using API.Parser;
 using API.Services.Tasks.Scanner;
@@ -45,4 +46,26 @@ public static class SeriesExtensions
             || info.Series == series.Name || info.Series == series.LocalizedName || info.Series == series.OriginalName
             || Services.Tasks.Scanner.Parser.Parser.Normalize(info.Series) == Services.Tasks.Scanner.Parser.Parser.Normalize(series.OriginalName);
     }
+
+    /// <summary>
+    /// Calculates the Cover Image for the Series
+    /// </summary>
+    /// <param name="series"></param>
+    /// <returns></returns>
+    /// <remarks>This is under the assumption that the Volume already has a Cover Image calculated and set</remarks>
+    public static string GetCoverImage(this Series series)
+    {
+        var volumes = series.Volumes ?? new List<Volume>();
+        var firstVolume = volumes.GetCoverImage(series.Format);
+        string coverImage = null;
+
+        var chapters = firstVolume.Chapters.OrderBy(c => double.Parse(c.Number), ChapterSortComparerZeroFirst.Default).ToList();
+        if (chapters.Count > 1 && chapters.Any(c => c.IsSpecial))
+        {
+            coverImage = chapters.FirstOrDefault(c => !c.IsSpecial)?.CoverImage ?? chapters.First().CoverImage;
+            firstVolume = null;
+        }
+
+        return firstVolume?.CoverImage ?? coverImage;
+    }
 }