From ecb73168b34e3d58dff186b6d90fb4bdd192e24a Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Mon, 10 Jan 2022 08:25:46 -0700
Subject: Suggestions from review

---
 Jellyfin.Api/Controllers/ImageController.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'Jellyfin.Api/Controllers/ImageController.cs')

diff --git a/Jellyfin.Api/Controllers/ImageController.cs b/Jellyfin.Api/Controllers/ImageController.cs
index 6d34ca770..b44a21d03 100644
--- a/Jellyfin.Api/Controllers/ImageController.cs
+++ b/Jellyfin.Api/Controllers/ImageController.cs
@@ -48,7 +48,7 @@ namespace Jellyfin.Api.Controllers
         private readonly ILogger<ImageController> _logger;
         private readonly IServerConfigurationManager _serverConfigurationManager;
         private readonly IApplicationPaths _appPaths;
-        private readonly IImageGenerator _imageGenerator;
+        private readonly IImageEncoder _imageEncoder;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageController"/> class.
@@ -62,7 +62,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="logger">Instance of the <see cref="ILogger{ImageController}"/> interface.</param>
         /// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
         /// <param name="appPaths">Instance of the <see cref="IApplicationPaths"/> interface.</param>
-        /// <param name="imageGenerator">Instance of the <see cref="IImageGenerator"/> interface.</param>
+        /// <param name="imageEncoder">Instance of the <see cref="IImageEncoder"/> interface.</param>
         public ImageController(
             IUserManager userManager,
             ILibraryManager libraryManager,
@@ -73,7 +73,7 @@ namespace Jellyfin.Api.Controllers
             ILogger<ImageController> logger,
             IServerConfigurationManager serverConfigurationManager,
             IApplicationPaths appPaths,
-            IImageGenerator imageGenerator)
+            IImageEncoder imageEncoder)
         {
             _userManager = userManager;
             _libraryManager = libraryManager;
@@ -84,7 +84,7 @@ namespace Jellyfin.Api.Controllers
             _logger = logger;
             _serverConfigurationManager = serverConfigurationManager;
             _appPaths = appPaths;
-            _imageGenerator = imageGenerator;
+            _imageEncoder = imageEncoder;
         }
 
         /// <summary>
@@ -1737,19 +1737,20 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? foregroundLayer,
             [FromQuery, Range(0, 100)] int quality = 90)
         {
-            string splashscreenPath;
             var brandingOptions = _serverConfigurationManager.GetConfiguration<BrandingOptions>("branding");
-            if (!string.IsNullOrWhiteSpace(brandingOptions.SplashscreenLocation))
+            string splashscreenPath;
+
+            if (!string.IsNullOrWhiteSpace(brandingOptions.SplashscreenLocation)
+                && System.IO.File.Exists(brandingOptions.SplashscreenLocation))
             {
-                splashscreenPath = brandingOptions.SplashscreenLocation!;
+                splashscreenPath = brandingOptions.SplashscreenLocation;
             }
             else
             {
                 splashscreenPath = Path.Combine(_appPaths.DataPath, "splashscreen.webp");
-
-                if (!System.IO.File.Exists(splashscreenPath) && _imageGenerator.GetSupportedImages().Contains(GeneratedImageType.Splashscreen))
+                if (!System.IO.File.Exists(splashscreenPath))
                 {
-                    _imageGenerator.Generate(GeneratedImageType.Splashscreen, splashscreenPath);
+                    return NotFound();
                 }
             }
 
-- 
cgit v1.2.3