Fix browsing FTP

gave92 · gave92 · commit ba76e45bac7d · 2023-06-24T10:41:47.000+02:00
diff --git a/src/Files.App/Filesystem/StorageFileHelpers/StorageFileExtensions.cs b/src/Files.App/Filesystem/StorageFileHelpers/StorageFileExtensions.cs
@@ -190,7 +190,7 @@ public async static Task<StorageFileWithPath> DangerousGetFileWithPathFromPathAs
 				}
 			}
 
-			var fullPath = (parentFolder is not null && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root
+			var fullPath = (parentFolder is not null && !FtpHelpers.IsFtpPath(value) && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root
 				? Path.GetFullPath(Path.Combine(parentFolder.Path, value)) // Relative path
 				: value;
 			var item = await BaseStorageFile.GetFileFromPathAsync(fullPath);
@@ -244,7 +244,7 @@ public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPa
 				}
 			}
 
-			var fullPath = (parentFolder is not null && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root
+			var fullPath = (parentFolder is not null && !FtpHelpers.IsFtpPath(value) && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root
 				? Path.GetFullPath(Path.Combine(parentFolder.Path, value)) // Relative path
 				: value;
 			var item = await BaseStorageFolder.GetFolderFromPathAsync(fullPath);

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public async static Task<StorageFileWithPath> DangerousGetFileWithPathFromPathAs`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
`193`		`- var fullPath = (parentFolder is not null && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root`
	`193`	`+ var fullPath = (parentFolder is not null && !FtpHelpers.IsFtpPath(value) && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root`
`194`	`194`	`? Path.GetFullPath(Path.Combine(parentFolder.Path, value)) // Relative path`
`195`	`195`	`: value;`
`196`	`196`	`var item = await BaseStorageFile.GetFileFromPathAsync(fullPath);`
`@@ -244,7 +244,7 @@ public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPa`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`247`		`- var fullPath = (parentFolder is not null && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root`
	`247`	`+ var fullPath = (parentFolder is not null && !FtpHelpers.IsFtpPath(value) && !Path.IsPathRooted(value) && !ShellStorageFolder.IsShellPath(value)) // "::{" not a valid root`
`248`	`248`	`? Path.GetFullPath(Path.Combine(parentFolder.Path, value)) // Relative path`
`249`	`249`	`: value;`
`250`	`250`	`var item = await BaseStorageFolder.GetFolderFromPathAsync(fullPath);`