Skip to content

Refactor MUIFileSearcher.AddFiles #18825

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

Merged
daxian-dbw merged 3 commits into from
May 1, 2023
Merged

Refactor MUIFileSearcher.AddFiles #18825

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2efaa8
Refactor `MUIFileSearcher.AddFiles`
xtqqczze Dec 19, 2022
986cc7f
fix IDE0044
xtqqczze Dec 19, 2022
c059fe8
fix name clash
xtqqczze Dec 23, 2022
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
51 changes: 9 additions & 42 deletions src/System.Management.Automation/help/MUIFileSearcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ private MUIFileSearcher(string target, Collection<string> searchPaths)
/// </summary>
internal SearchMode SearchMode { get; } = SearchMode.Unique;

private static readonly System.IO.EnumerationOptions _enumerationOptions = new()
{
IgnoreInaccessible = false,
AttributesToSkip = 0,
MatchType = MatchType.Win32,
MatchCasing = MatchCasing.CaseInsensitive,
};

private Collection<string> _result = null;

/// <summary>
Expand Down Expand Up @@ -113,52 +121,11 @@ private void SearchForFiles()
}
}

private static string[] GetFiles(string path, string pattern)
{
#if UNIX
// On Linux, file names are case sensitive, so we need to add
// extra logic to select the files that match the given pattern.
var result = new List<string>();
string[] files = Directory.GetFiles(path);

var wildcardPattern = WildcardPattern.ContainsWildcardCharacters(pattern)
? WildcardPattern.Get(pattern, WildcardOptions.IgnoreCase)
: null;

foreach (string filePath in files)
{
if (filePath.Contains(pattern, StringComparison.OrdinalIgnoreCase))
{
result.Add(filePath);
break;
}

if (wildcardPattern != null)
{
string fileName = Path.GetFileName(filePath);
if (wildcardPattern.IsMatch(fileName))
{
result.Add(filePath);
}
}
}

return result.ToArray();
#else
return Directory.GetFiles(path, pattern);
#endif
}

private void AddFiles(string muiDirectory, string directory, string pattern)
{
if (Directory.Exists(muiDirectory))
{
string[] files = GetFiles(muiDirectory, pattern);

if (files == null)
return;

foreach (string file in files)
foreach (string file in Directory.EnumerateFiles(muiDirectory, pattern, _enumerationOptions))
{
string path = Path.Combine(muiDirectory, file);

Expand Down