Merge pull request #46 from rameel/cleanup

rameel · web-flow · commit a14a07891890 · 2025-09-17T05:13:57.000+05:00
Clean up, formatting, and maintenance
diff --git a/src/Ramstack.FileSystem.Abstractions/Utilities/EnumerableExtensions.cs b/src/Ramstack.FileSystem.Abstractions/Utilities/EnumerableExtensions.cs
@@ -3,7 +3,7 @@ namespace Ramstack.FileSystem.Utilities;
 /// <summary>
 /// Provides extension methods for the <see cref="IEnumerable{T}"/>.
 /// </summary>
-public static class EnumerableExtensions
+internal static class EnumerableExtensions
 {
     /// <summary>
     /// Converts an enumerable sequence to an async-enumerable sequence.
diff --git a/src/Ramstack.FileSystem.Abstractions/Utilities/PathTokenizer.cs b/src/Ramstack.FileSystem.Abstractions/Utilities/PathTokenizer.cs
@@ -1,5 +1,3 @@
-using System.Runtime.CompilerServices;
-
 namespace Ramstack.FileSystem.Utilities;
 
 /// <summary>
diff --git a/src/Ramstack.FileSystem.Abstractions/VirtualPath.cs b/src/Ramstack.FileSystem.Abstractions/VirtualPath.cs
@@ -173,7 +173,7 @@ public static bool IsNormalized(ReadOnlySpan<char> path)
             for (var j = 1; (uint)j < (uint)path.Length; j++)
             {
                 var ch = path[j];
-                if (ch == '\\' || ch == '/' && prior == '/')
+                if (ch == '\\' || (ch == '/' && prior == '/'))
                     return false;
 
                 if (ch == '.' && prior == '/')
diff --git a/src/Ramstack.FileSystem.Adapters/Ramstack.FileSystem.Adapters.csproj b/src/Ramstack.FileSystem.Adapters/Ramstack.FileSystem.Adapters.csproj
@@ -38,6 +38,9 @@
     <Compile Include="..\Ramstack.FileSystem.Abstractions\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\Ramstack.FileSystem.Abstractions\Utilities\EnumerableExtensions.cs">
+      <Link>Utilities\EnumerableExtensions.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Ramstack.FileSystem.Globbing/GlobbingFileSystem.cs b/src/Ramstack.FileSystem.Globbing/GlobbingFileSystem.cs
@@ -103,5 +103,5 @@ internal bool IsFileIncluded(string path) =>
     /// otherwise, <see langword="false" />.
     /// </returns>
     internal bool IsDirectoryIncluded(string path) =>
-        path == "/" || !PathHelper.IsMatch(path, _excludes) && PathHelper.IsPartialMatch(path, _patterns);
+        path == "/" || (!PathHelper.IsMatch(path, _excludes) && PathHelper.IsPartialMatch(path, _patterns));
 }
diff --git a/src/Ramstack.FileSystem.Globbing/Internal/PathHelper.cs b/src/Ramstack.FileSystem.Globbing/Internal/PathHelper.cs
@@ -118,7 +118,7 @@ public static ReadOnlySpan<char> GetPartialPattern(string pattern, int depth)
         static bool IsGlobStar(ref char s, int index, int final) =>
             index + 2 == final && Unsafe.ReadUnaligned<int>(
                 ref Unsafe.As<char, byte>(
-                    ref Unsafe.Add(ref s, (nint)(uint)index))) == ('*' << 16 | '*');
+                    ref Unsafe.Add(ref s, (nint)(uint)index))) == (('*' << 16) | '*');
     }
 
     #region Vector helper methods
