aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/AppBase
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2025-11-17 14:09:03 -0500
committerBond_009 <bond.009@outlook.com>2025-11-17 14:09:03 -0500
commitd7f628677e45cca6a4c34b57ff37a4d81e19277f (patch)
tree01ddc8f986edc138f336491f3ff7a46e5c8d8639 /Emby.Server.Implementations/AppBase
parente51680cf56f423c0401dad87e030be48337af5cb (diff)
Backport pull request #15466 from jellyfin/release-10.11.z
Don't error out when searching for marker files fails Original-merge: f4a846aa4dcffb3be7b701f806b24cb8dd6b7c5d Merged-by: crobibero <cody@robibe.ro> Backported-by: Bond_009 <bond.009@outlook.com>
Diffstat (limited to 'Emby.Server.Implementations/AppBase')
-rw-r--r--Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
index c69bcfef7..de722332a 100644
--- a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
+++ b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
@@ -107,10 +107,20 @@ namespace Emby.Server.Implementations.AppBase
private void CheckOrCreateMarker(string path, string markerName, bool recursive = false)
{
- var otherMarkers = GetMarkers(path, recursive).FirstOrDefault(e => Path.GetFileName(e) != markerName);
+ string? otherMarkers = null;
+ try
+ {
+ otherMarkers = GetMarkers(path, recursive).FirstOrDefault(e => !Path.GetFileName(e.AsSpan()).Equals(markerName, StringComparison.OrdinalIgnoreCase));
+ }
+ catch
+ {
+ // Error while checking for marker files, assume none exist and keep going
+ // TODO: add some logging
+ }
+
if (otherMarkers is not null)
{
- throw new InvalidOperationException($"Exepected to find only {markerName} but found marker for {otherMarkers}.");
+ throw new InvalidOperationException($"Expected to find only {markerName} but found marker for {otherMarkers}.");
}
var markerPath = Path.Combine(path, markerName);