fix: attempt to auto match by title plus year first, then only title

Attempt to match by title plus year first then only title afterwards, instead of alternating the two 3 times in the TMDB auto match series search logic.
ShokoAnime · Oct 31, 2024 · 94045ad · 94045ad
1 parent 6c2cebf
commit 94045ad
Showing 1 changed file with 37 additions and 26 deletions.
diff --git a/Shoko.Server/Providers/TMDB/TmdbSearchService.cs b/Shoko.Server/Providers/TMDB/TmdbSearchService.cs
@@ -419,32 +419,21 @@ private async Task<IReadOnlyList<TmdbAutoSearchResult>> AutoSearchForShow(SVR_An
         return match is not null ? [match] : [];
     }
 
-    private async Task<TmdbAutoSearchResult?> AutoSearchForShowUsingTitle(SVR_AniDB_Anime anime, string title, DateTime airDate, bool restricted, bool isJapanese)
+    private async Task<TmdbAutoSearchResult?> AutoSearchForShowUsingTitle(SVR_AniDB_Anime anime, string originalTitle, DateTime airDate, bool restricted, bool isJapanese)
     {
         // Brute force attempt #1: With the original title and earliest known aired year.
-        var (results, totalFound) = await SearchShows(title, includeRestricted: restricted, year: airDate.Year).ConfigureAwait(false);
+        var (results, totalFound) = await SearchShows(originalTitle, includeRestricted: restricted, year: airDate.Year).ConfigureAwait(false);
         var firstViableResult = results.FirstOrDefault(result => IsAnimation(result.GetGenres()));
         if (firstViableResult is not null)
         {
-            _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, title, firstViableResult.OriginalName, firstViableResult.Id);
+            _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, originalTitle, firstViableResult.OriginalName, firstViableResult.Id);
 
             return new(anime, firstViableResult) { IsRemote = true };
         }
 
-
-        // Brute force attempt #2: With the original title but without the earliest known aired year.
-        (results, totalFound) = await SearchShows(title, includeRestricted: restricted).ConfigureAwait(false);
-        firstViableResult = results.FirstOrDefault(result => IsAnimation(result.GetGenres()));
-        if (firstViableResult is not null)
-        {
-            _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, title, firstViableResult.OriginalName, firstViableResult.Id);
-
-            return new(anime, firstViableResult) { IsRemote = true };
-        }
-
-        // Brute force attempt #3-4: Same as above, but after stripping the title of common "sequel endings"
-        var strippedTitle = SequelSuffixRemovalRegex().Match(title) is { Success: true } regexResult
-            ? title[..^regexResult.Length].TrimEnd() : null;
+        // Brute force attempt #2: Same as above, but after stripping the title of common "sequel endings"
+        var strippedTitle = SequelSuffixRemovalRegex().Match(originalTitle) is { Success: true } regexResult
+            ? originalTitle[..^regexResult.Length].TrimEnd() : null;
         if (!string.IsNullOrEmpty(strippedTitle))
         {
             (results, totalFound) = await SearchShows(strippedTitle, includeRestricted: restricted, year: airDate.Year).ConfigureAwait(false);
@@ -455,31 +444,53 @@ private async Task<IReadOnlyList<TmdbAutoSearchResult>> AutoSearchForShow(SVR_An
 
                 return new(anime, firstViableResult) { IsRemote = true };
             }
-            (results, totalFound) = await SearchShows(strippedTitle, includeRestricted: restricted).ConfigureAwait(false);
+        }
+
+        // Brute force attempt #3: Same as above, but with stripped of any sub-titles.
+        var titleWithoutSubTitle = strippedTitle ?? originalTitle;
+        var columIndex = titleWithoutSubTitle.IndexOf(isJapanese ? ' ' : ':');
+        if (columIndex > 0)
+        {
+            titleWithoutSubTitle = titleWithoutSubTitle[..columIndex];
+            (results, totalFound) = await SearchShows(titleWithoutSubTitle, includeRestricted: restricted, year: airDate.Year).ConfigureAwait(false);
             firstViableResult = results.FirstOrDefault(result => IsAnimation(result.GetGenres()));
             if (firstViableResult is not null)
             {
-                _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, strippedTitle, firstViableResult.OriginalName, firstViableResult.Id);
+                _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, titleWithoutSubTitle, firstViableResult.OriginalName, firstViableResult.Id);
 
                 return new(anime, firstViableResult) { IsRemote = true };
             }
         }
 
-        // Brute force attempt #5-6: Same as 1-2, but with stripped of any sub-titles.
-        var titleWithoutSubTitle = strippedTitle ?? title;
-        var columIndex = titleWithoutSubTitle.IndexOf(isJapanese ? ' ' : ':');
-        if (columIndex > 0)
+        // Brute force attempt #4: With the original title but without the earliest known aired year.
+        (results, totalFound) = await SearchShows(originalTitle, includeRestricted: restricted).ConfigureAwait(false);
+        firstViableResult = results.FirstOrDefault(result => IsAnimation(result.GetGenres()));
+        if (firstViableResult is not null)
         {
-            titleWithoutSubTitle = titleWithoutSubTitle[..columIndex];
-            (results, totalFound) = await SearchShows(titleWithoutSubTitle, includeRestricted: restricted, year: airDate.Year).ConfigureAwait(false);
+            _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, originalTitle, firstViableResult.OriginalName, firstViableResult.Id);
+
+            return new(anime, firstViableResult) { IsRemote = true };
+        }
+
+        // Brute force attempt #5: Same as above, but after stripping the title of common "sequel endings"
+        if (!string.IsNullOrEmpty(strippedTitle))
+        {
+            (results, totalFound) = await SearchShows(strippedTitle, includeRestricted: restricted).ConfigureAwait(false);
             firstViableResult = results.FirstOrDefault(result => IsAnimation(result.GetGenres()));
             if (firstViableResult is not null)
             {
-                _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, titleWithoutSubTitle, firstViableResult.OriginalName, firstViableResult.Id);
+                _logger.LogTrace("Found {Count} show results for search on {Query}, best match; {ShowName} ({ID})", totalFound, strippedTitle, firstViableResult.OriginalName, firstViableResult.Id);
 
                 return new(anime, firstViableResult) { IsRemote = true };
             }
+        }
 
+        // Brute force attempt #6: Same as above, but with stripped of any sub-titles.
+        titleWithoutSubTitle = strippedTitle ?? originalTitle;
+        columIndex = titleWithoutSubTitle.IndexOf(isJapanese ? ' ' : ':');
+        if (columIndex > 0)
+        {
+            titleWithoutSubTitle = titleWithoutSubTitle[..columIndex];
             (results, totalFound) = await SearchShows(titleWithoutSubTitle, includeRestricted: restricted).ConfigureAwait(false);
             firstViableResult = results.FirstOrDefault(result => IsAnimation(result.GetGenres()));
             if (firstViableResult is not null)