few changes related to depth and recursive checks, hopefully this works

santisq · Sep 6, 2024 · 6cd3479 · 6cd3479
1 parent cd8506e
commit 6cd3479
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/PSADTree/Commands/GetADTreeGroupMemberCommand.cs b/src/PSADTree/Commands/GetADTreeGroupMemberCommand.cs
@@ -185,7 +185,7 @@ private TreeObjectBase ProcessPrincipal(
 
         TreeObjectBase AddTreeObject(TreeObjectBase obj)
         {
-            if (Recursive.IsPresent || depth <= Depth)
+            if (depth <= Depth)
             {
                 _index.AddPrincipal(obj);
             }
@@ -213,7 +213,6 @@ TreeObjectBase HandleGroup(
 
     private void EnumerateMembers(TreeGroup parent, int depth)
     {
-        bool shouldProcess = Recursive.IsPresent || depth <= Depth;
         foreach (TreeObjectBase member in parent.Childs)
         {
             if (member is TreeGroup treeGroup)
@@ -222,7 +221,7 @@ private void EnumerateMembers(TreeGroup parent, int depth)
                 continue;
             }
 
-            if (shouldProcess)
+            if (depth <= Depth)
             {
                 _index.Add(member.Clone(parent, depth));
             }

diff --git a/src/PSADTree/Commands/GetADTreePrincipalGroupMembershipCommand.cs b/src/PSADTree/Commands/GetADTreePrincipalGroupMembershipCommand.cs
@@ -198,7 +198,7 @@ TreeGroup ProcessGroup(GroupPrincipal group)
 
     private void EnumerateMembership(TreeGroup parent, int depth)
     {
-        if (!Recursive.IsPresent && depth > Depth)
+        if (depth > Depth)
         {
             return;
         }

diff --git a/src/PSADTree/PSADTreeCmdletBase.cs b/src/PSADTree/PSADTreeCmdletBase.cs
@@ -65,6 +65,11 @@ protected override void BeginProcessing()
     {
         try
         {
+            if (Recursive.IsPresent)
+            {
+                Depth = int.MaxValue;
+            }
+
             if (Exclude is not null)
             {
                 _exclusionPatterns = Exclude
@@ -103,13 +108,17 @@ protected override void BeginProcessing()
 
     protected void Push(GroupPrincipal? groupPrincipal, TreeGroup treeGroup)
     {
-        if (Recursive.IsPresent || treeGroup.Depth <= Depth)
+        if (treeGroup.Depth > Depth)
         {
-            _stack.Push((groupPrincipal, treeGroup));
             return;
         }
 
-        _truncatedOutput = true;
+        if (treeGroup.Depth == Depth)
+        {
+            _truncatedOutput = true;
+        }
+
+        _stack.Push((groupPrincipal, treeGroup));
     }
 
     protected void DisplayWarningIfTruncatedOutput()
-Original file line number
+Diff line change
@@ Expand Up / @@ -198,7 +198,7 @@ TreeGroup ProcessGroup(GroupPrincipal group) @@
         private void EnumerateMembership(TreeGroup parent, int depth)
         {
-            if (!Recursive.IsPresent && depth > Depth)
+            if (depth > Depth)
             {
                 return;
             }
@@ Expand Down @@