From 52194f56b5f07e3ae01e2fb6d121452e37d1e93f Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Mon, 5 Dec 2022 15:01:13 +0100
Subject: Replace != null with is not null

---
 Emby.Server.Implementations/MediaEncoder/EncodingManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations/MediaEncoder/EncodingManager.cs')

diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
index 6e1dc725d..9fe51f083 100644
--- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -71,7 +71,7 @@ namespace Emby.Server.Implementations.MediaEncoder
             }
 
             var libraryOptions = _libraryManager.GetLibraryOptions(video);
-            if (libraryOptions != null)
+            if (libraryOptions is not null)
             {
                 if (!libraryOptions.EnableChapterImageExtraction)
                 {
-- 
cgit v1.2.3


From 8e5bd360645c4cd183d56feeee43a5f511cab36a Mon Sep 17 00:00:00 2001
From: DarrenRuane <darrenaruane@gmail.com>
Date: Mon, 16 Jan 2023 18:34:15 +0000
Subject: Ensure existing chapter images are deleted when user disables chapter
 generation

---
 .../MediaEncoder/EncodingManager.cs                | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'Emby.Server.Implementations/MediaEncoder/EncodingManager.cs')

diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
index 9fe51f083..8103e2264 100644
--- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -15,6 +15,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -62,23 +63,16 @@ namespace Emby.Server.Implementations.MediaEncoder
         /// Determines whether [is eligible for chapter image extraction] [the specified video].
         /// </summary>
         /// <param name="video">The video.</param>
+        /// <param name="libraryOptions"></param>
         /// <returns><c>true</c> if [is eligible for chapter image extraction] [the specified video]; otherwise, <c>false</c>.</returns>
-        private bool IsEligibleForChapterImageExtraction(Video video)
+        private bool IsEligibleForChapterImageExtraction(Video video, LibraryOptions libraryOptions)
         {
             if (video.IsPlaceHolder)
             {
                 return false;
             }
 
-            var libraryOptions = _libraryManager.GetLibraryOptions(video);
-            if (libraryOptions is not null)
-            {
-                if (!libraryOptions.EnableChapterImageExtraction)
-                {
-                    return false;
-                }
-            }
-            else
+            if (libraryOptions is null || !libraryOptions.EnableChapterImageExtraction)
             {
                 return false;
             }
@@ -99,7 +93,9 @@ namespace Emby.Server.Implementations.MediaEncoder
 
         public async Task<bool> RefreshChapterImages(Video video, IDirectoryService directoryService, IReadOnlyList<ChapterInfo> chapters, bool extractImages, bool saveChapters, CancellationToken cancellationToken)
         {
-            if (!IsEligibleForChapterImageExtraction(video))
+            var libraryOptions = _libraryManager.GetLibraryOptions(video);
+
+            if (!IsEligibleForChapterImageExtraction(video, libraryOptions))
             {
                 extractImages = false;
             }
@@ -179,6 +175,12 @@ namespace Emby.Server.Implementations.MediaEncoder
                     chapter.ImageDateModified = _fileSystem.GetLastWriteTimeUtc(path);
                     changesMade = true;
                 }
+                else if (libraryOptions?.EnableChapterImageExtraction != true)
+                {
+                    // We have an image for the current chapter but the user has disabled chapter image extraction -> delete this chapter's image
+                    chapter.ImagePath = null;
+                    changesMade = true;
+                }
             }
 
             if (saveChapters && changesMade)
-- 
cgit v1.2.3


From cf8db70af8ed407ce35983fd74c1f7a6b34b5003 Mon Sep 17 00:00:00 2001
From: DarrenRuane <darrenaruane@gmail.com>
Date: Mon, 16 Jan 2023 20:06:56 +0000
Subject: Fix build failing

---
 Emby.Server.Implementations/MediaEncoder/EncodingManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations/MediaEncoder/EncodingManager.cs')

diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
index 8103e2264..7732e32d0 100644
--- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.MediaEncoder
         /// Determines whether [is eligible for chapter image extraction] [the specified video].
         /// </summary>
         /// <param name="video">The video.</param>
-        /// <param name="libraryOptions"></param>
+        /// <param name="libraryOptions">The library options for the video.</param>
         /// <returns><c>true</c> if [is eligible for chapter image extraction] [the specified video]; otherwise, <c>false</c>.</returns>
         private bool IsEligibleForChapterImageExtraction(Video video, LibraryOptions libraryOptions)
         {
-- 
cgit v1.2.3