Fix: Properly account for a series new to shoko

The webhook should now actually be updated, after a file is matched where a series does not yet exist

Misc: Minor code cleanup

Author: fearnlj01

Apis/DiscordHelper.cs

@@ -57,12 +57,19 @@ public async Task<string> SendWebhook(IVideo video, AniDBSearchResult searchResu
     }
   }
 
-  public async Task PatchWebhook(IVideo video, ISeries anime, IEpisode episode, MemoryStream imageStream, string messageId)
+  #nullable enable
+  public async Task PatchWebhook(IVideo video, ISeries anime, IEpisode episode, MemoryStream? imageStream, string messageId)
   {
     Logger.Info(CultureInfo.InvariantCulture, "Attempting to update Discord message (fileId={fileId}, messageId={messageId})", video.ID, messageId);
 
     try
     {
+      if (imageStream == null)
+      {
+        await PatchWebhook(video, anime, episode, messageId);
+        return;
+      }
+
       MultipartFormDataContent form = new();
 
       var webhook = GetMatchedWebhook(video, anime, episode);
@@ -90,6 +97,22 @@ public async Task PatchWebhook(IVideo video, ISeries anime, IEpisode episode, Me
     }
   }
 
+  public async Task PatchWebhook(IVideo video, ISeries anime, IEpisode episode, string messageId)
+  {
+    try {
+      var webhook = GetMatchedWebhook(video, anime, episode, false);
+
+      var response = await _httpClient.PatchAsJsonAsync($"{_baseUrl}/messages/{messageId}", webhook, _options);
+      _ = response.EnsureSuccessStatusCode();
+    }
+    catch (Exception ex)
+    {
+      // TODO: More logging
+      Logger.Debug("Exception: {ex}", ex);
+    }
+  }
+#nullable disable
+
   private Webhook GetUnmatchedWebhook(IVideo video, AniDBSearchResult searchResult)
   {
     UriBuilder publicUrl = new(_settings.Shoko.PublicUrl)
@@ -124,13 +147,22 @@ private Webhook GetUnmatchedWebhook(IVideo video, AniDBSearchResult searchResult
     };
   }
 
-  private Webhook GetMatchedWebhook(IVideo video, ISeries anime, IEpisode episode)
+  private Webhook GetMatchedWebhook(IVideo video, ISeries anime, IEpisode episode, bool includePoster = true)
   {
     UriBuilder publicUrl = new(_settings.Shoko.PublicUrl)
     {
       Port = _settings.Shoko.PublicPort ?? -1
     };
 
+    var webhookAttachments = includePoster ? (WebhookAttachment[])[
+      new WebhookAttachment
+      {
+        Id = 0,
+        Description = "Anime Poster",
+        Filename = "unknown.jpg"
+      }
+    ] : [];
+
     return new Webhook()
     {
       Username = _settings.Webhook.Username,
@@ -152,15 +184,7 @@ private Webhook GetMatchedWebhook(IVideo video, ISeries anime, IEpisode episode)
           Footer = GetFooter(video)
         }
       ],
-      Attachments =
-      [
-        new WebhookAttachment
-        {
-          Id = 0,
-          Description = "Anime Poster",
-          Filename = "unknown.jpg"
-        }
-      ]
+      Attachments = webhookAttachments
     };
   }
 

Apis/ShokoHelper.cs

@@ -119,7 +119,8 @@ public async Task ScanFileById(int fileId)
     }
   }
 
