Opus changes

2026-09-22 19:42:10 -04:00
parent cffecbb469
commit d9d19d175f
4 changed files with 638 additions and 109 deletions
@@ -1,3 +1,5 @@
+using System.Net;
+using System.Text.RegularExpressions;
 using AnimeAnnouncer.Cache;
 using Microsoft.AspNetCore.Mvc.RazorPages;

@@ -50,10 +52,23 @@ public class IndexModel : PageModel
                    _logger.LogWarning(ex, "Failed to retrieve cache item for title: {Title}", airingItem.Title);
                }

+                // The announcer stores Anilist details under a parallel key using the same
+                // title, so the two caches line up one-to-one when Anilist was consulted.
+                AnilistCacheItem? anilistItem = null;
+                try
+                {
+                    anilistItem = await _tmdbCache.GetCacheItem<AnilistCacheItem>($"AnilistCache-{airingItem.Title}");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning(ex, "Failed to retrieve Anilist cache item for title: {Title}", airingItem.Title);
+                }
+
                viewModels.Add(new AiringShowViewModel
                {
                    AiringSoon = airingItem,
-                    CachedDetails = cacheItem
+                    CachedDetails = cacheItem,
+                    AnilistDetails = anilistItem
                });
            }

@@ -80,10 +95,20 @@ public class IndexModel : PageModel
        }
    }

