fix: fix specials placement by air date

- Fixed specials that should had been placed within a season before all episodes. - Closes #66
ShokoAnime · Aug 19, 2024 · 4b92e26 · 4b92e26
1 parent e481000
commit 4b92e26
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 12 deletions.
diff --git a/Shokofin/API/Info/SeasonInfo.cs b/Shokofin/API/Info/SeasonInfo.cs
@@ -80,6 +80,11 @@ public class SeasonInfo
     /// </summary>
     public readonly List<EpisodeInfo> ExtrasList;
 
+    /// <summary>
+    /// A list of special episodes that come before normal episodes.
+    /// </summary>
+    public readonly IReadOnlySet<string> SpecialsBeforeEpisodes;
+
     /// <summary>
     /// A dictionary holding mappings for the previous normal episode for every special episode in a series.
     /// </summary>
@@ -118,6 +123,7 @@ public SeasonInfo(Series series, SeriesType? customType, IEnumerable<string> ext
             .Where(r => r.RelatedIDs.Shoko.HasValue)
             .DistinctBy(r => r.RelatedIDs.Shoko!.Value)
             .ToDictionary(r => r.RelatedIDs.Shoko!.Value.ToString(), r => r.Type);
+        var specialsBeforeEpisodes = new HashSet<string>();
         var specialsAnchorDictionary = new Dictionary<EpisodeInfo, EpisodeInfo>();
         var specialsList = new List<EpisodeInfo>();
         var episodesList = new List<EpisodeInfo>();
@@ -126,7 +132,7 @@ public SeasonInfo(Series series, SeriesType? customType, IEnumerable<string> ext
 
         // Iterate over the episodes once and store some values for later use.
         int index = 0;
-        int lastNormalEpisode = 0;
+        int lastNormalEpisode = -1;
         foreach (var episode in episodes) {
             if (episode.Shoko.IsHidden)
                 continue;
@@ -147,11 +153,16 @@ public SeasonInfo(Series series, SeriesType? customType, IEnumerable<string> ext
                     }
                     else if (episode.AniDB.Type == EpisodeType.Special) {
                         specialsList.Add(episode);
-                        var previousEpisode = episodes
-                            .GetRange(lastNormalEpisode, index - lastNormalEpisode)
-                            .FirstOrDefault(e => e.AniDB.Type == EpisodeType.Normal);
-                        if (previousEpisode != null)
-                            specialsAnchorDictionary[episode] = previousEpisode;
+                        if (index == -1) {
+                            specialsBeforeEpisodes.Add(episode.Id);
+                        }
+                        else {
+                            var previousEpisode = episodes
+                                .GetRange(lastNormalEpisode, index - lastNormalEpisode)
+                                .FirstOrDefault(e => e.AniDB.Type == EpisodeType.Normal);
+                            if (previousEpisode != null)
+                                specialsAnchorDictionary[episode] = previousEpisode;
+                        }
                     }
                     break;
             }
@@ -191,18 +202,24 @@ public SeasonInfo(Series series, SeriesType? customType, IEnumerable<string> ext
 
             // Re-create the special anchors because the episode list changed.
             index = 0;
-            lastNormalEpisode = 0;
+            lastNormalEpisode = -1;
+            specialsBeforeEpisodes.Clear();
             specialsAnchorDictionary.Clear();
             foreach (var episode in episodes) {
                 if (episodesList.Contains(episode)) {
                     lastNormalEpisode = index;
                 }
                 else if (specialsList.Contains(episode)) {
-                    var previousEpisode = episodes
-                        .GetRange(lastNormalEpisode, index - lastNormalEpisode)
-                        .FirstOrDefault(e => e.AniDB.Type == EpisodeType.Normal);
-                    if (previousEpisode != null)
-                        specialsAnchorDictionary[episode] = previousEpisode;
+                    if (index == -1) {
+                        specialsBeforeEpisodes.Add(episode.Id);
+                    }
+                    else {
+                        var previousEpisode = episodes
+                            .GetRange(lastNormalEpisode, index - lastNormalEpisode)
+                            .FirstOrDefault(e => specialsList.Contains(e));
+                        if (previousEpisode != null)
+                            specialsAnchorDictionary[episode] = previousEpisode;
+                    }
                 }
                 index++;
             }
@@ -242,6 +259,7 @@ public SeasonInfo(Series series, SeriesType? customType, IEnumerable<string> ext
         EpisodeList = episodesList;
         AlternateEpisodesList = altEpisodesList;
         ExtrasList = extrasList;
+        SpecialsBeforeEpisodes = specialsBeforeEpisodes;
         SpecialsAnchors = specialsAnchorDictionary;
         SpecialsList = specialsList;
         Relations = relations;

diff --git a/Shokofin/Utils/Ordering.cs b/Shokofin/Utils/Ordering.cs
@@ -179,6 +179,11 @@ public static (int?, int?, int?, bool) GetSpecialPlacement(ShowInfo showInfo, Se
                 byAirDate:
                 // Reset the order if we come from `SpecialOrderType.InBetweenSeasonMixed`.
                 episodeNumber = null;
+                if (seasonInfo.SpecialsBeforeEpisodes.Contains(episodeInfo.Id)) {
+                    airsBeforeSeasonNumber = seasonNumber;
+                    break;
+                }
+
                 if (seasonInfo.SpecialsAnchors.TryGetValue(episodeInfo, out var previousEpisode))
                     episodeNumber = GetEpisodeNumber(showInfo, seasonInfo, previousEpisode);