Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 11:17:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[PT Run][Folder]Support for paths with / (#18520)

Browse Source
This commit is contained in:
Davide Giacometti
2022-06-02 11:44:52 +02:00
committed by GitHub
parent 465df35d27
commit 6f306e1259
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/InternalQueryFolderTests.cs
View File

@@ -52,6 +52,7 @@ namespace Microsoft.Plugin.Folder.UnitTests
[DataRow(@"c:\not-exist", 2, 1, false, DisplayName = "Folder not exist, return root")]
[DataRow(@"c:\not-exist\not-exist2", 0, 0, false, DisplayName = "Folder not exist, return root")]
[DataRow(@"c:\bla.t", 2, 1, false, DisplayName = "Partial match file")]
[DataRow(@"c:/bla.t", 2, 1, false, DisplayName = "Partial match file with /")]
public void Query_WhenCalled(string search, int folders, int files, bool truncated)
{
const int maxFolderSetting = 3;

4
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/FolderHelper.cs
View File

@@ -84,7 +84,9 @@ namespace Microsoft.Plugin.Folder.Sources
throw new ArgumentNullException(nameof(search));
}
if (search[0] == '\\' && (search.Length == 1 || search[1] != '\\'))
var validRoots = new char[] { '\\', '/' };
if (validRoots.Contains(search[0]) && (search.Length == 1 || !validRoots.Contains(search[1])))
{
// Absolute path of system drive: \Windows\System32
search = Path.Combine(Path.GetPathRoot(Environment.SystemDirectory), search.Substring(1));

2
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryInternalDirectory.cs
View File

@@ -52,7 +52,7 @@ namespace Microsoft.Plugin.Folder.Sources
{
// if folder doesn't exist, we want to take the last part and use it afterwards to help the user
// find the right folder.
int index = search.LastIndexOf('\\');
int index = search.LastIndexOfAny(new char[] { '\\', '/' });
// No slashes found, so probably not a folder
if (index <= 0 || index >= search.Length - 1)