Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rooted path without volume label regression on Windows #96

Merged
merged 2 commits into from
Aug 1, 2024
+27 −3
Merged

Fix rooted path without volume label regression on Windows #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7e549f
Added failing test for rooted path without volume on Windows
Metapyziks Jul 25, 2024
86b2af6
Fix regression with rooted paths without volume labels on Windows
Metapyziks Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/Zio.Tests/FileSystems/TestPhysicalFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ public void TestFileSystemInvalidDriveLetterOnWindows()
}
}

[SkippableFact]
public void TestRootedPathWithoutDriveOnWindows()
{
Skip.IfNot(IsWindows, "Testing Windows-specific behavior");

var driveLetter = Directory.GetCurrentDirectory()[0];
var fs = new PhysicalFileSystem();

var resolvedPath = fs.ConvertPathFromInternal("/test");

Assert.Equal($"/mnt/{driveLetter}/test", resolvedPath.ToString(), StringComparer.OrdinalIgnoreCase);
}

[Fact]
public void TestWatcher()
{
Expand Down
17 changes: 14 additions & 3 deletions src/Zio/FileSystems/PhysicalFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,9 +977,12 @@ protected override UPath ConvertPathFromInternalImpl(string innerPath)
if (innerPath.StartsWith(@"\\", StringComparison.Ordinal) || innerPath.StartsWith(@"\?", StringComparison.Ordinal))
throw new NotSupportedException($"Path starting with `\\\\` or `\\?` are not supported -> `{innerPath}` ");

var absolutePath = Path.IsPathRooted(innerPath) ? innerPath : Path.GetFullPath(innerPath);
var driveIndex = absolutePath.IndexOf(":\\", StringComparison.Ordinal);
if (driveIndex != 1)
// We want to avoid using Path.GetFullPath unless absolutely necessary,
// because it can change the case of already rooted paths that contain a ~
var absolutePath = HasWindowsVolumeLabel(innerPath) ? innerPath : Path.GetFullPath(innerPath);

// Assert that Path.GetFullPath returned the format we expect
if (!HasWindowsVolumeLabel(absolutePath))
throw new ArgumentException($"Expecting a drive for the path `{absolutePath}`");

var builder = UPath.GetSharedStringBuilder();
Expand Down Expand Up @@ -1032,4 +1035,12 @@ private static bool IsDriveLetter(char c)
{
return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z';
}

private static bool HasWindowsVolumeLabel( string path )
{
if ( !IsOnWindows )
throw new NotSupportedException( $"{nameof( HasWindowsVolumeLabel )} is only supported on Windows platforms." );

return path.Length >= 3 && path[1] == ':' && path[2] is '\\' or '/';
}
}
Loading