From e4160bb4c0c73ca4b8ed854bca8e82f7c8dd8b3d Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Sun, 7 Jul 2024 17:19:11 +0200
Subject: [PATCH 1/9] misc: fix stable manifest for future releases [skip ci]

---
 build_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_plugin.py b/build_plugin.py
index 4bde7113..b7a5d89c 100644
--- a/build_plugin.py
+++ b/build_plugin.py
@@ -20,7 +20,7 @@ def extract_target_framework(csproj_path):
 parser.add_argument("--repo", required=True)
 parser.add_argument("--version", required=True)
 parser.add_argument("--tag", required=True)
-parser.add_argument("--prerelease", default=True)
+parser.add_argument("--prerelease", default=False)
 opts = parser.parse_args()
 
 framework = extract_target_framework("./Shokofin/Shokofin.csproj")

From 9c23c4efa7118a8ab1d25adb5ad8f8f1d14c86b6 Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Wed, 10 Jul 2024 17:24:02 +0200
Subject: [PATCH 2/9] fix: fix mapping for series id on episode model

---
 Shokofin/API/Info/SeasonInfo.cs         | 6 +++---
 Shokofin/API/Models/Episode.cs          | 2 +-
 Shokofin/Events/EventDispatchService.cs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shokofin/API/Info/SeasonInfo.cs b/Shokofin/API/Info/SeasonInfo.cs
