Skip to content
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

Jump to bottom

Get-Content -Head and -Tail disallow negative values and cleanup #19715

Merged
merged 15 commits into from
Jun 21, 2023
Merged

Get-Content -Head and -Tail disallow negative values and cleanup #19715

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ad5957e
TotalCount {get; set;}
CarloToso May 23, 2023
fdf3335
Tail { get; set; }
CarloToso May 23, 2023
055da9f
Add comment Tail
CarloToso May 24, 2023
fe59996
add {} while, for
CarloToso May 24, 2023
19ba389
remove remainder
CarloToso May 24, 2023
4ba3554
Add {} if
CarloToso May 24, 2023
f74f1e8
remove space
CarloToso May 24, 2023
4d2459b
var, Logs
CarloToso May 25, 2023
777d526
fast return
CarloToso May 25, 2023
c60a839
remove unnecessary if
CarloToso May 25, 2023
c4d1b51
fix comment
CarloToso May 25, 2023
c5729b1
capitalize comment
CarloToso May 25, 2023
174ad16
edit comment
CarloToso May 25, 2023
434dfe8
Add Tests
CarloToso Jun 9, 2023
727d53a
Add {}
CarloToso Jun 10, 2023
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
Next Next commit
TotalCount {get; set;}
  • Loading branch information
@CarloToso
CarloToso committed May 23, 2023
commit ad5957e6c2015ad778244b38310cf725da073733
32 changes: 5 additions & 27 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,9 @@ public class GetContentCommand : ContentCommandBase
/// value is -1 which means read all the content.
/// </summary>
[Parameter(ValueFromPipelineByPropertyName = true)]
[ValidateRange(0, long.MaxValue)]
[Alias("First", "Head")]
public long TotalCount
{
get
{
return _totalCount;
}

set
{
_totalCount = value;
_totalCountSpecified = true;
}
}

private bool _totalCountSpecified = false;
public long TotalCount { get; set; } = -1;
Copy link
Member

Choose a reason for hiding this comment

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

hmmm, I wonder if this should be just be long? TotalCount


/// <summary>
/// The number of content items to retrieve from the back of the file.
Expand Down Expand Up @@ -98,15 +85,6 @@ internal override object GetDynamicParameters(CmdletProviderContext context)

#endregion Parameters

#region parameter data

/// <summary>
/// The number of content items to retrieve.
/// </summary>
private long _totalCount = -1;

#endregion parameter data

#region Command code

/// <summary>
Expand All @@ -116,7 +94,7 @@ protected override void ProcessRecord()
{
// TotalCount and Tail should not be specified at the same time.
// Throw out terminating error if this is the case.
Copy link
Member

Choose a reason for hiding this comment

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

this comment seems wrong - it doesn't look like a terminating error

if (_totalCountSpecified && _tailSpecified)
if (TotalCount != -1 && _tailSpecified)
{
string errMsg = StringUtil.Format(SessionStateStrings.GetContent_TailAndHeadCannotCoexist, "TotalCount", "Tail");
ErrorRecord error = new(new InvalidOperationException(errMsg), "TailAndHeadCannotCoexist", ErrorCategory.InvalidOperation, null);
Expand Down Expand Up @@ -209,7 +187,7 @@ protected override void ProcessRecord()
// I am using TotalCount - countToRead so that I don't
// have to worry about overflow

if ((TotalCount > 0) && (countToRead == 0 || (TotalCount - countToRead < countRead)))
if (TotalCount > 0 && (countToRead == 0 || TotalCount - countToRead < countRead))
{
countToRead = TotalCount - countRead;
}
Expand Down Expand Up @@ -256,7 +234,7 @@ protected override void ProcessRecord()
WriteContentObject(results, countRead, holder.PathInfo, currentContext);
}
}
} while (results != null && results.Count > 0 && ((TotalCount < 0) || countRead < TotalCount));
} while (results != null && results.Count > 0 && (TotalCount < 0 || countRead < TotalCount));
}
}
}
Expand Down