Plex webhook episode detection for non-episode videos

Shoko.Server/API/v2/Modules/PlexWebhook.cs

@@ -15,12 +15,15 @@
 using Shoko.Models.Plex.Collection;
 using Shoko.Models.Plex.Connections;
 using Shoko.Models.Plex.Libraries;
+using Shoko.Models.Plex.TVShow;
 using Shoko.Models.Server;
 using Shoko.Server.API.v2.Models.core;
 using Shoko.Server.Extensions;
 using Shoko.Server.Models;
 using Shoko.Server.Plex;
+using Shoko.Server.Plex.Collection;
 using Shoko.Server.Plex.Libraries;
+using Shoko.Server.Plex.TVShow;
 using Shoko.Server.Providers.TraktTV;
 using Shoko.Server.Repositories;
 using Shoko.Server.Scheduling;
@@ -60,20 +63,29 @@ public ActionResult WebhookPost([FromForm] [ModelBinder(BinderType = typeof(Plex
         }
 
         _logger.LogTrace($"{payload.Event}: {payload.Metadata?.Guid}");
+
+        var user = User;
+        user ??= RepoFactory.JMMUser.GetAll().FirstOrDefault(u => payload.Account.Title.FindIn(u.GetPlexUsers()));
+        if (user == null)
+        {
+            _logger.LogInformation("Unable to determine who \"{AccountTitle}\" is in Shoko, make sure this is set under user settings in Desktop", payload.Account.Title);
+            return Ok(); //At this point in time, we don't want to scrobble for unknown users
+        }
+
         switch (payload.Event)
         {
             case "media.scrobble":
-                Scrobble(payload, User);
+                Scrobble(payload, user);
                 break;
             case "media.resume":
             case "media.play":
-                TraktScrobble(payload, ScrobblePlayingStatus.Start);
+                TraktScrobble(payload, ScrobblePlayingStatus.Start, user);
                 break;
             case "media.pause":
-                TraktScrobble(payload, ScrobblePlayingStatus.Pause);
+                TraktScrobble(payload, ScrobblePlayingStatus.Pause, user);
                 break;
             case "media.stop":
-                TraktScrobble(payload, ScrobblePlayingStatus.Stop);
+                TraktScrobble(payload, ScrobblePlayingStatus.Stop, user);
                 break;
         }
 
@@ -84,15 +96,15 @@ public ActionResult WebhookPost([FromForm] [ModelBinder(BinderType = typeof(Plex
     #region Plex events
 
     [NonAction]
-    private void TraktScrobble(PlexEvent evt, ScrobblePlayingStatus type)
+    private void TraktScrobble(PlexEvent evt, ScrobblePlayingStatus type, JMMUser user)
     {
         var metadata = evt.Metadata;
-        var (episode, _) = GetEpisode(metadata);
+        var (episode, _) = GetEpisodeForUser(metadata, user);
 
         if (episode == null) return;
 
         var vl = RepoFactory.VideoLocal.GetByAniDBEpisodeID(episode.AniDB_EpisodeID).FirstOrDefault();
-        if (vl == null || vl.Duration == 0) return; 
+        if (vl == null || vl.Duration == 0) return;
 
         var per = 100 *
                   (metadata.ViewOffset /
@@ -109,7 +121,7 @@ private void TraktScrobble(PlexEvent evt, ScrobblePlayingStatus type)
     private void Scrobble(PlexEvent data, SVR_JMMUser user)
     {
         var metadata = data.Metadata;
-        var (episode, anime) = GetEpisode(metadata);
+        var (episode, anime) = GetEpisodeForUser(metadata, user);
         if (episode == null)
         {
             _logger.LogInformation(
@@ -119,12 +131,6 @@ private void Scrobble(PlexEvent data, SVR_JMMUser user)
 
         _logger.LogTrace("Got anime: {Anime}, ep: {EpisodeNumber}", anime, episode.AniDB_Episode.EpisodeNumber);
 
-        user ??= RepoFactory.JMMUser.GetAll().FirstOrDefault(u => data.Account.Title.FindIn(u.GetPlexUsers()));
-        if (user == null)
-        {
-            _logger.LogInformation("Unable to determine who \"{AccountTitle}\" is in Shoko, make sure this is set under user settings in Desktop", data.Account.Title);
-            return; //At this point in time, we don't want to scrobble for unknown users
-        }
 
         episode.ToggleWatchedStatus(true, true, FromUnixTime(metadata.LastViewedAt), false, user.JMMUserID,
             true);
@@ -135,7 +141,7 @@ private void Scrobble(PlexEvent data, SVR_JMMUser user)
     #endregion
 
     [NonAction]
-    private (SVR_AnimeEpisode, SVR_AnimeSeries) GetEpisode(PlexEvent.PlexMetadata metadata)
+    private (SVR_AnimeEpisode, SVR_AnimeSeries) GetEpisodeForUser(PlexEvent.PlexMetadata metadata, JMMUser user)
     {
         var guid = new Uri(metadata.Guid);
         if (guid.Scheme != "com.plexapp.agents.shoko" && guid.Scheme != "com.plexapp.agents.shokorelay")
@@ -179,10 +185,28 @@ private void Scrobble(PlexEvent data, SVR_JMMUser user)
                 break;
         }
 
+        var key = metadata.Key.Split("/").LastOrDefault();  // '/library/metadata/{key}'
+
+        var plexEpisode = (SVR_Episode)GetPlexEpisodeData(key, user);
+        var episode = plexEpisode?.AnimeEpisode;
+
         if (episodeType != EpisodeType.Episode ||
             metadata.Index == 0) //metadata.index = 0 when it's something else.
         {
-            return (null, anime); //right now no clean way to detect the episode. I could do by title.
+            if (episode == null)
+            {
+                _logger.LogInformation($"Failed to get anime episode from plex using key {metadata.Key}.");
+                return (null, anime);
+            }
+
+            if (episode.EpisodeTypeEnum == episodeType && anime.GetAnimeEpisodes().Contains(episode))
+            {
+                return (episode, anime);
+            }
+
+            _logger.LogInformation($"Unable to work out the metadata for {metadata.Guid}.");
+
+            return (null, anime);
         }
 
 
@@ -204,7 +228,7 @@ private void Scrobble(PlexEvent data, SVR_JMMUser user)
 
         //catch all
         _logger.LogInformation(
-            $"Unable to work out the metadata for {metadata.Guid}, this might be a clash of multipl episodes linked, but no tvdb link.");
+            $"Unable to work out the metadata for {metadata.Guid}, this might be a clash of multiple episodes linked, but no tvdb link.");
         return (null, anime);
     }
 
@@ -335,6 +359,13 @@ private T CallPlexHelper<T>(Func<PlexHelper, T> act)
         return act(PlexHelper.GetForUser(user));
     }
 
+    [NonAction]
+    private Episode GetPlexEpisodeData(string ratingKey, JMMUser user)
+    {
+        var helper = PlexHelper.GetForUser(user);
+        return new SVR_PlexLibrary(helper).GetEpisode(ratingKey).FirstOrDefault();
+    }
+
     #region plexapi
 
 #pragma warning disable 0649

Shoko.Server/Plex/Collection/SVR_PlexLibrary.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Shoko.Models.Plex;
 using Shoko.Models.Plex.Collection;
 using Shoko.Models.Plex.TVShow;
@@ -17,7 +17,15 @@ public SVR_PlexLibrary(PlexHelper helper)
 
     public Episode[] GetEpisodes()
     {
-        var (_, data) = Helper.RequestFromPlexAsync($"/library/metadata/{RatingKey}/allLeaves").GetAwaiter()
+        var (_, data) = Helper.RequestFromPlexAsync($"/library/metadata/{RatingKey}/allLeaves").Result;
+        return JsonConvert
+            .DeserializeObject<MediaContainer<MediaContainer>>(data, Helper.SerializerSettings)
+            .Container.Metadata;
+    }
+
+    public Episode[] GetEpisode(string ratingKey)
+    {
+        var (_, data) = Helper.RequestFromPlexAsync($"/library/metadata/{ratingKey}").GetAwaiter()
             .GetResult();
         return JsonConvert
             .DeserializeObject<MediaContainer<MediaContainer>>(data, Helper.SerializerSettings)

Shoko.Server/Plex/TVShow/SVR_Episode.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using Shoko.Models.Plex.TVShow;
 using Shoko.Server.Models;
 using Shoko.Server.Repositories;
@@ -15,7 +15,7 @@ public SVR_Episode(PlexHelper helper)
     }
 
     public SVR_AnimeEpisode AnimeEpisode =>
-        RepoFactory.AnimeEpisode.GetByFilename(Path.GetFileName(Media[0].Part[0].File));
+        RepoFactory.AnimeEpisode.GetByFilenameAndSize(Path.GetFileName(Media[0].Part[0].File), Media[0].Part[0].Size);
 
     public void Unscrobble()
     {

Shoko.Server/Repositories/Cached/AnimeEpisodeRepository.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -55,8 +55,8 @@ public SVR_AnimeEpisode GetByAniDBEpisodeID(int epid)
     /// <summary>
     /// Get the AnimeEpisode 
     /// </summary>
-    /// <param name="name">The filename of the anime to search for.</param>
-    /// <returns>the AnimeEpisode given the file information</returns>
+    /// <param name="name">The filename of the anime to search for. Only the characters after the last directory separator are considered</param>
+    /// <returns>the AnimeEpisode given the file name</returns>
     public SVR_AnimeEpisode GetByFilename(string name)
     {
         if (string.IsNullOrEmpty(name))
@@ -73,6 +73,28 @@ public SVR_AnimeEpisode GetByFilename(string name)
         return ep ?? eps.FirstOrDefault();
     }
 
+    /// <summary>
+    /// Get the AnimeEpisode 
+    /// </summary>
+    /// <param name="name">The filename of the anime to search for. Only the characters after the last directory separator are considered</param>
+    /// <param name="size">The size of the file in bytes</param>
+    /// <returns>the AnimeEpisode given the file name and size</returns>
+    public SVR_AnimeEpisode GetByFilenameAndSize(string name, long size)
+    {
+        if (string.IsNullOrEmpty(name))
+        {
+            return null;
+        }
+        var eps = RepoFactory.VideoLocalPlace.GetAll()
+        .Where(v => name.Equals(v?.FilePath?.Split(Path.DirectorySeparatorChar).LastOrDefault(),
+            StringComparison.InvariantCultureIgnoreCase))
+        .Select(a => RepoFactory.VideoLocal.GetByID(a.VideoLocalID)).Where(a => a != null)
+        .Where(a => a.FileSize == size)
+        .SelectMany(a => GetByHash(a.Hash)).ToArray();
+        var ep = eps.FirstOrDefault(a => a.AniDB_Episode.EpisodeType == (int)EpisodeType.Episode);
+        return ep ?? eps.FirstOrDefault();
+    }
+
 
     /// <summary>
     /// Get all the AnimeEpisode records associate with an AniDB_File record