index 581a7933..c2368494 100644
--- a/Shokofin/API/Info/SeasonInfo.cs
+++ b/Shokofin/API/Info/SeasonInfo.cs
@@ -163,17 +163,17 @@ public SeasonInfo(Series series, SeriesType? customType, IEnumerable<string> ext
         // the previous episode anchors right.
         var seriesIdOrder = new string[] { seriesId }.Concat(extraIds).ToList();
         episodesList = episodesList
-            .OrderBy(e => seriesIdOrder.IndexOf(e.Shoko.IDs.Series.ToString()))
+            .OrderBy(e => seriesIdOrder.IndexOf(e.Shoko.IDs.ParentSeries.ToString()))
             .ThenBy(e => e.AniDB.Type)
             .ThenBy(e => e.AniDB.EpisodeNumber)
             .ToList();
         specialsList = specialsList
-            .OrderBy(e => seriesIdOrder.IndexOf(e.Shoko.IDs.Series.ToString()))
+            .OrderBy(e => seriesIdOrder.IndexOf(e.Shoko.IDs.ParentSeries.ToString()))
             .ThenBy(e => e.AniDB.Type)
             .ThenBy(e => e.AniDB.EpisodeNumber)
             .ToList();
         altEpisodesList = altEpisodesList
-            .OrderBy(e => seriesIdOrder.IndexOf(e.Shoko.IDs.Series.ToString()))
+            .OrderBy(e => seriesIdOrder.IndexOf(e.Shoko.IDs.ParentSeries.ToString()))
             .ThenBy(e => e.AniDB.Type)
             .ThenBy(e => e.AniDB.EpisodeNumber)
             .ToList();
diff --git a/Shokofin/API/Models/Episode.cs b/Shokofin/API/Models/Episode.cs
index 2964655a..912ed3b9 100644
--- a/Shokofin/API/Models/Episode.cs
+++ b/Shokofin/API/Models/Episode.cs
@@ -106,7 +106,7 @@ public class TvDB
 
     public class EpisodeIDs : IDs
     {
-        public int Series { get; set; }
+        public int ParentSeries { get; set; }
 
         public int AniDB { get; set; }
 
diff --git a/Shokofin/Events/EventDispatchService.cs b/Shokofin/Events/EventDispatchService.cs
index 3c735544..fa20313b 100644
--- a/Shokofin/Events/EventDispatchService.cs
+++ b/Shokofin/Events/EventDispatchService.cs
@@ -651,7 +651,7 @@ await season.RefreshMetadata(new(DirectoryService) {
                     )
                     .ToList();
                 foreach (var episode in episodes) {
-                    Logger.LogInformation("Refreshing episode {EpisodeName}. (Episode={EpisodeId},Episode={EpisodeId},Series={SeriesId})", episode.Name, episode.Id, episodeInfo.Id, episodeInfo.Shoko.IDs.Series.ToString());
+                    Logger.LogInformation("Refreshing episode {EpisodeName}. (Episode={EpisodeId},Episode={EpisodeId},Series={SeriesId})", episode.Name, episode.Id, episodeInfo.Id, episodeInfo.Shoko.IDs.ParentSeries.ToString());
                     await episode.RefreshMetadata(new(DirectoryService) {
                         MetadataRefreshMode = MetadataRefreshMode.FullRefresh,
                         ImageRefreshMode = MetadataRefreshMode.FullRefresh,

From 7e09606140b654bc06207875f07645d925a11804 Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Wed, 10 Jul 2024 17:24:23 +0200
Subject: [PATCH 3/9] misc: update exception message

---
 Shokofin/Utils/Ordering.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Shokofin/Utils/Ordering.cs b/Shokofin/Utils/Ordering.cs
index f76c30b4..b4617bb1 100644
--- a/Shokofin/Utils/Ordering.cs
+++ b/Shokofin/Utils/Ordering.cs
@@ -147,7 +147,7 @@ public static int GetEpisodeNumber(ShowInfo showInfo, SeasonInfo seasonInfo, Epi
 
         // If we still cannot find the episode for whatever reason, then bail. I don't fudging know why, but I know it's not the plugin's fault.
         if (index == -1)
-            throw new IndexOutOfRangeException($"Unable to find index to use for \"{episodeInfo.Shoko.Name}\". (Episode={episodeInfo.Id},Series={seasonInfo.Id},ExtraSeries={seasonInfo.ExtraIds})");
+            throw new IndexOutOfRangeException($"Unable to find index to use for \"{episodeInfo.Shoko.Name}\". (Group=\"{showInfo.GroupId}\",Series=\"{seasonInfo.Id}\",ExtraSeries={(seasonInfo.ExtraIds.Count > 0 ? $"[\"{seasonInfo.ExtraIds.Join("\",\"")}\"]" : "[]")},Episode={episodeInfo.Id})");
 
         return index + 1;
     }

From 5575a5a4744340c8e8a813bc79c0e0926e7b3315 Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Wed, 10 Jul 2024 17:24:43 +0200
Subject: [PATCH 4/9] fix: populate all lookup tables before returning

---
 Shokofin/API/ShokoAPIManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shokofin/API/ShokoAPIManager.cs b/Shokofin/API/ShokoAPIManager.cs
index e76fb083..06081d58 100644
--- a/Shokofin/API/ShokoAPIManager.cs
+++ b/Shokofin/API/ShokoAPIManager.cs
@@ -982,9 +982,9 @@ public bool TryGetDefaultSeriesIdForSeriesId(string seriesId, [NotNullWhen(true)
 
                 PathToSeriesIdDictionary[path] = primaryId;
                 SeriesIdToPathDictionary.TryAdd(primaryId, path);
-
-                return primaryId;
             }
+
+            return primaryId;
         }
 
         // In the edge case for series with only files with multiple

From c6229e0aa18153877378608ed33974c64ffe2823 Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Thu, 11 Jul 2024 02:15:40 +0200
Subject: [PATCH 5/9] misc: add another extra type conditional

---
 Shokofin/Utils/Ordering.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Shokofin/Utils/Ordering.cs b/Shokofin/Utils/Ordering.cs
index b4617bb1..4b603bea 100644
--- a/Shokofin/Utils/Ordering.cs
+++ b/Shokofin/Utils/Ordering.cs
@@ -288,6 +288,8 @@ public static int GetSeasonNumber(ShowInfo showInfo, SeasonInfo seasonInfo, Epis
                 )
                     return ExtraType.Clip;
                 // Behind the Scenes
+                if (title.Contains("behind the scenes", System.StringComparison.CurrentCultureIgnoreCase))
+                    return ExtraType.BehindTheScenes;
                 if (title.Contains("making of", System.StringComparison.CurrentCultureIgnoreCase))
                     return ExtraType.BehindTheScenes;
                 if (title.Contains("music in", System.StringComparison.CurrentCultureIgnoreCase))

From 138ab618526947307841c940294d7d23176e389b Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Fri, 12 Jul 2024 00:22:16 +0200
Subject: [PATCH 6/9] feat: Allow disabling the filter for movie libraries

- Allow users to disable the filtering done on movie type libraries to keep out anything that's not a movie from the library. Use at your own risk. This essentially allows you to put any series in a movie type library and they will all show up as movies.
---
 Shokofin/Configuration/PluginConfiguration.cs  | 6 ++++++
 Shokofin/Configuration/configController.js     | 3 +++
 Shokofin/Configuration/configPage.html         | 7 +++++++
 Shokofin/Resolvers/ShokoIgnoreRule.cs          | 2 +-
 Shokofin/Resolvers/ShokoResolver.cs            | 2 +-
 Shokofin/Resolvers/VirtualFileSystemService.cs | 2 +-
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Shokofin/Configuration/PluginConfiguration.cs b/Shokofin/Configuration/PluginConfiguration.cs
index 9ffc0f5e..09bd0d2d 100644
--- a/Shokofin/Configuration/PluginConfiguration.cs
+++ b/Shokofin/Configuration/PluginConfiguration.cs
@@ -285,6 +285,11 @@ public virtual string PrettyUrl
     /// </summary>
     public bool SeparateMovies { get; set; }
 
+    /// <summary>
+    /// Filter out anything that's not a movie in a movie library.
+    /// </summary>
+    public bool FilterMovieLibraries { get; set; }
+
     /// <summary>
     /// Append all specials in AniDB movie series as special features for
     /// the movies.
@@ -542,6 +547,7 @@ public PluginConfiguration()
         VFS_AddResolution = false;
         UseGroupsForShows = false;
         SeparateMovies = false;
+        FilterMovieLibraries = true;
         MovieSpecialsAsExtraFeaturettes = false;
         AddTrailers = true;
         AddCreditsAsThemeVideos = true;
diff --git a/Shokofin/Configuration/configController.js b/Shokofin/Configuration/configController.js
index 8156e0e1..28028be7 100644
--- a/Shokofin/Configuration/configController.js
+++ b/Shokofin/Configuration/configController.js
@@ -323,6 +323,7 @@ async function defaultSubmit(form) {
         config.CollectionGrouping = form.querySelector("#CollectionGrouping").value;
         config.CollectionMinSizeOfTwo = form.querySelector("#CollectionMinSizeOfTwo").checked;
         config.SeparateMovies = form.querySelector("#SeparateMovies").checked;
+        config.FilterMovieLibraries = form.querySelector("#FilterMovieLibraries").checked;
         config.SpecialsPlacement = form.querySelector("#SpecialsPlacement").value;
         config.MovieSpecialsAsExtraFeaturettes = form.querySelector("#MovieSpecialsAsExtraFeaturettes").checked;
         config.AddTrailers = form.querySelector("#AddTrailers").checked;
@@ -533,6 +534,7 @@ async function syncSettings(form) {
     config.UseGroupsForShows = form.querySelector("#UseGroupsForShows").checked;
     config.SeasonOrdering = form.querySelector("#SeasonOrdering").value;
     config.SeparateMovies = form.querySelector("#SeparateMovies").checked;
+    config.FilterMovieLibraries = form.querySelector("#FilterMovieLibraries").checked;
     config.CollectionGrouping = form.querySelector("#CollectionGrouping").value;
     config.CollectionMinSizeOfTwo = form.querySelector("#CollectionMinSizeOfTwo").checked;
     config.SpecialsPlacement = form.querySelector("#SpecialsPlacement").value;
@@ -1005,6 +1007,7 @@ export default function (page) {
             form.querySelector("#CollectionGrouping").value = config.CollectionGrouping;
             form.querySelector("#CollectionMinSizeOfTwo").checked = config.CollectionMinSizeOfTwo;
             form.querySelector("#SeparateMovies").checked = config.SeparateMovies;
+            form.querySelector("#FilterMovieLibraries").checked = config.FilterMovieLibraries;
             form.querySelector("#SpecialsPlacement").value = config.SpecialsPlacement === "Default" ? "AfterSeason" : config.SpecialsPlacement;
             form.querySelector("#MovieSpecialsAsExtraFeaturettes").checked = config.MovieSpecialsAsExtraFeaturettes;
             form.querySelector("#AddTrailers").checked = config.AddTrailers;
diff --git a/Shokofin/Configuration/configPage.html b/Shokofin/Configuration/configPage.html
index 91b50b58..79bd3f86 100644
--- a/Shokofin/Configuration/configPage.html
+++ b/Shokofin/Configuration/configPage.html
@@ -1139,6 +1139,13 @@ <h3>Library Settings</h3>
                             </label>
                             <div class="fieldDescription checkboxFieldDescription">This filters out movies from the shows in your library. Disable this if you want your movies to show up as episodes within seasons of your shows instead.</div>
                         </div>
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label class="emby-checkbox-label">
+                                <input is="emby-checkbox" type="checkbox" id="FilterMovieLibraries" />
+                                <span>Filter movie libraries</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">This filters out anything that is not a movie in any movie libraries. Disable this if you want your anything to show up as movies in your movie libraries instead.</div>
+                        </div>
                         <div class="selectContainer selectContainer-withDescription">
                             <label class="selectLabel" for="SpecialsPlacement">Specials placement within seasons:</label>
                             <select is="emby-select" id="SpecialsPlacement" name="SpecialsPlacement" class="emby-select-withcolor emby-select">
diff --git a/Shokofin/Resolvers/ShokoIgnoreRule.cs b/Shokofin/Resolvers/ShokoIgnoreRule.cs
index ffe2391e..f3f94eaf 100644
--- a/Shokofin/Resolvers/ShokoIgnoreRule.cs
+++ b/Shokofin/Resolvers/ShokoIgnoreRule.cs
@@ -164,7 +164,7 @@ private async Task<bool> ShouldFilterDirectory(string partialPath, string fullPa
                 }
                 break;
             case CollectionType.movies:
-                if (!isMovieSeason) {
+                if (!isMovieSeason && Plugin.Instance.Configuration.FilterMovieLibraries) {
                     Logger.LogInformation("Found show in movie library, ignoring shoko series. (Series={SeriesId},ExtraSeries={ExtraIds})", season.Id, season.ExtraIds);
                     return true;
                 }
diff --git a/Shokofin/Resolvers/ShokoResolver.cs b/Shokofin/Resolvers/ShokoResolver.cs
index 9c5fc7eb..905a86d4 100644
--- a/Shokofin/Resolvers/ShokoResolver.cs
+++ b/Shokofin/Resolvers/ShokoResolver.cs
@@ -146,7 +146,7 @@ NamingOptions namingOptions
                             return Array.Empty<BaseItem>();
                         }
 
-                        if (createMovies && season.Type is SeriesType.Movie) {
+                        if (createMovies && (season.Type is SeriesType.Movie || collectionType is CollectionType.movies && !Plugin.Instance.Configuration.FilterMovieLibraries)) {
                             return FileSystem.GetFiles(dirInfo.FullName)
                                 .AsParallel()
                                 .Select(fileInfo => {
diff --git a/Shokofin/Resolvers/VirtualFileSystemService.cs b/Shokofin/Resolvers/VirtualFileSystemService.cs
index 16f23060..dd67d2d7 100644
--- a/Shokofin/Resolvers/VirtualFileSystemService.cs
+++ b/Shokofin/Resolvers/VirtualFileSystemService.cs
@@ -678,7 +678,7 @@ await Task.WhenAll(allFiles.Select(async (tuple) => {
         var config = Plugin.Instance.Configuration;
         var shouldAbort = collectionType switch {
             CollectionType.tvshows => isMovieSeason && config.SeparateMovies,
-            CollectionType.movies => !isMovieSeason,
+            CollectionType.movies => !isMovieSeason && config.FilterMovieLibraries,
             _ => false,
         };
         if (shouldAbort)

From 7682a4d686a0a6e972d7150fe178ae474c428c74 Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Sun, 14 Jul 2024 20:14:27 +0200
Subject: [PATCH 7/9] fix: change custom id format

- Fixes #62

- The previous custom id format caused problems because it contained a '=', which is not usable in the id (for now at least).
---
 Shokofin/Providers/SeriesProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Shokofin/Providers/SeriesProvider.cs b/Shokofin/Providers/SeriesProvider.cs
index b6dbe198..cba803ac 100644
--- a/Shokofin/Providers/SeriesProvider.cs
+++ b/Shokofin/Providers/SeriesProvider.cs
@@ -105,7 +105,7 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, Cancellat
 
     public static void AddProviderIds(IHasProviderIds item, string seriesId, string? groupId = null, string? anidbId = null, string? tmdbId = null)
     {
-        item.SetProviderId(MetadataProvider.Custom, $"shoko://shoko-series={seriesId}");
+        item.SetProviderId(MetadataProvider.Custom, $"shoko://series/{seriesId}");
 
         var config = Plugin.Instance.Configuration;
         item.SetProviderId(ShokoSeriesId.Name, seriesId);

From 519e10984393e97a0cddd8ccf6a86ddd7ada2672 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <1627021+EraYaN@users.noreply.github.com>
Date: Sat, 13 Jul 2024 14:18:06 +0200
Subject: [PATCH 8/9] fix: change the direct access on ProviderIds

---
 Shokofin.sln                                  | 11 ++++++++++-
 Shokofin/Collections/CollectionManager.cs     |  5 +++--
 Shokofin/IdLookup.cs                          | 15 +++++++++------
 Shokofin/MergeVersions/MergeVersionManager.cs |  8 ++++----
 Shokofin/Providers/BoxSetProvider.cs          |  4 ++--
 Shokofin/Providers/CustomBoxSetProvider.cs    |  8 ++++----
 Shokofin/Providers/CustomEpisodeProvider.cs   |  3 ++-
 Shokofin/Providers/CustomSeasonProvider.cs    |  3 ++-
 Shokofin/Providers/CustomSeriesProvider.cs    |  3 ++-
 Shokofin/Providers/EpisodeProvider.cs         |  2 +-
 Shokofin/Providers/ImageProvider.cs           |  4 ++--
 Shokofin/Providers/SeasonProvider.cs          |  6 ++++--
 Shokofin/Resolvers/ShokoLibraryMonitor.cs     |  3 ++-
 Shokofin/Shokofin.csproj                      |  4 ++--
 14 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/Shokofin.sln b/Shokofin.sln
index d0bcca4c..aedfe0ba 100644
--- a/Shokofin.sln
+++ b/Shokofin.sln
@@ -1,6 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shokofin", "Shokofin\Shokofin.csproj", "{1DD876AE-9E68-4867-BDF6-B9050E63E936}"
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35013.160
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shokofin", "Shokofin\Shokofin.csproj", "{1DD876AE-9E68-4867-BDF6-B9050E63E936}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,4 +16,10 @@ Global
 		{1DD876AE-9E68-4867-BDF6-B9050E63E936}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DD876AE-9E68-4867-BDF6-B9050E63E936}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {61FD2206-EAAB-47E0-BB8D-1033C70B3973}
+	EndGlobalSection
 EndGlobal
diff --git a/Shokofin/Collections/CollectionManager.cs b/Shokofin/Collections/CollectionManager.cs
index 018d3d54..f1d4704a 100644
--- a/Shokofin/Collections/CollectionManager.cs
+++ b/Shokofin/Collections/CollectionManager.cs
@@ -9,6 +9,7 @@
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Logging;
 using Shokofin.API;
 using Shokofin.API.Info;
@@ -666,7 +667,7 @@ private Dictionary<string, IReadOnlyList<BoxSet>> GetSeriesCollections()
             Recursive = true,
         })
             .Cast<BoxSet>()
-            .Select(x => x.ProviderIds.TryGetValue(ShokoCollectionSeriesId.Name, out var seriesId) && !string.IsNullOrEmpty(seriesId) ? new { SeriesId = seriesId, BoxSet = x } : null)
+            .Select(x => x.TryGetProviderId(ShokoCollectionSeriesId.Name, out var seriesId) ? new { SeriesId = seriesId, BoxSet = x } : null)
             .Where(x => x != null)
             .GroupBy(x => x!.SeriesId, x => x!.BoxSet)
             .ToDictionary(x => x.Key, x => x.ToList() as IReadOnlyList<BoxSet>);
@@ -683,7 +684,7 @@ private Dictionary<string, IReadOnlyList<BoxSet>> GetGroupCollections()
             Recursive = true,
         })
             .Cast<BoxSet>()
-            .Select(x => x.ProviderIds.TryGetValue(ShokoCollectionGroupId.Name, out var groupId) && !string.IsNullOrEmpty(groupId) ? new { GroupId = groupId, BoxSet = x } : null)
+            .Select(x => x.TryGetProviderId(ShokoCollectionGroupId.Name, out var groupId) ? new { GroupId = groupId, BoxSet = x } : null)
             .Where(x => x != null)
             .GroupBy(x => x!.GroupId, x => x!.BoxSet)
             .ToDictionary(x => x.Key, x => x.ToList() as IReadOnlyList<BoxSet>);
diff --git a/Shokofin/IdLookup.cs b/Shokofin/IdLookup.cs
index 0ed4cd97..3d2fde33 100644
--- a/Shokofin/IdLookup.cs
+++ b/Shokofin/IdLookup.cs
@@ -5,6 +5,8 @@
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
+
 using Shokofin.API;
 using Shokofin.ExternalIds;
 using Shokofin.Providers;
@@ -167,7 +169,8 @@ public bool TryGetSeriesIdFromEpisodeId(string episodeId, [NotNullWhen(true)] ou
 
     public bool TryGetSeriesIdFor(Series series, [NotNullWhen(true)] out string? seriesId)
     {
-        if (series.ProviderIds.TryGetValue(ShokoSeriesId.Name, out seriesId!) && !string.IsNullOrEmpty(seriesId))
+        if (series.TryGetProviderId(ShokoSeriesId.Name, out seriesId) 
+            && series.TryGetProviderId(MetadataProvider.Custom, out _))
             return true;
 
         if (TryGetSeriesIdFor(series.Path, out seriesId)) {
@@ -185,7 +188,7 @@ public bool TryGetSeriesIdFor(Series series, [NotNullWhen(true)] out string? ser
 
     public bool TryGetSeriesIdFor(Season season, [NotNullWhen(true)] out string? seriesId)
     {
-        if (season.ProviderIds.TryGetValue(ShokoSeriesId.Name, out seriesId) && !string.IsNullOrEmpty(seriesId))
+        if (season.TryGetProviderId(ShokoSeriesId.Name, out seriesId))
             return true;
 
         return TryGetSeriesIdFor(season.Path, out seriesId);
@@ -193,7 +196,7 @@ public bool TryGetSeriesIdFor(Season season, [NotNullWhen(true)] out string? ser
 
     public bool TryGetSeriesIdFor(Movie movie, [NotNullWhen(true)] out string? seriesId)
     {
-        if (movie.ProviderIds.TryGetValue(ShokoSeriesId.Name, out seriesId!) && !string.IsNullOrEmpty(seriesId))
+        if (movie.TryGetProviderId(ShokoSeriesId.Name, out seriesId!))
             return true;
 
         if (TryGetEpisodeIdFor(movie.Path, out var episodeId) && TryGetSeriesIdFromEpisodeId(episodeId, out seriesId))
@@ -229,7 +232,7 @@ public bool TryGetEpisodeIdFor(string path, [NotNullWhen(true)] out string? epis
     public bool TryGetEpisodeIdFor(BaseItem item, [NotNullWhen(true)] out string? episodeId)
     {
         // This will account for virtual episodes and existing episodes
-        if (item.ProviderIds.TryGetValue(ShokoEpisodeId.Name, out episodeId!) && !string.IsNullOrEmpty(episodeId)) {
+        if (item.TryGetProviderId(ShokoEpisodeId.Name, out episodeId!)) {
             return true;
         }
 
@@ -253,7 +256,7 @@ public bool TryGetEpisodeIdsFor(string path, [NotNullWhen(true)] out List<string
     public bool TryGetEpisodeIdsFor(BaseItem item, [NotNullWhen(true)] out List<string>? episodeIds)
     {
         // This will account for virtual episodes and existing episodes
-        if (item.ProviderIds.TryGetValue(ShokoFileId.Name, out var fileId) && item.ProviderIds.TryGetValue(ShokoSeriesId.Name, out var seriesId) && ApiManager.TryGetEpisodeIdsForFileId(fileId, seriesId, out episodeIds!))
+        if (item.TryGetProviderId(ShokoFileId.Name, out var fileId) && item.TryGetProviderId(ShokoSeriesId.Name, out var seriesId) && ApiManager.TryGetEpisodeIdsForFileId(fileId, seriesId, out episodeIds!))
             return true;
 
         // This will account for new episodes that haven't received their first metadata update yet.
@@ -280,7 +283,7 @@ public bool TryGetPathForEpisodeId(string episodeId, [NotNullWhen(true)] out str
 
     public bool TryGetFileIdFor(BaseItem episode, [NotNullWhen(true)] out string? fileId)
     {
-        if (episode.ProviderIds.TryGetValue(ShokoFileId.Name, out fileId!))
+        if (episode.TryGetProviderId(ShokoFileId.Name, out fileId!))
             return true;
 
         if (ApiManager.TryGetFileIdForPath(episode.Path, out fileId!))
diff --git a/Shokofin/MergeVersions/MergeVersionManager.cs b/Shokofin/MergeVersions/MergeVersionManager.cs
index f2d46d62..d5e147a6 100644
--- a/Shokofin/MergeVersions/MergeVersionManager.cs
+++ b/Shokofin/MergeVersions/MergeVersionManager.cs
@@ -155,7 +155,7 @@ public async Task MergeAllMovies(IProgress<double> progress, CancellationToken c
         // Merge all movies with more than one version.
         var movies = GetMoviesFromLibrary();
         var duplicationGroups = movies
-            .GroupBy(x => (x.GetTopParent()?.Path, x.ProviderIds[ShokoEpisodeId.Name]))
+            .GroupBy(x => (x.GetTopParent()?.Path, x.GetProviderId(ShokoEpisodeId.Name)))
             .Where(x => x.Count() > 1)
             .ToList();
         double currentCount = 0d;
@@ -224,7 +224,7 @@ private async Task SplitAndMergeAllMovies(IProgress<double> progress, Cancellati
 
         // Merge all movies with more than one version (again).
         var duplicationGroups = movies
-            .GroupBy(movie => (movie.GetTopParent()?.Path, movie.ProviderIds[ShokoEpisodeId.Name]))
+            .GroupBy(movie => (movie.GetTopParent()?.Path, movie.GetProviderId(ShokoEpisodeId.Name)))
             .Where(movie => movie.Count() > 1)
             .ToList();
         currentCount = 0d;
@@ -290,7 +290,7 @@ public async Task MergeAllEpisodes(IProgress<double> progress, CancellationToken
         // of additional episodes.
         var episodes = GetEpisodesFromLibrary();
         var duplicationGroups = episodes
-            .GroupBy(e => (e.GetTopParent()?.Path, $"{e.ProviderIds[ShokoEpisodeId.Name]}-{(e.IndexNumberEnd ?? e.IndexNumber ?? 1) - (e.IndexNumber ?? 1)}"))
+            .GroupBy(e => (e.GetTopParent()?.Path, $"{e.GetProviderId(ShokoEpisodeId.Name)}-{(e.IndexNumberEnd ?? e.IndexNumber ?? 1) - (e.IndexNumber ?? 1)}"))
             .Where(e => e.Count() > 1)
             .ToList();
         double currentCount = 0d;
@@ -361,7 +361,7 @@ private async Task SplitAndMergeAllEpisodes(IProgress<double> progress, Cancella
         // Merge episodes with more than one version (again), and with the same
         // number of additional episodes.
         var duplicationGroups = episodes
-            .GroupBy(e => (e.GetTopParent()?.Path, $"{e.ProviderIds[ShokoEpisodeId.Name]}-{(e.IndexNumberEnd ?? e.IndexNumber ?? 1) - (e.IndexNumber ?? 1)}"))
+            .GroupBy(e => (e.GetTopParent()?.Path, $"{e.GetProviderId(ShokoEpisodeId.Name)}-{(e.IndexNumberEnd ?? e.IndexNumber ?? 1) - (e.IndexNumber ?? 1)}"))
             .Where(e => e.Count() > 1)
             .ToList();
         currentCount = 0d;
diff --git a/Shokofin/Providers/BoxSetProvider.cs b/Shokofin/Providers/BoxSetProvider.cs
index 8e2292e6..a6b4bb1c 100644
--- a/Shokofin/Providers/BoxSetProvider.cs
+++ b/Shokofin/Providers/BoxSetProvider.cs
@@ -38,12 +38,12 @@ public async Task<MetadataResult<BoxSet>> GetMetadata(BoxSetInfo info, Cancellat
     {
         try {
             // Try to read the shoko group id
-            if (info.ProviderIds.TryGetValue(ShokoCollectionGroupId.Name, out var collectionId) || info.Path.TryGetAttributeValue(ShokoCollectionGroupId.Name, out collectionId))
+            if (info.TryGetProviderId(ShokoCollectionGroupId.Name, out var collectionId) || info.Path.TryGetAttributeValue(ShokoCollectionGroupId.Name, out collectionId))
                 using (Plugin.Instance.Tracker.Enter($"Providing info for Collection \"{info.Name}\". (Path=\"{info.Path}\",Collection=\"{collectionId}\")"))
                     return await GetShokoGroupMetadata(info, collectionId);
 
             // Try to read the shoko series id
-            if (info.ProviderIds.TryGetValue(ShokoCollectionSeriesId.Name, out var seriesId) || info.Path.TryGetAttributeValue(ShokoCollectionSeriesId.Name, out seriesId))
+            if (info.TryGetProviderId(ShokoCollectionSeriesId.Name, out var seriesId) || info.Path.TryGetAttributeValue(ShokoCollectionSeriesId.Name, out seriesId))
                 using (Plugin.Instance.Tracker.Enter($"Providing info for Collection \"{info.Name}\". (Path=\"{info.Path}\",Series=\"{seriesId}\")"))
                     return await GetShokoSeriesMetadata(info, seriesId);
 
diff --git a/Shokofin/Providers/CustomBoxSetProvider.cs b/Shokofin/Providers/CustomBoxSetProvider.cs
index c5a47d5c..c8cd2fac 100644
--- a/Shokofin/Providers/CustomBoxSetProvider.cs
+++ b/Shokofin/Providers/CustomBoxSetProvider.cs
@@ -54,13 +54,13 @@ public async Task<ItemUpdateType> FetchAsync(BoxSet collection, MetadataRefreshO
             return ItemUpdateType.None;
 
         // Try to read the shoko group id
-        if (collection.ProviderIds.TryGetValue(ShokoCollectionGroupId.Name, out var collectionId) || collection.Path.TryGetAttributeValue(ShokoCollectionGroupId.Name, out collectionId))
+        if (collection.TryGetProviderId(ShokoCollectionGroupId.Name, out var collectionId) || collection.Path.TryGetAttributeValue(ShokoCollectionGroupId.Name, out collectionId))
             using (Plugin.Instance.Tracker.Enter($"Providing custom info for Collection \"{collection.Name}\". (Path=\"{collection.Path}\",Collection=\"{collectionId}\")"))
                 if (await EnsureGroupCollectionIsCorrect(collectionRoot, collection, collectionId, cancellationToken))
                     return ItemUpdateType.MetadataEdit;
 
         // Try to read the shoko series id
-        if (collection.ProviderIds.TryGetValue(ShokoCollectionSeriesId.Name, out var seriesId) || collection.Path.TryGetAttributeValue(ShokoCollectionSeriesId.Name, out seriesId))
+        if (collection.TryGetProviderId(ShokoCollectionSeriesId.Name, out var seriesId) || collection.Path.TryGetAttributeValue(ShokoCollectionSeriesId.Name, out seriesId))
             using (Plugin.Instance.Tracker.Enter($"Providing custom info for Collection \"{collection.Name}\". (Path=\"{collection.Path}\",Series=\"{seriesId}\")"))
                 if (await EnsureSeriesCollectionIsCorrect(collection, seriesId, cancellationToken))
                     return ItemUpdateType.MetadataEdit;
@@ -120,8 +120,8 @@ private async Task<bool> EnsureGroupCollectionIsCorrect(Folder collectionRoot, B
 
     private bool EnsureNoTmdbIdIsSet(BoxSet collection)
     {
-        var willRemove = collection.ProviderIds.ContainsKey(MetadataProvider.TmdbCollection.ToString());
-        collection.ProviderIds.Remove(MetadataProvider.TmdbCollection.ToString());
+        var willRemove = collection.HasProviderId(MetadataProvider.TmdbCollection);
+        collection.SetProviderId(MetadataProvider.TmdbCollection.ToString(), null);
         return willRemove;
     }
 
diff --git a/Shokofin/Providers/CustomEpisodeProvider.cs b/Shokofin/Providers/CustomEpisodeProvider.cs
index 35b3647a..e096bd9d 100644
--- a/Shokofin/Providers/CustomEpisodeProvider.cs
+++ b/Shokofin/Providers/CustomEpisodeProvider.cs
@@ -4,6 +4,7 @@
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Logging;
 using Shokofin.ExternalIds;
 
@@ -43,7 +44,7 @@ public Task<ItemUpdateType> FetchAsync(Episode episode, MetadataRefreshOptions o
             return Task.FromResult(ItemUpdateType.None);
 
         // Abort if we're unable to get the shoko episode id
-        if (episode.ProviderIds.TryGetValue(ShokoEpisodeId.Name, out var episodeId))
+        if (episode.TryGetProviderId(ShokoEpisodeId.Name, out var episodeId))
             using (Plugin.Instance.Tracker.Enter($"Providing custom info for Episode \"{episode.Name}\". (Path=\"{episode.Path}\",IsMissingEpisode={episode.IsMissingEpisode})"))
                 if (RemoveDuplicates(LibraryManager, Logger, episodeId, episode, series.GetPresentationUniqueKey()))
                     return Task.FromResult(ItemUpdateType.MetadataEdit);
diff --git a/Shokofin/Providers/CustomSeasonProvider.cs b/Shokofin/Providers/CustomSeasonProvider.cs
index 1b5b55d8..22e85720 100644
--- a/Shokofin/Providers/CustomSeasonProvider.cs
+++ b/Shokofin/Providers/CustomSeasonProvider.cs
@@ -6,6 +6,7 @@
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Logging;
 using Shokofin.API;
 using Shokofin.ExternalIds;
@@ -53,7 +54,7 @@ public async Task<ItemUpdateType> FetchAsync(Season season, MetadataRefreshOptio
 
         // Silently abort if we're unable to get the shoko series id.
         var series = season.Series;
-        if (!series.ProviderIds.TryGetValue(ShokoSeriesId.Name, out var seriesId))
+        if (!series.TryGetProviderId(ShokoSeriesId.Name, out var seriesId))
             return ItemUpdateType.None;
 
         var seasonNumber = season.IndexNumber!.Value;
diff --git a/Shokofin/Providers/CustomSeriesProvider.cs b/Shokofin/Providers/CustomSeriesProvider.cs
index ffe8e3f6..f9313b94 100644
--- a/Shokofin/Providers/CustomSeriesProvider.cs
+++ b/Shokofin/Providers/CustomSeriesProvider.cs
@@ -6,6 +6,7 @@
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Logging;
 using Shokofin.API;
 using Shokofin.ExternalIds;
@@ -40,7 +41,7 @@ public CustomSeriesProvider(ILogger<CustomSeriesProvider> logger, ShokoAPIManage
     public async Task<ItemUpdateType> FetchAsync(Series series, MetadataRefreshOptions options, CancellationToken cancellationToken)
     {
         // Abort if we're unable to get the shoko series id
-        if (!series.ProviderIds.TryGetValue(ShokoSeriesId.Name, out var seriesId))
+        if (!series.TryGetProviderId(ShokoSeriesId.Name, out var seriesId))
             return ItemUpdateType.None;
 
         var trackerId = Plugin.Instance.Tracker.Add($"Providing custom info for Series \"{series.Name}\". (Series=\"{seriesId}\")");
diff --git a/Shokofin/Providers/EpisodeProvider.cs b/Shokofin/Providers/EpisodeProvider.cs
index 7a70ace5..c0d33afa 100644
--- a/Shokofin/Providers/EpisodeProvider.cs
+++ b/Shokofin/Providers/EpisodeProvider.cs
@@ -52,7 +52,7 @@ public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo info, Cancell
             Info.ShowInfo? showInfo = null;
             if (info.IsMissingEpisode || string.IsNullOrEmpty(info.Path)) {
                 // We're unable to fetch the latest metadata for the virtual episode.
-                if (!info.ProviderIds.TryGetValue(ShokoEpisodeId.Name, out var episodeId))
+                if (!info.TryGetProviderId(ShokoEpisodeId.Name, out var episodeId))
                     return result;
 
                 episodeInfo = await ApiManager.GetEpisodeInfo(episodeId);
diff --git a/Shokofin/Providers/ImageProvider.cs b/Shokofin/Providers/ImageProvider.cs
index 43a77ad6..ce5884c3 100644
--- a/Shokofin/Providers/ImageProvider.cs
+++ b/Shokofin/Providers/ImageProvider.cs
@@ -116,8 +116,8 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
                 }
                 case BoxSet collection: {
                     string? groupId = null;
-                    if (!collection.ProviderIds.TryGetValue(ShokoCollectionSeriesId.Name, out var seriesId) &&
-                        collection.ProviderIds.TryGetValue(ShokoCollectionGroupId.Name, out groupId))
+                    if (!collection.TryGetProviderId(ShokoCollectionSeriesId.Name, out var seriesId) &&
+                        collection.TryGetProviderId(ShokoCollectionGroupId.Name, out groupId))
                             seriesId = (await ApiManager.GetCollectionInfoForGroup(groupId))?.Shoko.IDs.MainSeries.ToString();
                     if (!string.IsNullOrEmpty(seriesId)) {
                         var seriesImages = await ApiClient.GetSeriesImages(seriesId);
diff --git a/Shokofin/Providers/SeasonProvider.cs b/Shokofin/Providers/SeasonProvider.cs
index 09c59993..0eb18d87 100644
--- a/Shokofin/Providers/SeasonProvider.cs
+++ b/Shokofin/Providers/SeasonProvider.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
 using Microsoft.Extensions.Logging;
 using Shokofin.API;
@@ -154,9 +155,10 @@ public static Season CreateMetadata(Info.SeasonInfo seasonInfo, int seasonNumber
                 CommunityRating = seasonInfo.AniDB.Rating?.ToFloat(10),
             };
         }
-        season.ProviderIds.Add(ShokoSeriesId.Name, seasonInfo.Id);
+        season.SetProviderId(ShokoSeriesId.Name, seasonInfo.Id);
+
         if (Plugin.Instance.Configuration.AddAniDBId)
-            season.ProviderIds.Add("AniDB", seasonInfo.AniDB.Id.ToString());
+            season.SetProviderId("AniDB", seasonInfo.AniDB.Id.ToString());
 
         return season;
     }
diff --git a/Shokofin/Resolvers/ShokoLibraryMonitor.cs b/Shokofin/Resolvers/ShokoLibraryMonitor.cs
index 1aedf429..5f2e31ff 100644
--- a/Shokofin/Resolvers/ShokoLibraryMonitor.cs
+++ b/Shokofin/Resolvers/ShokoLibraryMonitor.cs
@@ -7,6 +7,7 @@
 using Emby.Naming.Common;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Shokofin.API;
@@ -289,7 +290,7 @@ await Cache.GetOrCreateAsync(
                             Logger.LogTrace("Skipped path because it is not a shoko managed file; {Path}", path);
                             return null;
                         }
-                        if (!video.ProviderIds.TryGetValue(ShokoFileId.Name, out fileId)) {
+                        if (!video.TryGetProviderId(ShokoFileId.Name, out fileId)) {
                             Logger.LogTrace("Skipped path because it is not a shoko managed file; {Path}", path);
                             return null;
                         }
diff --git a/Shokofin/Shokofin.csproj b/Shokofin/Shokofin.csproj
index 88e66e47..a0c292aa 100644
--- a/Shokofin/Shokofin.csproj
+++ b/Shokofin/Shokofin.csproj
@@ -2,13 +2,13 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <OutputType>Library</OutputType>
-        <SignalRVersion>8.0.3</SignalRVersion>
+        <SignalRVersion>8.0.7</SignalRVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="AsyncKeyedLock" Version="6.4.2" />
-        <PackageReference Include="Jellyfin.Controller" Version="10.9.0" />
+        <PackageReference Include="Jellyfin.Controller" Version="10.9.7" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="$(SignalRVersion)" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     </ItemGroup>

From 67edfa7cc9440147e22c4df72f6aba55cfd2b812 Mon Sep 17 00:00:00 2001
From: Mikal Stordal <mikalstordal@gmail.com>
Date: Sat, 13 Jul 2024 17:05:08 +0200
Subject: [PATCH 9/9] fix: add fallback if lookup fails

- Added a fallback for when the lookup tables fails. The fallback will be slower, but at least it will provide a value and populate the lookup table for the next time.

- Trimmed trailing whitespaces.
---
 Shokofin/API/ShokoAPIManager.cs | 134 ++++++++++++++++++++++----------
 Shokofin/IdLookup.cs            |  60 ++++----------
 2 files changed, 108 insertions(+), 86 deletions(-)

diff --git a/Shokofin/API/ShokoAPIManager.cs b/Shokofin/API/ShokoAPIManager.cs
index 06081d58..70742a36 100644
--- a/Shokofin/API/ShokoAPIManager.cs
+++ b/Shokofin/API/ShokoAPIManager.cs
@@ -40,14 +40,10 @@ public class ShokoAPIManager : IDisposable
 
     private readonly ConcurrentDictionary<string, (string FileId, string SeriesId)> PathToFileIdAndSeriesIdDictionary = new();
 
-    private readonly ConcurrentDictionary<string, string> SeriesIdToPathDictionary = new();
-
     private readonly ConcurrentDictionary<string, string> SeriesIdToDefaultSeriesIdDictionary = new();
 
     private readonly ConcurrentDictionary<string, string?> SeriesIdToCollectionIdDictionary = new();
 
-    private readonly ConcurrentDictionary<string, string> EpisodeIdToEpisodePathDictionary = new();
-
     private readonly ConcurrentDictionary<string, string> EpisodeIdToSeriesIdDictionary = new();
 
     private readonly ConcurrentDictionary<string, List<string>> FileAndSeriesIdToEpisodeIdDictionary = new();
@@ -108,9 +104,9 @@ private void OnTrackerStalled(object? sender, EventArgs eventArgs)
     public string StripMediaFolder(string fullPath)
     {
         Folder? mediaFolder = null;
-        lock (MediaFolderListLock) 
+        lock (MediaFolderListLock)
             mediaFolder = MediaFolderList.FirstOrDefault((folder) => fullPath.StartsWith(folder.Path + Path.DirectorySeparatorChar));
-        if (mediaFolder is not null) 
+        if (mediaFolder is not null)
             return fullPath[mediaFolder.Path.Length..];
         if (Path.GetDirectoryName(fullPath) is not string directoryPath || LibraryManager.FindByPath(directoryPath, true)?.GetTopParent() is not Folder topParent)
             return fullPath;
@@ -131,7 +127,6 @@ public void Dispose()
     public void Clear()
     {
         Logger.LogDebug("Clearing data…");
-        EpisodeIdToEpisodePathDictionary.Clear();
         EpisodeIdToSeriesIdDictionary.Clear();
         FileAndSeriesIdToEpisodeIdDictionary.Clear();
         lock (MediaFolderListLock)
@@ -142,7 +137,6 @@ public void Clear()
         NameToSeriesIdDictionary.Clear();
         SeriesIdToDefaultSeriesIdDictionary.Clear();
         SeriesIdToCollectionIdDictionary.Clear();
-        SeriesIdToPathDictionary.Clear();
         DataCache.Clear();
         Logger.LogDebug("Cleanup complete.");
     }
@@ -481,10 +475,6 @@ internal void AddFileLookupIds(string path, string fileId, string seriesId, IEnu
             // Find the file info for the series.
             var fileInfo = await CreateFileInfo(file, fileId, seriesId).ConfigureAwait(false);
 
-            // Add pointers for faster lookup.
-            foreach (var episodeInfo in fileInfo.EpisodeList)
-                EpisodeIdToEpisodePathDictionary.TryAdd(episodeInfo.Id, path);
-
             // Add pointers for faster lookup.
             AddFileLookupIds(path, fileId, seriesId, fileInfo.EpisodeList.Select(episode => episode.Id));
 
@@ -557,13 +547,27 @@ private Task<FileInfo> CreateFileInfo(File file, string fileId, string seriesId)
             }
         );
 
-    public bool TryGetFileIdForPath(string path, out string? fileId)
+    public bool TryGetFileIdForPath(string path, [NotNullWhen(true)] out string? fileId)
     {
-        if (!string.IsNullOrEmpty(path) && PathToFileIdAndSeriesIdDictionary.TryGetValue(path, out var pair)) {
+        if (string.IsNullOrEmpty(path)) {
+            fileId = null;
+            return false;
+        }
+
+        // Fast path; using the lookup.
+        if (PathToFileIdAndSeriesIdDictionary.TryGetValue(path, out var pair)) {
             fileId = pair.FileId;
             return true;
         }
 
+        // Slow path; getting the show from cache or remote and finding the default season's id.
+        Logger.LogDebug("Trying to find file id using the slow path. (Path={FullPath})", path);
+        if (GetFileInfoByPath(path).ConfigureAwait(false).GetAwaiter().GetResult() is { } tuple && tuple.Item1 is not null) {
+            var (fileInfo, _, _) = tuple;
+            fileId = fileInfo.Id;
+            return true;
+        }
+
         fileId = null;
         return false;
     }
@@ -594,51 +598,85 @@ private EpisodeInfo CreateEpisodeInfo(Episode episode, string episodeId)
             }
         );
 
-    public bool TryGetEpisodeIdForPath(string path, out string? episodeId)
+    public bool TryGetEpisodeIdForPath(string path, [NotNullWhen(true)] out string? episodeId)
     {
         if (string.IsNullOrEmpty(path)) {
             episodeId = null;
             return false;
         }
-        var result = PathToEpisodeIdsDictionary.TryGetValue(path, out var episodeIds);
+
+        var result = TryGetEpisodeIdsForPath(path, out var episodeIds);
         episodeId = episodeIds?.FirstOrDefault();
         return result;
     }
 
-    public bool TryGetEpisodeIdsForPath(string path, out List<string>? episodeIds)
+    public bool TryGetEpisodeIdsForPath(string path, [NotNullWhen(true)] out List<string>? episodeIds)
     {
         if (string.IsNullOrEmpty(path)) {
             episodeIds = null;
             return false;
         }
-        return PathToEpisodeIdsDictionary.TryGetValue(path, out episodeIds);
+
+        // Fast path; using the lookup.
+        if (PathToEpisodeIdsDictionary.TryGetValue(path, out episodeIds))
+            return true;
+
+        // Slow path; getting the show from cache or remote and finding the default season's id.
+        Logger.LogDebug("Trying to find episode ids using the slow path. (Path={FullPath})", path);
+        if (GetFileInfoByPath(path).ConfigureAwait(false).GetAwaiter().GetResult() is { } tuple && tuple.Item1 is not null) {
+            var (fileInfo, _, _) = tuple;
+            episodeIds = fileInfo.EpisodeList.Select(episodeInfo => episodeInfo.Id).ToList();
+            return episodeIds.Count is > 0;
+        }
+
+        episodeIds = null;
+        return false;
     }
 
-    public bool TryGetEpisodeIdsForFileId(string fileId, string seriesId, out List<string>? episodeIds)
+    public bool TryGetEpisodeIdsForFileId(string fileId, string seriesId, [NotNullWhen(true)] out List<string>? episodeIds)
     {
         if (string.IsNullOrEmpty(fileId) || string.IsNullOrEmpty(seriesId)) {
             episodeIds = null;
             return false;
         }
-        return FileAndSeriesIdToEpisodeIdDictionary.TryGetValue($"{fileId}:{seriesId}", out episodeIds);
+
+        // Fast path; using the lookup.
+        if (FileAndSeriesIdToEpisodeIdDictionary.TryGetValue($"{fileId}:{seriesId}", out episodeIds))
+            return true;
+
+        // Slow path; getting the show from cache or remote and finding the default season's id.
+        Logger.LogDebug("Trying to find episode ids using the slow path. (Series={SeriesId},File={FileId})", seriesId, fileId);
+        if (GetFileInfo(fileId, seriesId).ConfigureAwait(false).GetAwaiter().GetResult() is { } fileInfo) {
+            episodeIds = fileInfo.EpisodeList.Select(episodeInfo => episodeInfo.Id).ToList();
+            return true;
+        }
+
+        episodeIds = null;
+        return false;
     }
 
-    public bool TryGetEpisodePathForId(string episodeId, out string? path)
+    public bool TryGetSeriesIdForEpisodeId(string episodeId, [NotNullWhen(true)] out string? seriesId)
     {
         if (string.IsNullOrEmpty(episodeId)) {
-            path = null;
+            seriesId = null;
             return false;
         }
-        return EpisodeIdToEpisodePathDictionary.TryGetValue(episodeId, out path);
-    }
 
-    public bool TryGetSeriesIdForEpisodeId(string episodeId, out string? seriesId)
-    {
-        if (string.IsNullOrEmpty(episodeId)) {
+        // Fast path; using the lookup.
+        if (EpisodeIdToSeriesIdDictionary.TryGetValue(episodeId, out seriesId))
+            return true;
+
+        // Slow path; asking the http client to get the series from remote to look up it's id.
+        Logger.LogDebug("Trying to find episode ids using the slow path. (Episode={EpisodeId})", episodeId);
+        try {
+            var series = APIClient.GetSeriesFromEpisode(episodeId).ConfigureAwait(false).GetAwaiter().GetResult();
+            seriesId = series.IDs.Shoko.ToString();
+            return true;
+        }
+        catch (ApiException ex) when (ex.StatusCode is System.Net.HttpStatusCode.NotFound) {
             seriesId = null;
             return false;
         }
-        return EpisodeIdToSeriesIdDictionary.TryGetValue(episodeId, out seriesId);
     }
 
     #endregion
@@ -813,7 +851,7 @@ private async Task<SeasonInfo> CreateSeasonInfo(Series series)
 
                 Logger.LogTrace("Creating new series-to-season mapping for series. (Series={SeriesId})", primaryId);
 
-                // We potentially have a "follow-up" season candidate, so look for the "primary" season candidate, then jump into that. 
+                // We potentially have a "follow-up" season candidate, so look for the "primary" season candidate, then jump into that.
                 var relations = await APIClient.GetSeriesRelations(primaryId).ConfigureAwait(false);
                 var mainTitle = series.AniDBEntity.Titles.First(title => title.Type == TitleType.Main).Value;
                 var result = YearRegex.Match(mainTitle);
@@ -926,16 +964,20 @@ public bool TryGetSeriesIdForPath(string path, [NotNullWhen(true)] out string? s
             seriesId = null;
             return false;
         }
-        return PathToSeriesIdDictionary.TryGetValue(path, out seriesId);
-    }
 
-    public bool TryGetSeriesPathForId(string seriesId, [NotNullWhen(true)] out string? path)
-    {
-        if (string.IsNullOrEmpty(seriesId)) {
-            path = null;
-            return false;
+        // Fast path; using the lookup.
+        if (PathToSeriesIdDictionary.TryGetValue(path, out seriesId))
+            return true;
+
+        // Slow path; getting the show from cache or remote and finding the season's series id.
+        Logger.LogDebug("Trying to find the season's series id for {Path} using the slow path.", path);
+        if (GetSeasonInfoByPath(path).ConfigureAwait(false).GetAwaiter().GetResult() is { } seasonInfo) {
+            seriesId = seasonInfo.Id;
+            return true;
         }
-        return SeriesIdToPathDictionary.TryGetValue(seriesId, out path);
+
+        seriesId = null;
+        return false;
     }
 
     public bool TryGetDefaultSeriesIdForSeriesId(string seriesId, [NotNullWhen(true)] out string? defaultSeriesId)
@@ -944,7 +986,20 @@ public bool TryGetDefaultSeriesIdForSeriesId(string seriesId, [NotNullWhen(true)
             defaultSeriesId = null;
             return false;
         }
-        return SeriesIdToDefaultSeriesIdDictionary.TryGetValue(seriesId, out defaultSeriesId);
+
+        // Fast path; using the lookup.
+        if (SeriesIdToDefaultSeriesIdDictionary.TryGetValue(seriesId, out defaultSeriesId))
+            return true;
+
+        // Slow path; getting the show from cache or remote and finding the default season's id.
+        Logger.LogDebug("Trying to find the default series id for series using the slow path. (Series={SeriesId})", seriesId);
+        if (GetShowInfoForSeries(seriesId).ConfigureAwait(false).GetAwaiter().GetResult() is { } showInfo) {
+            defaultSeriesId = showInfo.Id;
+            return true;
+        }
+
+        defaultSeriesId = null;
+        return false;
     }
 
     private async Task<string?> GetSeriesIdForPath(string path)
@@ -959,8 +1014,6 @@ public bool TryGetDefaultSeriesIdForSeriesId(string seriesId, [NotNullWhen(true)
                 return null;
 
             PathToSeriesIdDictionary[path] = seriesId;
-            SeriesIdToPathDictionary.TryAdd(seriesId, path);
-
             return seriesId;
         }
 
@@ -981,7 +1034,6 @@ public bool TryGetDefaultSeriesIdForSeriesId(string seriesId, [NotNullWhen(true)
                     continue;
 
                 PathToSeriesIdDictionary[path] = primaryId;
-                SeriesIdToPathDictionary.TryAdd(primaryId, path);
             }
 
             return primaryId;
diff --git a/Shokofin/IdLookup.cs b/Shokofin/IdLookup.cs
index 3d2fde33..e7f68ae0 100644
--- a/Shokofin/IdLookup.cs
+++ b/Shokofin/IdLookup.cs
@@ -6,7 +6,6 @@
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
-
 using Shokofin.API;
 using Shokofin.ExternalIds;
 using Shokofin.Providers;
@@ -63,11 +62,6 @@ public interface IIdLookup
     /// <returns>True if it successfully retrieved the id for the <see cref="MediaBrowser.Controller.Entities.TV.Season" />.</returns>
     bool TryGetSeriesIdFor(Movie movie, [NotNullWhen(true)] out string? seriesId);
 
-    #endregion
-    #region Series Path
-
-    bool TryGetPathForSeriesId(string seriesId, [NotNullWhen(true)] out string? path);
-
     #endregion
     #region Episode Id
 
@@ -79,11 +73,6 @@ public interface IIdLookup
 
     bool TryGetEpisodeIdsFor(BaseItem item, [NotNullWhen(true)] out List<string>? episodeIds);
 
-    #endregion
-    #region Episode Path
-
-    bool TryGetPathForEpisodeId(string episodeId, [NotNullWhen(true)] out string? path);
-
     #endregion
     #region File Id
 
@@ -151,7 +140,7 @@ public bool IsEnabledForItem(BaseItem item, out bool isSoleProvider)
 
     public bool TryGetSeriesIdFor(string path, [NotNullWhen(true)] out string? seriesId)
     {
-        if (ApiManager.TryGetSeriesIdForPath(path, out seriesId!))
+        if (ApiManager.TryGetSeriesIdForPath(path, out seriesId))
             return true;
 
         seriesId = string.Empty;
@@ -160,7 +149,7 @@ public bool TryGetSeriesIdFor(string path, [NotNullWhen(true)] out string? serie
 
     public bool TryGetSeriesIdFromEpisodeId(string episodeId, [NotNullWhen(true)] out string? seriesId)
     {
-        if (ApiManager.TryGetSeriesIdForEpisodeId(episodeId, out seriesId!))
+        if (ApiManager.TryGetSeriesIdForEpisodeId(episodeId, out seriesId))
             return true;
 
         seriesId = string.Empty;
@@ -169,8 +158,7 @@ public bool TryGetSeriesIdFromEpisodeId(string episodeId, [NotNullWhen(true)] ou
 
     public bool TryGetSeriesIdFor(Series series, [NotNullWhen(true)] out string? seriesId)
     {
-        if (series.TryGetProviderId(ShokoSeriesId.Name, out seriesId) 
-            && series.TryGetProviderId(MetadataProvider.Custom, out _))
+        if (series.TryGetProviderId(ShokoSeriesId.Name, out seriesId))
             return true;
 
         if (TryGetSeriesIdFor(series.Path, out seriesId)) {
@@ -196,7 +184,7 @@ public bool TryGetSeriesIdFor(Season season, [NotNullWhen(true)] out string? ser
 
     public bool TryGetSeriesIdFor(Movie movie, [NotNullWhen(true)] out string? seriesId)
     {
-        if (movie.TryGetProviderId(ShokoSeriesId.Name, out seriesId!))
+        if (movie.TryGetProviderId(ShokoSeriesId.Name, out seriesId))
             return true;
 
         if (TryGetEpisodeIdFor(movie.Path, out var episodeId) && TryGetSeriesIdFromEpisodeId(episodeId, out seriesId))
@@ -205,24 +193,12 @@ public bool TryGetSeriesIdFor(Movie movie, [NotNullWhen(true)] out string? serie
         return false;
     }
 
-    #endregion
-    #region Series Path
-
-    public bool TryGetPathForSeriesId(string seriesId, [NotNullWhen(true)] out string? path)
-    {
-        if (ApiManager.TryGetSeriesPathForId(seriesId, out path!))
-            return true;
-
-        path = string.Empty;
-        return false;
-    }
-
     #endregion
     #region Episode Id
 
     public bool TryGetEpisodeIdFor(string path, [NotNullWhen(true)] out string? episodeId)
     {
-        if (ApiManager.TryGetEpisodeIdForPath(path, out episodeId!))
+        if (ApiManager.TryGetEpisodeIdForPath(path, out episodeId))
             return true;
 
         episodeId = string.Empty;
@@ -232,7 +208,7 @@ public bool TryGetEpisodeIdFor(string path, [NotNullWhen(true)] out string? epis
     public bool TryGetEpisodeIdFor(BaseItem item, [NotNullWhen(true)] out string? episodeId)
     {
         // This will account for virtual episodes and existing episodes
-        if (item.TryGetProviderId(ShokoEpisodeId.Name, out episodeId!)) {
+        if (item.TryGetProviderId(ShokoEpisodeId.Name, out episodeId)) {
             return true;
         }
 
@@ -246,7 +222,7 @@ public bool TryGetEpisodeIdFor(BaseItem item, [NotNullWhen(true)] out string? ep
 
     public bool TryGetEpisodeIdsFor(string path, [NotNullWhen(true)] out List<string>? episodeIds)
     {
-        if (ApiManager.TryGetEpisodeIdsForPath(path, out episodeIds!))
+        if (ApiManager.TryGetEpisodeIdsForPath(path, out episodeIds))
             return true;
 
         episodeIds = new();
@@ -255,26 +231,20 @@ public bool TryGetEpisodeIdsFor(string path, [NotNullWhen(true)] out List<string
 
     public bool TryGetEpisodeIdsFor(BaseItem item, [NotNullWhen(true)] out List<string>? episodeIds)
     {
-        // This will account for virtual episodes and existing episodes
-        if (item.TryGetProviderId(ShokoFileId.Name, out var fileId) && item.TryGetProviderId(ShokoSeriesId.Name, out var seriesId) && ApiManager.TryGetEpisodeIdsForFileId(fileId, seriesId, out episodeIds!))
+        // This will account for existing episodes.
+        if (item.TryGetProviderId(ShokoFileId.Name, out var fileId) && item.TryGetProviderId(ShokoSeriesId.Name, out var seriesId) && ApiManager.TryGetEpisodeIdsForFileId(fileId, seriesId, out episodeIds))
             return true;
 
         // This will account for new episodes that haven't received their first metadata update yet.
         if (TryGetEpisodeIdsFor(item.Path, out episodeIds))
             return true;
 
-        return false;
-    }
-
-    #endregion
-    #region Episode Path
-
-    public bool TryGetPathForEpisodeId(string episodeId, [NotNullWhen(true)] out string? path)
-    {
-        if (ApiManager.TryGetEpisodePathForId(episodeId, out path!))
+        // This will account for "missing" episodes.
+        if (item.TryGetProviderId(ShokoEpisodeId.Name, out var episodeId)) {
+            episodeIds = [episodeId];
             return true;
+        }
 
-        path = string.Empty;
         return false;
     }
 
@@ -283,10 +253,10 @@ public bool TryGetPathForEpisodeId(string episodeId, [NotNullWhen(true)] out str
 
     public bool TryGetFileIdFor(BaseItem episode, [NotNullWhen(true)] out string? fileId)
     {
-        if (episode.TryGetProviderId(ShokoFileId.Name, out fileId!))
+        if (episode.TryGetProviderId(ShokoFileId.Name, out fileId))
             return true;
 
-        if (ApiManager.TryGetFileIdForPath(episode.Path, out fileId!))
+        if (ApiManager.TryGetFileIdForPath(episode.Path, out fileId))
             return true;
 
         fileId = string.Empty;