Skip to content

get-childitem -LiteralPath should accept 'Include' or 'Exclude' filter #5462

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
adityapatwardhan merged 5 commits into from
Mar 2, 2018
Merged

get-childitem -LiteralPath should accept 'Include' or 'Exclude' filter #5462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6aa9ef
get-childitem -LiteralPath should accept 'Include' or 'Exclude' filter
chunqingchen Nov 15, 2017
a683fc3
Fix test failure and address comments
chunqingchen Nov 16, 2017
dcad51e
Change test case to symmetric
chunqingchen Nov 30, 2017
2daf722
Merge branch 'master' into bugfix_3
adityapatwardhan Mar 2, 2018
ccfcdea
[Feature]
adityapatwardhan Mar 2, 2018
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
20 changes: 19 additions & 1 deletion src/System.Management.Automation/engine/SessionStateContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,7 +1654,25 @@ internal void GetChildItems(

ContainerCmdletProvider providerInstance = GetContainerProviderInstance(provider);

if (path != null && this.ItemExists(providerInstance, path, context))
if (
(context.Include != null && context.Include.Count > 0) ||
(context.Exclude != null && context.Exclude.Count > 0))
{
// Do the recursion manually so that we can apply the
// include and exclude filters
Copy link
Collaborator

@iSazonov iSazonov Nov 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we check "context.Stopping" as in line 1587?

Copy link
Contributor Author

@chunqingchen chunqingchen Nov 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not necessary. In the previous code, if a user try to cancel the search in between, the code will stop on next path search iteration. In this situation, since we only have one literal path, it won't work.

Copy link
Collaborator

@iSazonov iSazonov Nov 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarify!

Closed.

int unUsedChildrenNotMatchingFilterCriteria = 0;
try
{
// Temeporary set literal path as false to apply filter
context.SuppressWildcardExpansion = false;
ProcessPathItems(providerInstance, path, recurse, depth, context, out unUsedChildrenNotMatchingFilterCriteria, ProcessMode.Enumerate);
}
finally
{
context.SuppressWildcardExpansion = true;
}
}
else if (path != null && this.ItemExists(providerInstance, path, context))
{
if (IsItemContainer(providerInstance, path, context))
{
Expand Down
7 changes: 7 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ Describe "Get-ChildItem" -Tags "CI" {
(Get-ChildItem -Path $TestDrive -Depth 1 -Exclude $item_a).Count | Should Be 5
}

It "Should return items recursively when using 'Include' or 'Exclude' parameters with -LiteralPath" {
(Get-ChildItem -LiteralPath $TestDrive -Recurse -Exclude *).Count | Should Be 0
(Get-ChildItem -LiteralPath $TestDrive -Recurse -Include *.dll).Count | Should Be (Get-ChildItem $TestDrive -Recurse -Include *.dll).Count
(Get-ChildItem -LiteralPath $TestDrive -Depth 1 -Include $item_G).Count | Should Be 1
(Get-ChildItem -LiteralPath $TestDrive -Depth 1 -Exclude $item_a).Count | Should Be 5
}

It "get-childitem path wildcard - <title>" -TestCases $PathWildCardTestCases {
param($Parameters, $ExpectedCount)

Expand Down