Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #12134 from jellyfin/release-10.9.z

Browse Source 
Only cleanup children on specific exceptions

Original-merge: 6cf98d49300459b7795b994733ba05837e22cf1e

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Shadowghost 2024-06-23 11:40:58 -04:00 committed by Joshua M. Boniface
parent a13dc9b91c
commit 81e38e772b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Security;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -370,9 +371,18 @@ namespace MediaBrowser.Controller.Entities
{ {
nonCachedChildren = GetNonCachedChildren(directoryService); 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) catch (Exception ex)
{ {
Logger.LogError(ex, "Error retrieving children folder"); Logger.LogError(ex, "Error retrieving children");
return;
} }
progress.Report(ProgressHelpers.RetrievedChildren); progress.Report(ProgressHelpers.RetrievedChildren);