From 28274d4c757f1bf10b8280b34577a1ef1aaa8823 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Fri, 7 Jun 2024 22:12:48 +0200
Subject: [PATCH] Remove empty image folders recursively

---
 MediaBrowser.Providers/Manager/ImageSaver.cs        | 4 ++--
 MediaBrowser.Providers/Manager/ItemImageProvider.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index e0677aa9f..b43056115 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -190,9 +190,9 @@ namespace MediaBrowser.Providers.Manager
 
                     // Remove containing directory if empty
                     var folder = Path.GetDirectoryName(currentPath);
-                    if (!_fileSystem.GetFiles(folder).Any())
+                    if (Directory.Exists(folder) && !_fileSystem.GetFiles(folder, true).Any())
                     {
-                        Directory.Delete(folder);
+                        Directory.Delete(folder, true);
                     }
                 }
                 catch (FileNotFoundException)
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index bee420d95..763e5be96 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -381,9 +381,9 @@ namespace MediaBrowser.Providers.Manager
                     {
                         // Always remove empty parent folder
                         var folder = Path.GetDirectoryName(image.Path);
-                        if (Directory.Exists(folder) && !_fileSystem.GetFiles(folder).Any())
+                        if (Directory.Exists(folder) && !_fileSystem.GetFiles(folder, true).Any())
                         {
-                            Directory.Delete(folder);
+                            Directory.Delete(folder, true);
                         }
                     }
                 }