+    public class ShowImage
+    {
+        public required string Url { get; set; }
+        public required string Label { get; set; }
+        public required string Source { get; set; }
+    }
+
    public class AiringShowViewModel
    {
+        private static readonly Regex HtmlTagPattern = new("<[^>]+>", RegexOptions.Compiled);
+
        public required AiringSoonItem AiringSoon { get; set; }
        public TMDBCacheItem? CachedDetails { get; set; }
+        public AnilistCacheItem? AnilistDetails { get; set; }

        public string Title => AiringSoon.Title;
        public int ShowID => AiringSoon.ShowID;
@@ -95,25 +120,116 @@ public class IndexModel : PageModel
        public int? LatestSeasonNumber => CachedDetails?.LatestSeasonNumber;
        public int? LatestOrdinalEpisodeNumber => CachedDetails?.LatestOrdinalEpisodeNumber;
        public double? VoteAverage => CachedDetails?.VoteAverage;
-        public string? Overview => !string.IsNullOrWhiteSpace(CachedDetails?.LatestSeasonOverview)
-            ? CachedDetails.LatestSeasonOverview
-            : CachedDetails?.Overview;

-        public string? PosterUrl
+        // --- Anilist ---------------------------------------------------------
+
+        public bool HasAnilist => AnilistDetails != null;
+        public int? AnilistShowID => AnilistDetails?.ShowID;
+        public string? AnilistUrl => AnilistShowID.HasValue ? $"https://anilist.co/anime/{AnilistShowID}" : null;
+
+        /// <summary>Anilist's 0-100 score, rescaled to the 0-10 range TMDB uses.</summary>
+        public double? AnilistScore => AnilistDetails?.AverageScore.HasValue == true
+            ? AnilistDetails.AverageScore!.Value / 10.0
+            : null;
+
+        public string? AnilistStatus => string.IsNullOrWhiteSpace(AnilistDetails?.Status)
+            ? null
+            // Anilist statuses arrive as enum names like RELEASING / NOT_YET_RELEASED.
+            : string.Join(' ', AnilistDetails.Status.Split('_', StringSplitOptions.RemoveEmptyEntries)
+                .Select(word => char.ToUpperInvariant(word[0]) + word[1..].ToLowerInvariant()));
+
+        public int? SeasonYear => AnilistDetails?.SeasonYear;
+
+        /// <summary>Total episode count, preferring Anilist which the announcer treats as more reliable.</summary>
+        public int? TotalEpisodes => AnilistDetails?.Episodes ?? (LastEpisodeNumber > 0 ? LastEpisodeNumber : null);
+
+        /// <summary>Alternate titles worth showing, i.e. anything that is not just the display title again.</summary>
+        public List<string> AlternateTitles
        {
            get
            {
-                if (!string.IsNullOrWhiteSpace(CachedDetails?.LatestSeasonPosterPath))
-                    return CachedDetails.LatestSeasonPosterPath;
-                if (!string.IsNullOrWhiteSpace(CachedDetails?.PosterPath))
-                    return CachedDetails.PosterPath;
-                //if (!string.IsNullOrWhiteSpace(CachedDetails?.AnilistPosterPath))
-                //    return CachedDetails.AnilistPosterPath;
-                return null;
+                var candidates = new[] { AnilistDetails?.RomajiTitle, AnilistDetails?.NativeTitle, AnilistDetails?.EnglishTitle };
+                return candidates
+                    .Where(t => !string.IsNullOrWhiteSpace(t))
+                    .Select(t => t!.Trim())
+                    .Where(t => !string.Equals(t, Title, StringComparison.OrdinalIgnoreCase))
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList();
            }
        }

-        public string? BackdropUrl => CachedDetails?.BackdropPath;
+        /// <summary>Anilist descriptions are HTML fragments; flatten them to plain text for display.</summary>
+        public string? AnilistDescription
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(AnilistDetails?.Description))
+                    return null;
+
+                var text = AnilistDetails.Description
+                    .Replace("<br>", " ", StringComparison.OrdinalIgnoreCase)
+                    .Replace("<br/>", " ", StringComparison.OrdinalIgnoreCase)
+                    .Replace("<br />", " ", StringComparison.OrdinalIgnoreCase);
+                text = WebUtility.HtmlDecode(HtmlTagPattern.Replace(text, string.Empty));
+                text = Regex.Replace(text, @"\s{2,}", " ").Trim();
+
+                return string.IsNullOrWhiteSpace(text) ? null : text;
+            }
+        }
+
+        public string? Overview => !string.IsNullOrWhiteSpace(CachedDetails?.LatestSeasonOverview)
+            ? CachedDetails.LatestSeasonOverview
+            : (!string.IsNullOrWhiteSpace(CachedDetails?.Overview) ? CachedDetails.Overview : AnilistDescription);
+
+        /// <summary>True when <see cref="Overview"/> describes the current season rather than the series.</summary>
+        public bool OverviewIsSeasonSpecific => !string.IsNullOrWhiteSpace(CachedDetails?.LatestSeasonOverview);
+
+        // --- Artwork ---------------------------------------------------------
+
+        public string? SeasonPosterUrl => Clean(CachedDetails?.LatestSeasonPosterPath);
+        public string? ShowPosterUrl => Clean(CachedDetails?.PosterPath);
+        public string? BackdropUrl => Clean(CachedDetails?.BackdropPath);
+        public string? AnilistCoverUrl => Clean(AnilistDetails?.CoverImageUrl);
+        public string? AnilistBannerUrl => Clean(AnilistDetails?.BannerImageUrl);
+
+        /// <summary>The tall artwork shown alongside the entry; the season's own poster wins when present.</summary>
+        public string? PosterUrl => SeasonPosterUrl ?? ShowPosterUrl ?? AnilistCoverUrl;
+
+        /// <summary>The wide artwork used as the row background.</summary>
+        public string? HeroImageUrl => BackdropUrl ?? AnilistBannerUrl;
+
+        /// <summary>Every distinct piece of artwork, for the secondary thumbnail strip.</summary>
+        public List<ShowImage> Gallery
+        {
+            get
+            {
+                var images = new List<ShowImage>();
+
+                void Add(string? url, string label, string source)
+                {
+                    if (string.IsNullOrWhiteSpace(url))
+                        return;
+                    if (images.Any(i => string.Equals(i.Url, url, StringComparison.OrdinalIgnoreCase)))
+                        return;
+                    images.Add(new ShowImage { Url = url, Label = label, Source = source });
+                }
+
+                // The primary poster is already displayed beside the row, so start after it.
+                Add(SeasonPosterUrl, $"Season {LatestSeasonNumber} poster", "TMDB");
+                Add(ShowPosterUrl, "Series poster", "TMDB");
+                Add(AnilistCoverUrl, "Cover art", "AniList");
+                Add(BackdropUrl, "Backdrop", "TMDB");
+                Add(AnilistBannerUrl, "Banner", "AniList");
+
+                return images;
+            }
+        }
+
+        /// <summary>Gallery entries other than the one already shown as the main poster.</summary>
+        public List<ShowImage> SecondaryImages =>
+            Gallery.Where(i => !string.Equals(i.Url, PosterUrl, StringComparison.OrdinalIgnoreCase)).ToList();
+
+        // --- Air dates -------------------------------------------------------

        public DateTime AirReferenceNow => DateTime.Now;

@@ -145,6 +261,24 @@ public class IndexModel : PageModel
                return date.HasValue ? date.Value.ToString("MM/dd/yyyy") : "Unknown";
            }
        }
+
+        public string? AirDateLongFormatted => EffectiveLastAirDate?.ToString("dddd, MMMM d, yyyy");
+
+        /// <summary>How far into the season the latest aired episode sits, as a percentage.</summary>
+        public int? EpisodeProgressPercent
+        {
+            get
+            {
+                var total = TotalEpisodes;
+                if (!total.HasValue || total.Value <= 0 || LatestEpisodeNumber <= 0)
+                    return null;
+                return (int)Math.Round(Math.Clamp(LatestEpisodeNumber / (double)total.Value, 0, 1) * 100);
+            }
+        }
+
+        /// <summary>True when the upcoming episode is the last one of the season.</summary>
+        public bool IsFinaleNext => TotalEpisodes.HasValue && LatestEpisodeNumber > 0 && LatestEpisodeNumber >= TotalEpisodes.Value;
+
+        private static string? Clean(string? value) => string.IsNullOrWhiteSpace(value) ? null : value.Trim();
    }
 }
-