-  public async Task<Image> GetSeriesPoster(ISeries anime)
+  #nullable enable
+  public async Task<Image?> GetSeriesPoster(ISeries anime)
   {
     try
     {
@@ -132,9 +133,10 @@ public async Task<Image> GetSeriesPoster(ISeries anime)
     {
       Logger.Warn(CultureInfo.InvariantCulture, "Poster could not be downloaded for series ID: {animeId}", anime.ID);
       Logger.Debug("Exception: {ex}", ex);
-      return null;
     }
+    return null;
   }
+  #nullable disable
 
   public async Task<MemoryStream> GetImageStream(Image shokoImage)
   {

WebhookDump.cs

@@ -26,7 +26,7 @@ public class WebhookDump : IPlugin
 
   private readonly FileTracker _fileTracker;
 
-  private readonly HashSet<int> _episodesMissingReferences = [];
+  private readonly HashSet<int> _anidbTrackedEpisodeIds = [];
 
   public static void ConfigureServices(IServiceCollection services)
   {
@@ -95,23 +95,27 @@ private void OnFileNotMatched(object sender, FileNotMatchedEventArgs fileNotMatc
   private void OnFileMatched(object sender, FileEventArgs fileMatchedEvent)
   {
     var video = fileMatchedEvent.Video;
+    var series = fileMatchedEvent.Series;
     var episodes = fileMatchedEvent.Episodes;
 
-    if (video.CrossReferences.Count == 0 && episodes.Count > 0)
+    if (episodes.Count == 0 && series.Count == 0)
     {
-      _episodesMissingReferences.Add(episodes[0].ID);
+      foreach (var crossReference in video.CrossReferences)
+        _anidbTrackedEpisodeIds.Add(crossReference.AnidbEpisodeID);
       return;
     }
 
-    if (fileMatchedEvent.Series.Count == 0 || fileMatchedEvent.Episodes.Count == 0)
+    if (episodes.Count == 0 || series.Count == 0) // This is just a safeguard...
     {
-      Logger.Debug($"I don't think this should ever be seen, but if it is... Let @fearnlj01 know it can happen (please).");
+      // I don't know in what circumstance this code will execute...
+      Logger.Error("I don't think this should ever be seen, but if it is... Let @fearnlj01 know it can happen (please).");
       return;
     }
 
-    AttemptMatchedUpdate(fileMatchedEvent.Series[0], fileMatchedEvent.Episodes[0], video);
+    AttemptMatchedUpdate(series[0], episodes[0], video);
   }
 
+  #nullable enable
   private async void AttemptMatchedUpdate(ISeries series, IEpisode episode, IVideo video)
   {
     if (
@@ -126,7 +130,7 @@ private async void AttemptMatchedUpdate(ISeries series, IEpisode episode, IVideo
     try
     {
       var poster = await _shokoHelper.GetSeriesPoster(series);
-      var imageStream = await _shokoHelper.GetImageStream(poster);
+      var imageStream = poster != null ? await _shokoHelper.GetImageStream(poster) : null;
 
       await _discordHelper.PatchWebhook(video, series, episode, imageStream, messageId);
       _messageTracker.TryRemoveMessage(video.ID);
@@ -136,19 +140,16 @@ private async void AttemptMatchedUpdate(ISeries series, IEpisode episode, IVideo
       Logger.Debug("Exception: {ex}", ex);
     }
   }
+  #nullable disable
 
   private async void OnAVDumpEvent(object sender, AVDumpEventArgs dumpEvent)
   {
     if (dumpEvent.Type != AVDumpEventType.Success || !_settings.Webhook.Enabled)
       return;
 
-    for (var i = 0; i < dumpEvent.VideoIDs?.Count && i < dumpEvent.ED2Ks?.Count; i++)
+    foreach (var videoId in dumpEvent.VideoIDs ?? Array.Empty<int>())
     {
-      var ed2K = dumpEvent.ED2Ks[i];
-      var fileId = dumpEvent.VideoIDs[i];
-
-      if (!_fileTracker.TryGetValue(fileId, out var video))
-        continue;
+      if (!_fileTracker.TryGetValue(videoId, out var video)) continue;
 
       var searchResult = await _shokoHelper.MatchTitle(video.EarliestKnownName);
 
@@ -174,27 +175,28 @@ private async void OnAVDumpEvent(object sender, AVDumpEventArgs dumpEvent)
       });
 
       searchResult.List = searchResult.List.Take(3).ToList();
-      var messageId = await _discordHelper.SendWebhook(video, ed2K, searchResult);
+      var messageId = await _discordHelper.SendWebhook(video, searchResult);
 
       _ = _messageTracker.TryAddMessage(video.ID, messageId);
     }
   }
 
   private void OnEpisodeUpdatedEvent(object sender, EpisodeInfoUpdatedEventArgs episodeInfoUpdatedEvent)
   {
-    var episodeInfo = episodeInfoUpdatedEvent.EpisodeInfo;
-    var updateReason = episodeInfoUpdatedEvent.Reason;
-    var seriesInfo = episodeInfoUpdatedEvent.SeriesInfo;
+    if (episodeInfoUpdatedEvent.Reason is not (UpdateReason.Added or UpdateReason.Updated)) return;
 
-    if (!_episodesMissingReferences.Contains(episodeInfo.ID) || episodeInfo.VideoList.Count == 0 ||
-        (updateReason != UpdateReason.Added && updateReason != UpdateReason.Updated)
-       )
-    {
-      return;
-    }
+    var episode = episodeInfoUpdatedEvent.EpisodeInfo;
+    var series = episodeInfoUpdatedEvent.SeriesInfo;
+
+    var anidbEpisodeIds = episode.CrossReferences.Select(reference => reference.AnidbEpisodeID).ToHashSet();
+
+    if (episode.VideoList.Count == 0) return;
+
+    var removedLog = anidbEpisodeIds.Select(eid => _anidbTrackedEpisodeIds.Remove(eid)).ToList();
+    if (!removedLog.Any(removedBool => removedBool)) return;
 
-    AttemptMatchedUpdate(seriesInfo, episodeInfo, episodeInfo.VideoList[0]);
-    _episodesMissingReferences.Remove(episodeInfo.ID);
+    Logger.Debug("Attempting to update webhook by episode added/updated.");
+    AttemptMatchedUpdate(series, episode, episode.VideoList[0]);
   }
 
   private async Task WaitForRescan(IVideo video, int matchAttempts = 1)