Improved VolumeName handling for WebDav on macOS

d2dyno1 · d2dyno1 · commit 4650882fea31 · 2026-04-21T01:34:15.000+02:00
diff --git a/src/Core/SecureFolderFS.Core.Dokany/DokanyFileSystem.cs b/src/Core/SecureFolderFS.Core.Dokany/DokanyFileSystem.cs
@@ -32,6 +32,12 @@ public sealed partial class DokanyFileSystem : IFileSystemInfo
         /// <inheritdoc/>
         public partial Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);
 
+        /// <inheritdoc/>
+        public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
         /// <inheritdoc/>
         public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
         {
diff --git a/src/Core/SecureFolderFS.Core.FUSE/FuseFileSystem.cs b/src/Core/SecureFolderFS.Core.FUSE/FuseFileSystem.cs
@@ -13,7 +13,7 @@
 
 namespace SecureFolderFS.Core.FUSE
 {
-    /// <inheritdoc cref="IFileSystem"/>
+    /// <inheritdoc cref="IFileSystemInfo"/>
     public sealed partial class FuseFileSystem : IFileSystemInfo
     {
         /// <inheritdoc/>
@@ -25,6 +25,12 @@ public sealed partial class FuseFileSystem : IFileSystemInfo
         /// <inheritdoc/>
         public partial Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);
 
+        /// <inheritdoc/>
+        public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
         /// <inheritdoc/>
         public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
         {
diff --git a/src/Core/SecureFolderFS.Core.FileSystem/LocalFileSystem.cs b/src/Core/SecureFolderFS.Core.FileSystem/LocalFileSystem.cs
@@ -29,6 +29,12 @@ public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellatio
             return Task.FromResult(FileSystemAvailability.Available);
         }
 
+        /// <inheritdoc/>
+        public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
         /// <inheritdoc/>
         public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
         {
diff --git a/src/Core/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystem.cs b/src/Core/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystem.cs
@@ -25,6 +25,12 @@ public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellatio
             return Task.FromResult(FileSystemAvailability.Available);
         }
 
+        /// <inheritdoc/>
+        public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
         /// <inheritdoc/>
         public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
         {
diff --git a/src/Core/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystem.cs b/src/Core/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystem.cs
@@ -24,6 +24,12 @@ public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellatio
             return Task.FromResult(FileSystemAvailability.Available);
         }
 
+        /// <inheritdoc/>
+        public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
         /// <inheritdoc/>
         public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
         {
diff --git a/src/Core/SecureFolderFS.Core.WebDav/WebDavFileSystem.cs b/src/Core/SecureFolderFS.Core.WebDav/WebDavFileSystem.cs
@@ -68,6 +68,18 @@ public virtual async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unloc
                 cancellationToken);
         }
 
+        /// <inheritdoc/>
+        public abstract Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Mounts the WebDAV file system and initializes the provided HTTP listener, request dispatcher, and file system settings.
+        /// </summary>
+        /// <param name="specifics">Provides encryption specifics for the file system.</param>
+        /// <param name="listener">The HTTP listener to handle WebDAV requests.</param>
+        /// <param name="options">The configuration options for the WebDAV file system.</param>
+        /// <param name="requestDispatcher">The dispatcher responsible for handling WebDAV requests.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is the initialized virtual file system root.</returns>
         protected abstract Task<IVfsRoot> MountAsync(
             FileSystemSpecifics specifics,
             HttpListener listener,
diff --git a/src/Core/SecureFolderFS.Core.WinFsp/Callbacks/OnDeviceWinFsp.Helpers.cs b/src/Core/SecureFolderFS.Core.WinFsp/Callbacks/OnDeviceWinFsp.Helpers.cs
@@ -8,11 +8,13 @@ namespace SecureFolderFS.Core.WinFsp.Callbacks
 {
     public sealed partial class OnDeviceWinFsp
     {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private string GetCiphertextPath(string plaintextName)
         {
             return NativePathHelpers.GetCiphertextPath(plaintextName, _specifics);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static bool IsDirectory(string ciphertextPath)
         {
             return Directory.Exists(ciphertextPath) && !File.Exists(ciphertextPath);
@@ -71,9 +73,8 @@ private static FileOptions ToFileOptions(uint createOptions)
             if ((createOptions & FILE_RANDOM_ACCESS) != 0)
                 options |= FileOptions.RandomAccess;
 
-            // Never handle DELETE_ON_CLOSE
-            // WinFsp already tracks the delete disposition and will call Cleanup with CleanupDelete.
-            // Letting the real FileStream have DeleteOnClose bypasses your custom DeleteOrRecycle logic.
+            // Never handle FILE_DELETE_ON_CLOSE
+            // WinFsp already tracks the delete disposition and will call Cleanup with CleanupDelete
 
             return options;
         }
@@ -83,7 +84,7 @@ private static int Trace(int status, string? fileName = null, [CallerMemberName]
 #if !DEBUG
             return status;
 #endif
-            if (!Core.FileSystem.Constants.OPT_IN_FOR_OPTIONAL_DEBUG_TRACING)
+            if (!FileSystem.Constants.OPT_IN_FOR_OPTIONAL_DEBUG_TRACING)
                 return status;
 
             if (!Debugger.IsAttached)
diff --git a/src/Core/SecureFolderFS.Core.WinFsp/WinFspFileSystem.cs b/src/Core/SecureFolderFS.Core.WinFsp/WinFspFileSystem.cs
@@ -33,6 +33,12 @@ public sealed partial class WinFspFileSystem : IFileSystemInfo
         /// <inheritdoc/>
         public partial Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);
 
+        /// <inheritdoc/>
+        public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
         /// <inheritdoc/>
         public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
         {
diff --git a/src/Platforms/SecureFolderFS.Cli/CliWebDavFileSystem.cs b/src/Platforms/SecureFolderFS.Cli/CliWebDavFileSystem.cs
@@ -1,7 +1,4 @@
-using System.IO;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using NWebDav.Server.Dispatching;
 using OwlCore.Storage.Memory;
 using SecureFolderFS.Core.FileSystem;
@@ -10,22 +7,32 @@
 using SecureFolderFS.Core.WebDav.AppModels;
 using SecureFolderFS.Storage.VirtualFileSystem;
 
-namespace SecureFolderFS.Cli;
-
-internal sealed class CliWebDavFileSystem : WebDavFileSystem
+namespace SecureFolderFS.Cli
 {
-    protected override async Task<IVfsRoot> MountAsync(FileSystemSpecifics specifics, HttpListener listener, WebDavOptions options,
-        IRequestDispatcher requestDispatcher, CancellationToken cancellationToken)
+    /// <inheritdoc cref="IFileSystemInfo"/>
+    internal sealed class CliWebDavFileSystem : WebDavFileSystem
     {
-        await Task.CompletedTask;
+        /// <inheritdoc/>
+        public override Task<string> GetVolumeNameAsync(string candidateName,
+            CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
+        /// <inheritdoc/>
+        protected override async Task<IVfsRoot> MountAsync(FileSystemSpecifics specifics, HttpListener listener,
+            WebDavOptions options,
+            IRequestDispatcher requestDispatcher, CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
 
-        var remotePath = $"{options.Protocol}://{options.Domain}:{options.Port}/";
-        var webDavWrapper = new WebDavWrapper(listener, requestDispatcher, remotePath);
-        webDavWrapper.StartFileSystem();
+            var remotePath = $"{options.Protocol}://{options.Domain}:{options.Port}/";
+            var webDavWrapper = new WebDavWrapper(listener, requestDispatcher, remotePath);
+            webDavWrapper.StartFileSystem();
 
-        var virtualizedRoot = new MemoryFolder(remotePath, options.VolumeName);
-        var plaintextRoot = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), specifics.ContentFolder, specifics);
-        return new WebDavVfsRoot(webDavWrapper, virtualizedRoot, plaintextRoot, specifics);
+            var virtualizedRoot = new MemoryFolder(remotePath, options.VolumeName);
+            var plaintextRoot = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), specifics.ContentFolder, specifics);
+            return new WebDavVfsRoot(webDavWrapper, virtualizedRoot, plaintextRoot, specifics);
+        }
     }
 }
-
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.Linux.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.Linux.cs
@@ -2,10 +2,16 @@
 
 namespace SecureFolderFS.Uno.Platforms.Desktop
 {
-    /// <inheritdoc cref="IFileSystem"/>
+    /// <inheritdoc cref="IFileSystemInfo"/>
     internal sealed partial class SkiaWebDavFileSystem
     {
 #if HAS_UNO_SKIA && !__MACCATALYST__ && !__UNO_SKIA_MACOS__
+        /// <inheritdoc/>
+        public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+
         /// <inheritdoc/>
         protected override async Task<IVFSRoot> MountAsync(
             FileSystemSpecifics specifics,
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.MacOS.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.MacOS.cs
@@ -1,15 +1,20 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using NWebDav.Server.Dispatching;
+using OwlCore.Storage;
 using OwlCore.Storage.Memory;
 using SecureFolderFS.Core.FileSystem;
 using SecureFolderFS.Core.FileSystem.Storage;
 using SecureFolderFS.Core.WebDav;
 using SecureFolderFS.Core.WebDav.AppModels;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Shared.Helpers;
+using SecureFolderFS.Storage.SystemStorageEx;
 using SecureFolderFS.Storage.VirtualFileSystem;
 using SecureFolderFS.Uno.Helpers;
 
@@ -19,6 +24,22 @@ namespace SecureFolderFS.Uno.Platforms.Desktop
     internal sealed partial class SkiaWebDavFileSystem : WebDavFileSystem
     {
 #if __UNO_SKIA_MACOS__
+        /// <inheritdoc/>
+        public override async Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var folder = new SystemFolderEx("/Volumes");
+                var taken = await folder.GetItemsAsync(StorableType.All, cancellationToken).ToArrayAsyncImpl(cancellationToken);
+
+                return CollisionHelpers.GetAvailableName(candidateName, taken.Select(x => x.Name), "{0}_{1}{2}");
+            }
+            catch (Exception)
+            {
+                return candidateName;
+            }
+        }
+        
         /// <inheritdoc/>
         protected override async Task<IVfsRoot> MountAsync(
             FileSystemSpecifics specifics,
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavFileSystem.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavFileSystem.cs
@@ -17,6 +17,12 @@ namespace SecureFolderFS.Uno.Platforms.Windows
     /// <inheritdoc cref="IFileSystemInfo"/>
     public sealed class WindowsWebDavFileSystem : WebDavFileSystem
     {
+        /// <inheritdoc/>
+        public override Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(candidateName);
+        }
+        
         /// <inheritdoc/>
         protected override async Task<IVfsRoot> MountAsync(
             FileSystemSpecifics specifics,
diff --git a/src/Sdk/SecureFolderFS.Sdk/Helpers/FormattingHelpers.cs b/src/Sdk/SecureFolderFS.Sdk/Helpers/FormattingHelpers.cs
@@ -1,4 +1,5 @@
-﻿using System.IO;
+﻿using System;
+using System.IO;
 using System.Linq;
 
 namespace SecureFolderFS.Sdk.Helpers
@@ -25,7 +26,11 @@ public static string SanitizeItemName(string itemName, string fallback)
 
         public static string SanitizeVolumeName(string volumeName, string? fallback)
         {
-            return SanitizeItemName(volumeName, fallback ?? "Mounted Volume");
+            var sanitized = SanitizeItemName(volumeName, fallback ?? "Mounted Volume");
+            if (OperatingSystem.IsMacCatalyst() || OperatingSystem.IsMacOS())
+                return sanitized.Replace(' ', '_');
+
+            return sanitized;
         }
     }
 }
diff --git a/src/Sdk/SecureFolderFS.Sdk/ViewModels/VaultViewModel.cs b/src/Sdk/SecureFolderFS.Sdk/ViewModels/VaultViewModel.cs
@@ -101,7 +101,10 @@ public async Task<UnlockedVaultViewModel> UnlockAsync(IDisposable unlockContract
             var fileSystem = await VaultFileSystemService.GetBestFileSystemAsync();
 
             // Format volume name
-            var volumeName = FormattingHelpers.SanitizeVolumeName(Title ?? vaultFolder.Name, vaultFolder.Name);
+            var candidateVolumeName = FormattingHelpers.SanitizeVolumeName(Title ?? vaultFolder.Name, vaultFolder.Name);
+
+            // Get available volume name
+            var volumeName = await fileSystem.GetVolumeNameAsync(candidateVolumeName);
 
             // Configure options
             var options = new Dictionary<string, object>()
diff --git a/src/Shared/SecureFolderFS.Shared/Helpers/CollisionHelpers.cs b/src/Shared/SecureFolderFS.Shared/Helpers/CollisionHelpers.cs
@@ -6,7 +6,17 @@ namespace SecureFolderFS.Shared.Helpers
 {
     public static class CollisionHelpers
     {
-        public static string GetAvailableName(string desiredName, IEnumerable<string> existingNames)
+        /// <summary>
+        /// Generates an available name that avoids collisions
+        /// by appending a numeric suffix to the desired name
+        /// if it already exists in the provided list of existing names.
+        /// </summary>
+        /// <param name="desiredName">The desired name that will be used if it does not already exist in the list of existing names.</param>
+        /// <param name="existingNames">A collection of names that the desired name will be checked against to ensure uniqueness.</param>
+        /// <param name="format">An optional format string that will be used to generate the new name. The default is "{0} ({1}){2}" where {0} is the base name, {1} is the counter, and {2} is the file extension.</param>
+        /// <returns>A unique name that does not collide with any of the names in the existing collection.</returns>
+        public static string GetAvailableName(string desiredName, IEnumerable<string> existingNames,
+            string? format = null)
         {
             var existingNamesSet = new HashSet<string>(existingNames, StringComparer.OrdinalIgnoreCase);
             if (!existingNamesSet.Contains(desiredName))
@@ -15,11 +25,12 @@ public static string GetAvailableName(string desiredName, IEnumerable<string> ex
             var baseName = Path.GetFileNameWithoutExtension(desiredName);
             var extension = Path.GetExtension(desiredName);
             var counter = 1;
+            format ??= "{0} ({1}){2}";
 
             string newName;
             do
             {
-                newName = $"{baseName} ({counter}){extension}";
+                newName = string.Format(format, baseName, counter, extension);
                 counter++;
             } while (existingNamesSet.Contains(newName));
 
diff --git a/src/Shared/SecureFolderFS.Storage/VirtualFileSystem/IFileSystemInfo.cs b/src/Shared/SecureFolderFS.Storage/VirtualFileSystem/IFileSystemInfo.cs
@@ -30,6 +30,14 @@ public interface IFileSystemInfo
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IResult"/> that represents the status of the file system provider.</returns>
         Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);
 
+        /// <summary>
+        /// Retrieves the name of the volume based on the provided candidate name.
+        /// </summary>
+        /// <param name="candidateName">The proposed name for the volume.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. The result is a <see cref="string"/> containing the resolved volume name.</returns>
+        Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default);
+
         /// <summary>
         /// Asynchronously mounts a virtual file system instance rooted at the specified vault folder.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace SecureFolderFS.Core.FUSE`
`15`	`15`	`{`
`16`		`- /// <inheritdoc cref="IFileSystem"/>`
	`16`	`+ /// <inheritdoc cref="IFileSystemInfo"/>`
`17`	`17`	`public sealed partial class FuseFileSystem : IFileSystemInfo`
`18`	`18`	`{`
`19`	`19`	`/// <inheritdoc/>`
`@@ -25,6 +25,12 @@ public sealed partial class FuseFileSystem : IFileSystemInfo`
`25`	`25`	`/// <inheritdoc/>`
`26`	`26`	`public partial Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);`
`27`	`27`
	`28`	`+ /// <inheritdoc/>`
	`29`	`+ public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)`
	`30`	`+ {`
	`31`	`+ return Task.FromResult(candidateName);`
	`32`	`+ }`
	`33`	`+`
`28`	`34`	`/// <inheritdoc/>`
`29`	`35`	`public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)`
`30`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@ public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellatio`
`29`	`29`	`return Task.FromResult(FileSystemAvailability.Available);`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ /// <inheritdoc/>`
	`33`	`+ public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)`
	`34`	`+ {`
	`35`	`+ return Task.FromResult(candidateName);`
	`36`	`+ }`
	`37`	`+`
`32`	`38`	`/// <inheritdoc/>`
`33`	`39`	`public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)`
`34`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,12 @@ public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellatio`
`25`	`25`	`return Task.FromResult(FileSystemAvailability.Available);`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ /// <inheritdoc/>`
	`29`	`+ public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)`
	`30`	`+ {`
	`31`	`+ return Task.FromResult(candidateName);`
	`32`	`+ }`
	`33`	`+`
`28`	`34`	`/// <inheritdoc/>`
`29`	`35`	`public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)`
`30`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,12 @@ public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellatio`
`24`	`24`	`return Task.FromResult(FileSystemAvailability.Available);`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ /// <inheritdoc/>`
	`28`	`+ public Task<string> GetVolumeNameAsync(string candidateName, CancellationToken cancellationToken = default)`
	`29`	`+ {`
	`30`	`+ return Task.FromResult(candidateName);`
	`31`	`+ }`
	`32`	`+`
`27`	`33`	`/// <inheritdoc/>`
`28`	`34`	`public async Task<IVfsRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)`
`29`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,13 @@ namespace SecureFolderFS.Core.WinFsp.Callbacks`
`8`	`8`	`{`
`9`	`9`	`public sealed partial class OnDeviceWinFsp`
`10`	`10`	`{`
	`11`	`+ [MethodImpl(MethodImplOptions.AggressiveInlining)]`
`11`	`12`	`private string GetCiphertextPath(string plaintextName)`
`12`	`13`	`{`
`13`	`14`	`return NativePathHelpers.GetCiphertextPath(plaintextName, _specifics);`
`14`	`15`	`}`
`15`	`16`
	`17`	`+ [MethodImpl(MethodImplOptions.AggressiveInlining)]`
`16`	`18`	`private static bool IsDirectory(string ciphertextPath)`
`17`	`19`	`{`
`18`	`20`	`return Directory.Exists(ciphertextPath) && !File.Exists(ciphertextPath);`
`@@ -71,9 +73,8 @@ private static FileOptions ToFileOptions(uint createOptions)`
`71`	`73`	`if ((createOptions & FILE_RANDOM_ACCESS) != 0)`
`72`	`74`	`options \|= FileOptions.RandomAccess;`
`73`	`75`
`74`		`- // Never handle DELETE_ON_CLOSE`
`75`		`- // WinFsp already tracks the delete disposition and will call Cleanup with CleanupDelete.`
`76`		`- // Letting the real FileStream have DeleteOnClose bypasses your custom DeleteOrRecycle logic.`
	`76`	`+ // Never handle FILE_DELETE_ON_CLOSE`
	`77`	`+ // WinFsp already tracks the delete disposition and will call Cleanup with CleanupDelete`
`77`	`78`
`78`	`79`	`return options;`
`79`	`80`	`}`
`@@ -83,7 +84,7 @@ private static int Trace(int status, string? fileName = null, [CallerMemberName]`
`83`	`84`	`#if !DEBUG`
`84`	`85`	`return status;`
`85`	`86`	`#endif`
`86`		`- if (!Core.FileSystem.Constants.OPT_IN_FOR_OPTIONAL_DEBUG_TRACING)`
	`87`	`+ if (!FileSystem.Constants.OPT_IN_FOR_OPTIONAL_DEBUG_TRACING)`
`87`	`88`	`return status;`
`88`	`89`
`89`	`90`	`if (!Debugger.IsAttached)`