motimat/Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle long file paths in UriFromFilePath (#19955)

Browse Source 
* fix long path

* Update UriExtensionsTests.cs

* Update StorageProviderHelpers.cs
This commit is contained in:
startewho
2025-11-04 16:44:43 +08:00
committed by GitHub
parent c530f7b208
commit e294245f01
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
+13 -5
View File
@@ -37,11 +37,19 @@ internal static class StorageProviderHelpers
public static Uri UriFromFilePath(string path, bool isDirectory)
{
var uriPath = new StringBuilder(path)
.Replace("%", $"%{(int)'%':X2}")
.Replace("[", $"%{(int)'[':X2}")
.Replace("]", $"%{(int)']':X2}");
var uriPath = new StringBuilder();
bool isLongPath = path.StartsWith(@"\\?\", StringComparison.Ordinal);//Windows long path prefix
if (isLongPath)
{
uriPath.Append(path, 4, path.Length - 4);
}
else
{
uriPath.Append(path);
}
uriPath = uriPath.Replace("%", $"%{(int)'%':X2}")
.Replace("[", $"%{(int)'[':X2}")
.Replace("]", $"%{(int)']':X2}");
if (!path.EndsWith('/') && isDirectory)
{
uriPath.Append('/');
tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
+11
View File
@@ -40,4 +40,15 @@ public class UriExtensionsTests
Assert.Equal(path, uri.LocalPath);
}
[Theory]
[InlineData(@"\\?\D:\abcdefgh\abcdefgh\abcdefabcdefgh\abcdefghabcdefghabcdefgha\bcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh\abcdefghabcdefghabcdefgha\bcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh",
@"D:\abcdefgh\abcdefgh\abcdefabcdefgh\abcdefghabcdefghabcdefgha\bcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh\abcdefghabcdefghabcdefgha\bcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh")]
public void Should_Convert_Long_File_Path_To_Uri_And_Back(string prepath,string path)
{
var uri = StorageProviderHelpers.UriFromFilePath(prepath, false);
Assert.Equal(path, uri.LocalPath);
}
}