aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Folder.cs
diff options
context:
space:
mode:
authorShadowghost <Shadowghost@users.noreply.github.com>2024-06-23 11:40:58 -0400
committerJoshua M. Boniface <joshua@boniface.me>2024-06-23 11:40:58 -0400
commit81e38e772b438b0811e77e12b8ba44d9c2bb2955 (patch)
tree2a14b3ffc09425fa14595721e331462197f18517 /MediaBrowser.Controller/Entities/Folder.cs
parenta13dc9b91c76ba76aa8360723c292e33ad3e9705 (diff)
Backport pull request #12134 from jellyfin/release-10.9.z
Only cleanup children on specific exceptions Original-merge: 6cf98d49300459b7795b994733ba05837e22cf1e Merged-by: crobibero <cody@robibe.ro> Backported-by: Joshua M. Boniface <joshua@boniface.me>
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index fcb45e7e5..b2e5d7263 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
+using System.Security;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
@@ -370,9 +371,18 @@ namespace MediaBrowser.Controller.Entities
{
nonCachedChildren = GetNonCachedChildren(directoryService);
}
+ catch (IOException ex)
+ {
+ Logger.LogError(ex, "Error retrieving children from file system");
+ }
+ catch (SecurityException ex)
+ {
+ Logger.LogError(ex, "Error retrieving children from file system");
+ }
catch (Exception ex)
{
- Logger.LogError(ex, "Error retrieving children folder");
+ Logger.LogError(ex, "Error retrieving children");
+ return;
}
progress.Report(ProgressHelpers.RetrievedChildren);