diff --git a/src/Ramstack.FileSystem.Physical/PhysicalFile.cs b/src/Ramstack.FileSystem.Physical/PhysicalFile.cs
@@ -45,7 +45,7 @@ protected override ValueTask<Stream> OpenReadCoreAsync(CancellationToken cancell
     {
         // SequentialScan is a performance hint that requires extra sys-call on non-Windows systems.
         // https://github.com/dotnet/runtime/blob/46c9a4fff83f35ec659e6659050440aadccf3201/src/libraries/System.Private.CoreLib/src/System/IO/File.cs#L694
-        var options = Path.DirectorySeparatorChar == '\\'
+        var options = OperatingSystem.IsWindows()
             ? FileOptions.Asynchronous | FileOptions.SequentialScan
             : FileOptions.Asynchronous;
 
@@ -59,11 +59,7 @@ protected override ValueTask<Stream> OpenWriteCoreAsync(CancellationToken cancel
     {
         EnsureDirectoryExists();
 
-        var options = Path.DirectorySeparatorChar == '\\'
-            ? FileOptions.Asynchronous | FileOptions.SequentialScan
-            : FileOptions.Asynchronous;
-
-        var stream = new FileStream(_physicalPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None, DefaultBufferSize, options);
+        var stream = new FileStream(_physicalPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None, DefaultBufferSize, FileOptions.Asynchronous);
 
         // Since FileMode.OpenOrCreate doesn't truncate the file, we manually
         // set the file length to zero to remove any leftover data.
@@ -79,16 +75,12 @@ protected override async ValueTask WriteCoreAsync(Stream stream, bool overwrite,
 
         try
         {
-            var options = Path.DirectorySeparatorChar == '\\'
-                ? FileOptions.Asynchronous | FileOptions.SequentialScan
-                : FileOptions.Asynchronous;
-
             // To overwrite the file, we use FileMode.OpenOrCreate instead of FileMode.Create.
             // This avoids a System.UnauthorizedAccessException: Access to the path is denied,
             // which can occur if the file has the FileAttributes.Hidden attribute.
             var fileMode = overwrite ? FileMode.OpenOrCreate : FileMode.CreateNew;
 
-            await using var fs = new FileStream(_physicalPath, fileMode, FileAccess.Write, FileShare.None, DefaultBufferSize, options);
+            await using var fs = new FileStream(_physicalPath, fileMode, FileAccess.Write, FileShare.None, DefaultBufferSize, FileOptions.Asynchronous);
 
             // Since FileMode.OpenOrCreate doesn't truncate the file, we manually
             // set the file length to zero to remove any leftover data.
@@ -108,7 +100,7 @@ protected override async ValueTask WriteCoreAsync(Stream stream, bool overwrite,
             const int WIN32_ERROR_FILE_EXISTS = unchecked((int)0x80070050);
             const int POSIX_EEXIST = 17;
 
-            var exists = Path.DirectorySeparatorChar == '\\'
+            var exists = OperatingSystem.IsWindows()
                 ? exception.HResult == WIN32_ERROR_FILE_EXISTS
                 : exception.HResult == POSIX_EEXIST;
 
diff --git a/src/Ramstack.FileSystem.Physical/Ramstack.FileSystem.Physical.csproj b/src/Ramstack.FileSystem.Physical/Ramstack.FileSystem.Physical.csproj
@@ -38,6 +38,9 @@
     <Compile Include="..\Ramstack.FileSystem.Abstractions\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\Ramstack.FileSystem.Abstractions\Utilities\EnumerableExtensions.cs">
+      <Link>Utilities\EnumerableExtensions.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Ramstack.FileSystem.Prefixed/Ramstack.FileSystem.Prefixed.csproj b/src/Ramstack.FileSystem.Prefixed/Ramstack.FileSystem.Prefixed.csproj
@@ -38,6 +38,9 @@
     <Compile Include="..\Ramstack.FileSystem.Abstractions\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\Ramstack.FileSystem.Abstractions\Utilities\EnumerableExtensions.cs">
+      <Link>Utilities\EnumerableExtensions.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace Ramstack.FileSystem.Utilities;`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Provides extension methods for the <see cref="IEnumerable{T}"/>.`
`5`	`5`	`/// </summary>`
`6`		`-public static class EnumerableExtensions`
	`6`	`+internal static class EnumerableExtensions`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Converts an enumerable sequence to an async-enumerable sequence.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System.Runtime.CompilerServices;`
`2`		`-`
`3`	`1`	`namespace Ramstack.FileSystem.Utilities;`
`4`	`2`
`5`	`3`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public static bool IsNormalized(ReadOnlySpan<char> path)`
`173`	`173`	`for (var j = 1; (uint)j < (uint)path.Length; j++)`
`174`	`174`	`{`
`175`	`175`	`var ch = path[j];`
`176`		`- if (ch == '\\' \|\| ch == '/' && prior == '/')`
	`176`	`+ if (ch == '\\' \|\| (ch == '/' && prior == '/'))`
`177`	`177`	`return false;`
`178`	`178`
`179`	`179`	`if (ch == '.' && prior == '/')`
Original file line number	Diff line number	Diff line change
`@@ -103,5 +103,5 @@ internal bool IsFileIncluded(string path) =>`
`103`	`103`	`/// otherwise, <see langword="false" />.`
`104`	`104`	`/// </returns>`
`105`	`105`	`internal bool IsDirectoryIncluded(string path) =>`
`106`		`- path == "/" \|\| !PathHelper.IsMatch(path, _excludes) && PathHelper.IsPartialMatch(path, _patterns);`
	`106`	`+ path == "/" \|\| (!PathHelper.IsMatch(path, _excludes) && PathHelper.IsPartialMatch(path, _patterns));`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public static ReadOnlySpan<char> GetPartialPattern(string pattern, int depth)`
`118`	`118`	`static bool IsGlobStar(ref char s, int index, int final) =>`
`119`	`119`	`index + 2 == final && Unsafe.ReadUnaligned<int>(`
`120`	`120`	`ref Unsafe.As<char, byte>(`
`121`		`- ref Unsafe.Add(ref s, (nint)(uint)index))) == ('' << 16 \| '');`
	`121`	`+ ref Unsafe.Add(ref s, (nint)(uint)index))) == (('' << 16) \| '');`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`#region Vector helper methods`