fix overlap with tvdb sdk 4.7.9.1 merge

jellyfin · Feb 29, 2024 · 2e9c25c · 2e9c25c
1 parent 69d22ce
commit 2e9c25c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Jellyfin.Plugin.Tvdb/Providers/TvdbSeasonImageProvider.cs b/Jellyfin.Plugin.Tvdb/Providers/TvdbSeasonImageProvider.cs
@@ -83,7 +83,8 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
             .ConfigureAwait(false);
         var seasonArtworkTypeLookup = artworkTypes
             .Where(t => string.Equals(t.RecordType, "season", StringComparison.OrdinalIgnoreCase))
-            .ToDictionary(t => t.Id);
+            .Where(t => t.Id.HasValue)
+            .ToDictionary(t => t.Id!.Value);
 
         var seriesTvdbId = series.GetTvdbId();
         var seasonNumber = season.IndexNumber.Value;
@@ -94,7 +95,7 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
         var remoteImages = new List<RemoteImageInfo>();
         foreach (var artwork in seasonArtworks)
         {
-            var artworkType = seasonArtworkTypeLookup.GetValueOrDefault(artwork.Type);
+            var artworkType = artwork.Type is null ? null : seasonArtworkTypeLookup.GetValueOrDefault(artwork.Type!.Value);
             var imageType = artworkType.GetImageType();
             var artworkLanguage = artwork.Language is null ? null : languageLookup.GetValueOrDefault(artwork.Language);
 

diff --git a/Jellyfin.Plugin.Tvdb/Providers/TvdbSeriesImageProvider.cs b/Jellyfin.Plugin.Tvdb/Providers/TvdbSeriesImageProvider.cs
@@ -80,7 +80,8 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
             .ConfigureAwait(false);
         var seriesArtworkTypeLookup = artworkTypes
             .Where(t => string.Equals(t.RecordType, "series", StringComparison.OrdinalIgnoreCase))
-            .ToDictionary(t => t.Id);
+            .Where(t => t.Id.HasValue)
+            .ToDictionary(t => t.Id!.Value);
 
         var seriesTvdbId = item.GetTvdbId();
         var seriesArtworks = await GetSeriesArtworks(seriesTvdbId, cancellationToken)
@@ -90,7 +91,7 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
         var tvdbId = item.GetTvdbId();
         foreach (var artwork in seriesArtworks)
         {
-            var artworkType = seriesArtworkTypeLookup.GetValueOrDefault(artwork.Type);
+            var artworkType = artwork.Type is null ? null : seriesArtworkTypeLookup.GetValueOrDefault(artwork.Type!.Value);
             var imageType = artworkType.GetImageType();
             var artworkLanguage = artwork.Language is null ? null : languageLookup.GetValueOrDefault(artwork.Language);
 

diff --git a/Jellyfin.Plugin.Tvdb/TvdbSdkExtensions.cs b/Jellyfin.Plugin.Tvdb/TvdbSdkExtensions.cs
@@ -159,7 +159,7 @@ private static bool IsMatch(this Translation translation, string? language)
             language);
     }
 
-    private static RemoteImageInfo? CreateRemoteImageInfo(string imageUrl, string thumbnailUrl, (long Width, long Height) imageDimension, string providerName, ImageType? type, Language? language)
+    private static RemoteImageInfo? CreateRemoteImageInfo(string imageUrl, string thumbnailUrl, (long? Width, long? Height) imageDimension, string providerName, ImageType? type, Language? language)
     {
         if (type is null)
         {