From c8d93d9352a8858476f4e73067a8cc508fe2f993 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Wed, 28 Feb 2024 17:39:31 -0700
Subject: [PATCH] Return backdrops with text as thumb for tmdb (#11078)

---
 .../Tmdb/BoxSets/TmdbBoxSetImageProvider.cs      | 14 ++++++--------
 .../Tmdb/Movies/TmdbMovieImageProvider.cs        | 16 +++++++---------
 .../Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs   | 16 +++++++---------
 .../Plugins/Tmdb/TmdbClientManager.cs            | 13 +++++++++++--
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs
index a4c6cb47de..18cdba7a00 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs
@@ -46,14 +46,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
         }
 
         /// <inheritdoc />
-        public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
-        {
-            return new ImageType[]
-            {
-                ImageType.Primary,
-                ImageType.Backdrop
-            };
-        }
+        public IEnumerable<ImageType> GetSupportedImages(BaseItem item) =>
+        [
+            ImageType.Primary,
+            ImageType.Backdrop,
+            ImageType.Thumb
+        ];
 
         /// <inheritdoc />
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs
index bfec48e7c7..1696a2c498 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs
@@ -47,15 +47,13 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
         }
 
         /// <inheritdoc />
-        public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
-        {
-            return new ImageType[]
-            {
-                ImageType.Primary,
-                ImageType.Backdrop,
-                ImageType.Logo
-            };
-        }
+        public IEnumerable<ImageType> GetSupportedImages(BaseItem item) =>
+        [
+            ImageType.Primary,
+            ImageType.Backdrop,
+            ImageType.Logo,
+            ImageType.Thumb
+        ];
 
         /// <inheritdoc />
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index 192fb052d7..2cb4fe1c15 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -46,15 +46,13 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         }
 
         /// <inheritdoc />
-        public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
-        {
-            return new ImageType[]
-            {
-                ImageType.Primary,
-                ImageType.Backdrop,
-                ImageType.Logo
-            };
-        }
+        public IEnumerable<ImageType> GetSupportedImages(BaseItem item) =>
+        [
+            ImageType.Primary,
+            ImageType.Backdrop,
+            ImageType.Logo,
+            ImageType.Thumb
+        ];
 
         /// <inheritdoc />
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
index 82f2c54f16..d704a5f492 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
@@ -591,6 +591,15 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
             {
                 var image = images[i];
 
+                var imageType = type;
+                var language = TmdbUtils.AdjustImageLanguage(image.Iso_639_1, requestLanguage);
+
+                // Return Backdrops with a language specified (it has text) as Thumb.
+                if (imageType == ImageType.Backdrop && !string.IsNullOrEmpty(language))
+                {
+                    imageType = ImageType.Thumb;
+                }
+
                 yield return new RemoteImageInfo
                 {
                     Url = GetUrl(size, image.FilePath),
@@ -598,9 +607,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                     VoteCount = image.VoteCount,
                     Width = scaleImage ? null : image.Width,
                     Height = scaleImage ? null : image.Height,
-                    Language = TmdbUtils.AdjustImageLanguage(image.Iso_639_1, requestLanguage),
+                    Language = language,
                     ProviderName = TmdbUtils.ProviderName,
-                    Type = type,
+                    Type = imageType,
                     RatingType = RatingType.Score
                 };
             }